Merge pull request #3308 from ClearlyClaire/glitch-soc/merge-4.5

Merge upstream changes up to 86cff1abca into stable-4.5

CHANGELOG.md

@@ -2,9 +2,50 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.5.3] - 2025-12-08
+
+### Security
+
+- Fix inconsistent error handling leaking information on existence of private posts ([GHSA-gwhw-gcjx-72v8](https://github.com/mastodon/mastodon/security/advisories/GHSA-gwhw-gcjx-72v8))
+
+### Fixed
+
+- Fix “Delete and Redraft” on a non-quote being treated as a quote post in some cases (#37140 by @ClearlyClaire)
+- Fix YouTube embeds by sending referer (#37126 by @ChaosExAnima)
+- Fix streamed quoted polls not being hydrated correctly (#37118 by @ClearlyClaire)
+- Fix creation of duplicate conversations (#37108 by @oneiros)
+- Fix extraneous `noreferrer` in external links (#37107 by @ChaosExAnima)
+- Fix edge case error handling in some database migrations (#37079 by @ClearlyClaire)
+- Fix error handling when re-fetching already-known statuses (#37077 by @ClearlyClaire)
+- Fix post navigation in single-column mode when Advanced UI is enabled (#37044 by @diondiondion)
+- Fix `tootctl status remove` removing quoted posts and remote quotes of local posts (#37009 by @ClearlyClaire)
+- Fix known expensive S3 batch delete operation failing because of short timeouts (#37004 by @ClearlyClaire)
+- Fix compose autosuggest always lowercasing input token (#36995 by @ClearlyClaire)
+
+## [4.5.2] - 2025-11-20
+
+### Changed
+
+- Change private quote education modal to not show up on self-quotes (#36926 by @ClearlyClaire)
+
+### Fixed
+
+- Fix missing fallback link in CW-only quote posts (#36963 by @ClearlyClaire)
+- Fix statuses without text being hidden while loading (#36962 by @ClearlyClaire)
+- Fix `g` + `h` keyboard shortcut not working when a post is focused (#36935 by @diondiondion)
+- Fix quoting overwriting current content warning (#36934 by @ClearlyClaire)
+- Fix scroll-to-status in threaded view being unreliable (#36927 by @ClearlyClaire)
+- Fix path resolution for emoji worker (#36897 by @ChaosExAnima)
+- Fix `tootctl upgrade storage-schema` failing with `ArgumentError` (#36914 by @shugo)
+- Fix cross-origin handling of CSS modules (#36890 by @ClearlyClaire)
+- Fix error with remote tags including percent signs (#36886 and #36925 by @ChaosExAnima and @ClearlyClaire)
+- Fix bogus quote approval policy not always being replaced correctly (#36885 by @ClearlyClaire)
+- Fix hashtag completion not being inserted correctly (#36884 by @ClearlyClaire)
+- Fix Cmd/Ctrl + Enter in the composer triggering confirmation dialog action (#36870 by @diondiondion)
+
 ## [4.5.1] - 2025-11-13
 
-### Fixes
+### Fixed
 
 - Fix Cmd/Ctrl + Enter not submitting Alt text modal on some browsers (#36866 by @diondiondion)
 - Fix posts coming from public/hashtag streaming being marked as unquotable (#36860 and #36869 by @ClearlyClaire)

app/controllers/activitypub/likes_controller.rb

@@ -22,7 +22,7 @@ class ActivityPub::LikesController < ActivityPub::BaseController
   def set_status
     @status = @account.statuses.find(params[:status_id])
     authorize @status, :show?
-  rescue Mastodon::NotPermittedError
+  rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
     not_found
   end
 

app/controllers/activitypub/quote_authorizations_controller.rb

@@ -24,7 +24,7 @@ class ActivityPub::QuoteAuthorizationsController < ActivityPub::BaseController
     return not_found unless @quote.status.present? && @quote.quoted_status.present?
 
     authorize @quote.quoted_status, :show?
-  rescue Mastodon::NotPermittedError
+  rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
     not_found
   end
 end

app/controllers/activitypub/replies_controller.rb

@@ -25,7 +25,7 @@ class ActivityPub::RepliesController < ActivityPub::BaseController
   def set_status
     @status = @account.statuses.find(params[:status_id])
     authorize @status, :show?
-  rescue Mastodon::NotPermittedError
+  rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
     not_found
   end
 

app/controllers/activitypub/shares_controller.rb

@@ -22,7 +22,7 @@ class ActivityPub::SharesController < ActivityPub::BaseController
   def set_status
     @status = @account.statuses.find(params[:status_id])
     authorize @status, :show?
-  rescue Mastodon::NotPermittedError
+  rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
     not_found
   end
 

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

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

app/controllers/api/v1/polls_controller.rb

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

app/controllers/api/v1/statuses/base_controller.rb

@@ -10,7 +10,7 @@ class Api::V1::Statuses::BaseController < Api::BaseController
   def set_status
     @status = Status.find(params[:status_id])
     authorize @status, :show?
-  rescue Mastodon::NotPermittedError
+  rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
     not_found
   end
 end

app/controllers/api/v1/statuses/bookmarks_controller.rb

@@ -23,7 +23,7 @@ class Api::V1::Statuses::BookmarksController < Api::V1::Statuses::BaseController
     bookmark&.destroy!
 
     render json: @status, serializer: REST::StatusSerializer, relationships: StatusRelationshipsPresenter.new([@status], current_account.id, bookmarks_map: { @status.id => false })
-  rescue Mastodon::NotPermittedError
+  rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
     not_found
   end
 end

app/controllers/api/v1/statuses/favourites_controller.rb

@@ -25,7 +25,7 @@ class Api::V1::Statuses::FavouritesController < Api::V1::Statuses::BaseControlle
 
     relationships = StatusRelationshipsPresenter.new([@status], current_account.id, favourites_map: { @status.id => false }, attributes_map: { @status.id => { favourites_count: count } })
     render json: @status, serializer: REST::StatusSerializer, relationships: relationships
-  rescue Mastodon::NotPermittedError
+  rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
     not_found
   end
 end

app/controllers/api/v1/statuses/reblogs_controller.rb

@@ -36,7 +36,7 @@ class Api::V1::Statuses::ReblogsController < Api::V1::Statuses::BaseController
 
     relationships = StatusRelationshipsPresenter.new([@status], current_account.id, reblogs_map: { @reblog.id => false }, attributes_map: { @reblog.id => { reblogs_count: count } })
     render json: @reblog, serializer: REST::StatusSerializer, relationships: relationships
-  rescue Mastodon::NotPermittedError
+  rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
     not_found
   end
 
@@ -45,7 +45,7 @@ class Api::V1::Statuses::ReblogsController < Api::V1::Statuses::BaseController
   def set_reblog
     @reblog = Status.find(params[:status_id])
     authorize @reblog, :show?
-  rescue Mastodon::NotPermittedError
+  rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
     not_found
   end
 

app/controllers/api/v1/statuses_controller.rb

@@ -147,7 +147,7 @@ class Api::V1::StatusesController < Api::BaseController
   def set_status
     @status = Status.find(params[:id])
     authorize @status, :show?
-  rescue Mastodon::NotPermittedError
+  rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
     not_found
   end
 

app/controllers/api/web/embeds_controller.rb

@@ -30,7 +30,7 @@ class Api::Web::EmbedsController < Api::Web::BaseController
   def set_status
     @status = Status.find(params[:id])
     authorize @status, :show?
-  rescue Mastodon::NotPermittedError
+  rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
     not_found
   end
 end

app/controllers/authorize_interactions_controller.rb

@@ -21,7 +21,7 @@ class AuthorizeInteractionsController < ApplicationController
   def set_resource
     @resource = located_resource
     authorize(@resource, :show?) if @resource.is_a?(Status)
-  rescue Mastodon::NotPermittedError
+  rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
     not_found
   end
 

app/controllers/media_controller.rb

@@ -34,7 +34,7 @@ class MediaController < ApplicationController
 
   def verify_permitted_status!
     authorize @media_attachment.status, :show?
-  rescue Mastodon::NotPermittedError
+  rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
     not_found
   end
 

app/controllers/statuses_controller.rb

@@ -62,7 +62,7 @@ class StatusesController < ApplicationController
   def set_status
     @status = @account.statuses.find(params[:id])
     authorize @status, :show?
-  rescue Mastodon::NotPermittedError
+  rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
     not_found
   end
 

app/javascript/flavours/glitch/actions/compose.js

@@ -709,8 +709,8 @@ export function selectComposeSuggestion(position, token, suggestion, path) {
 
       dispatch(useEmoji(suggestion));
     } else if (suggestion.type === 'hashtag') {
-      completion    = suggestion.name.slice(token.length - 1);
-      startPosition = position + token.length;
+      completion    = token + suggestion.name.slice(token.length - 1);
+      startPosition = position - 1;
     } else if (suggestion.type === 'account') {
       completion    = `@${getState().getIn(['accounts', suggestion.id, 'acct'])}`;
       startPosition = position - 1;

app/javascript/flavours/glitch/actions/importer/normalizer.js

@@ -104,7 +104,7 @@ export function normalizeStatus(status, normalOldStatus, { settings, bogusQuoteP
   }
 
   if (normalOldStatus) {
-    normalStatus.quote_approval ||= normalOldStatus.quote_approval;
+    normalStatus.quote_approval ||= normalOldStatus.get('quote_approval');
 
     const list = normalOldStatus.get('media_attachments');
     if (normalStatus.media_attachments && list) {

app/javascript/flavours/glitch/actions/statuses.js

@@ -85,6 +85,8 @@ export function fetchStatus(id, {
       dispatch(fetchStatusSuccess(skipLoading));
     }).catch(error => {
       dispatch(fetchStatusFail(id, error, skipLoading, parentQuotePostId));
+      if (error.status === 404)
+        dispatch(deleteFromTimelines(id));
     });
   };
 }

app/javascript/flavours/glitch/components/autosuggest_input.jsx

@@ -28,7 +28,7 @@ const textAtCursorMatchesToken = (str, caretPosition, searchTokens) => {
     return [null, null];
   }
 
-  word = word.trim().toLowerCase();
+  word = word.trim();
 
   if (word.length > 0) {
     return [left + 1, word];

app/javascript/flavours/glitch/components/autosuggest_textarea.jsx

@@ -29,7 +29,7 @@ const textAtCursorMatchesToken = (str, caretPosition) => {
     return [null, null];
   }
 
-  word = word.trim().toLowerCase();
+  word = word.trim();
 
   if (word.length > 0) {
     return [left + 1, word];

app/javascript/flavours/glitch/components/hotkeys/index.tsx

@@ -105,6 +105,7 @@ const hotkeyMatcherMap = {
   reply: just('r'),
   favourite: just('f'),
   boost: just('b'),
+  bookmark: just('d'),
   quote: just('q'),
   mention: just('m'),
   open: any('enter', 'o'),
@@ -180,25 +181,24 @@ export function useHotkeys<T extends HTMLElement>(handlers: HandlerMap) {
 
       if (shouldHandleEvent) {
         const matchCandidates: {
-          handler: (event: KeyboardEvent) => void;
+          // A candidate will be have an undefined handler if it's matched,
+          // but handled in a parent component rather than this one.
+          handler: ((event: KeyboardEvent) => void) | undefined;
           priority: number;
         }[] = [];
 
         (Object.keys(hotkeyMatcherMap) as HotkeyName[]).forEach(
           (handlerName) => {
             const handler = handlersRef.current[handlerName];
+            const hotkeyMatcher = hotkeyMatcherMap[handlerName];
 
-            if (handler) {
-              const hotkeyMatcher = hotkeyMatcherMap[handlerName];
+            const { isMatch, priority } = hotkeyMatcher(
+              event,
+              bufferedKeys.current,
+            );
 
-              const { isMatch, priority } = hotkeyMatcher(
-                event,
-                bufferedKeys.current,
-              );
-
-              if (isMatch) {
-                matchCandidates.push({ handler, priority });
-              }
+            if (isMatch) {
+              matchCandidates.push({ handler, priority });
             }
           },
         );

app/javascript/flavours/glitch/components/status/handled_link.tsx

@@ -133,16 +133,18 @@ export const HandledLink: FC<HandledLinkProps & ComponentProps<'a'>> = ({
 
   // Handle hashtags
   if (
-    text.startsWith('#') ||
-    prevText?.endsWith('#') ||
-    text.startsWith('＃') ||
-    prevText?.endsWith('＃')
+    (text.startsWith('#') ||
+      prevText?.endsWith('#') ||
+      text.startsWith('＃') ||
+      prevText?.endsWith('＃')) &&
+    !text.includes('%')
   ) {
     const hashtag = text.slice(1).trim();
+
     return (
       <Link
         className={classNames('mention hashtag', className)}
-        to={`/tags/${hashtag}`}
+        to={`/tags/${encodeURIComponent(hashtag)}`}
         rel='tag'
         data-menu-hashtag={hashtagAccountId}
       >
@@ -196,7 +198,7 @@ export const HandledLink: FC<HandledLinkProps & ComponentProps<'a'>> = ({
       title={href}
       className={classNames('unhandled-link', className)}
       target='_blank'
-      rel='noreferrer noopener'
+      rel='noopener'
       translate='no'
       ref={linkRef}
     >

app/javascript/flavours/glitch/features/compose/components/compose_form.jsx

@@ -110,10 +110,12 @@ class ComposeForm extends ImmutablePureComponent {
   handleKeyDownPost = (e) => {
     if (e.key.toLowerCase() === 'enter' && (e.ctrlKey || e.metaKey)) {
       this.handleSubmit(e);
+      e.preventDefault();
     }
 
     if (e.key.toLowerCase() === 'enter' && e.altKey) {
       this.handleSecondarySubmit(e);
+      e.preventDefault();
     }
 
     this.blurOnEscape(e);
@@ -129,9 +131,9 @@ class ComposeForm extends ImmutablePureComponent {
         e.preventDefault();
         this.textareaRef.current?.focus();
       }
-     }
+    }
     this.blurOnEscape(e);
-  }
+  };
 
   getFulltextForCharacterCounting = () => {
     return [this.props.spoiler? this.props.spoilerText: '', countableText(this.props.text)].join('');
@@ -156,7 +158,7 @@ class ComposeForm extends ImmutablePureComponent {
     }
 
     this.props.onSubmit({
-      missingAltTextModal: missingAltTextModal && this.props.missingAltText && this.props.privacy !== 'direct',
+      missingAltText: missingAltTextModal && this.props.missingAltText && this.props.privacy !== 'direct',
       quoteToPrivate: this.props.quoteToPrivate,
       overridePrivacy,
     });

app/javascript/flavours/glitch/features/compose/containers/compose_form_container.js

@@ -13,6 +13,7 @@ import {
 import { pasteLinkCompose } from 'flavours/glitch/actions/compose_typed';
 import { openModal } from 'flavours/glitch/actions/modal';
 import { PRIVATE_QUOTE_MODAL_ID } from 'flavours/glitch/features/ui/components/confirmation_modals/private_quote_notify';
+import { me } from 'flavours/glitch/initial_state';
 import { privacyPreference } from 'flavours/glitch/utils/privacy_preference';
 
 import ComposeForm from '../components/compose_form';
@@ -56,6 +57,7 @@ const mapStateToProps = state => ({
   quoteToPrivate:
     !!state.getIn(['compose', 'quoted_status_id'])
     && state.getIn(['compose', 'privacy']) === 'private'
+    && state.getIn(['statuses', state.getIn(['compose', 'quoted_status_id']), 'account']) !== me
     && !state.getIn(['settings', 'dismissed_banners', PRIVATE_QUOTE_MODAL_ID]),
   isInReply: state.getIn(['compose', 'in_reply_to']) !== null,
   lang: state.getIn(['compose', 'language']),

app/javascript/flavours/glitch/features/emoji/index.ts

@@ -1,6 +1,7 @@
 import { initialState } from '@/flavours/glitch/initial_state';
 
 import { toSupportedLocale } from './locale';
+import type { LocaleOrCustom } from './types';
 import { emojiLogger } from './utils';
 // eslint-disable-next-line import/default -- Importing via worker loader.
 import EmojiWorker from './worker?worker&inline';
@@ -24,19 +25,17 @@ export function initializeEmoji() {
   }
 
   if (worker) {
-    // Assign worker to const to make TS happy inside the event listener.
-    const thisWorker = worker;
     const timeoutId = setTimeout(() => {
       log('worker is not ready after timeout');
       worker = null;
       void fallbackLoad();
     }, WORKER_TIMEOUT);
-    thisWorker.addEventListener('message', (event: MessageEvent<string>) => {
+    worker.addEventListener('message', (event: MessageEvent<string>) => {
       const { data: message } = event;
       if (message === 'ready') {
         log('worker ready, loading data');
         clearTimeout(timeoutId);
-        thisWorker.postMessage('custom');
+        messageWorker('custom');
         void loadEmojiLocale(userLocale);
         // Load English locale as well, because people are still used to
         // using it from before we supported other locales.
@@ -55,20 +54,35 @@ export function initializeEmoji() {
 async function fallbackLoad() {
   log('falling back to main thread for loading');
   const { importCustomEmojiData } = await import('./loader');
-  await importCustomEmojiData();
+  const emojis = await importCustomEmojiData();
+  if (emojis) {
+    log('loaded %d custom emojis', emojis.length);
+  }
   await loadEmojiLocale(userLocale);
   if (userLocale !== 'en') {
     await loadEmojiLocale('en');
   }
 }
 
-export async function loadEmojiLocale(localeString: string) {
+async function loadEmojiLocale(localeString: string) {
   const locale = toSupportedLocale(localeString);
+  const { importEmojiData, localeToPath } = await import('./loader');
 
   if (worker) {
-    worker.postMessage(locale);
+    const path = await localeToPath(locale);
+    log('asking worker to load locale %s from %s', locale, path);
+    messageWorker(locale, path);
   } else {
-    const { importEmojiData } = await import('./loader');
-    await importEmojiData(locale);
+    const emojis = await importEmojiData(locale);
+    if (emojis) {
+      log('loaded %d emojis to locale %s', emojis.length, locale);
+    }
   }
 }
+
+function messageWorker(locale: LocaleOrCustom, path?: string) {
+  if (!worker) {
+    return;
+  }
+  worker.postMessage({ locale, path });
+}

app/javascript/flavours/glitch/features/emoji/loader.ts

@@ -8,44 +8,64 @@ import {
   putLatestEtag,
 } from './database';
 import { toSupportedLocale, toSupportedLocaleOrCustom } from './locale';
-import type { CustomEmojiData, LocaleOrCustom } from './types';
-import { emojiLogger } from './utils';
+import type { CustomEmojiData } from './types';
 
-const log = emojiLogger('loader');
-
-export async function importEmojiData(localeString: string) {
+export async function importEmojiData(localeString: string, path?: string) {
   const locale = toSupportedLocale(localeString);
-  const emojis = await fetchAndCheckEtag<CompactEmoji[]>(locale);
+
+  // Validate the provided path.
+  if (path && !/^[/a-z]*\/packs\/assets\/compact-\w+\.json$/.test(path)) {
+    throw new Error('Invalid path for emoji data');
+  } else {
+    // Otherwise get the path if not provided.
+    path ??= await localeToPath(locale);
+  }
+
+  const emojis = await fetchAndCheckEtag<CompactEmoji[]>(locale, path);
   if (!emojis) {
     return;
   }
   const flattenedEmojis: FlatCompactEmoji[] = flattenEmojiData(emojis);
-  log('loaded %d for %s locale', flattenedEmojis.length, locale);
   await putEmojiData(flattenedEmojis, locale);
+  return flattenedEmojis;
 }
 
 export async function importCustomEmojiData() {
-  const emojis = await fetchAndCheckEtag<CustomEmojiData[]>('custom');
+  const emojis = await fetchAndCheckEtag<CustomEmojiData[]>(
+    'custom',
+    '/api/v1/custom_emojis',
+  );
   if (!emojis) {
     return;
   }
-  log('loaded %d custom emojis', emojis.length);
   await putCustomEmojiData(emojis);
+  return emojis;
 }
 
-async function fetchAndCheckEtag<ResultType extends object[]>(
-  localeOrCustom: LocaleOrCustom,
+const modules = import.meta.glob<string>(
+  '../../../../../../node_modules/emojibase-data/**/compact.json',
+  {
+    query: '?url',
+    import: 'default',
+  },
+);
+
+export function localeToPath(locale: Locale) {
+  const key = `../../../../../../node_modules/emojibase-data/${locale}/compact.json`;
+  if (!modules[key] || typeof modules[key] !== 'function') {
+    throw new Error(`Unsupported locale: ${locale}`);
+  }
+  return modules[key]();
+}
+
+export async function fetchAndCheckEtag<ResultType extends object[]>(
+  localeString: string,
+  path: string,
 ): Promise<ResultType | null> {
-  const locale = toSupportedLocaleOrCustom(localeOrCustom);
+  const locale = toSupportedLocaleOrCustom(localeString);
 
   // Use location.origin as this script may be loaded from a CDN domain.
-  const url = new URL(location.origin);
-  if (locale === 'custom') {
-    url.pathname = '/api/v1/custom_emojis';
-  } else {
-    const modulePath = await localeToPath(locale);
-    url.pathname = modulePath;
-  }
+  const url = new URL(path, location.origin);
 
   const oldEtag = await loadLatestEtag(locale);
   const response = await fetch(url, {
@@ -60,38 +80,20 @@ async function fetchAndCheckEtag<ResultType extends object[]>(
   }
   if (!response.ok) {
     throw new Error(
-      `Failed to fetch emoji data for ${localeOrCustom}: ${response.statusText}`,
+      `Failed to fetch emoji data for ${locale}: ${response.statusText}`,
     );
   }
 
   const data = (await response.json()) as ResultType;
   if (!Array.isArray(data)) {
-    throw new Error(
-      `Unexpected data format for ${localeOrCustom}: expected an array`,
-    );
+    throw new Error(`Unexpected data format for ${locale}: expected an array`);
   }
 
   // Store the ETag for future requests
   const etag = response.headers.get('ETag');
   if (etag) {
-    await putLatestEtag(etag, localeOrCustom);
+    await putLatestEtag(etag, localeString);
   }
 
   return data;
 }
-
-const modules = import.meta.glob<string>(
-  '../../../../../../node_modules/emojibase-data/**/compact.json',
-  {
-    query: '?url',
-    import: 'default',
-  },
-);
-
-function localeToPath(locale: Locale) {
-  const key = `../../../../../../node_modules/emojibase-data/${locale}/compact.json`;
-  if (!modules[key] || typeof modules[key] !== 'function') {
-    throw new Error(`Unsupported locale: ${locale}`);
-  }
-  return modules[key]();
-}

app/javascript/flavours/glitch/features/emoji/render.test.ts

@@ -162,7 +162,7 @@ describe('loadEmojiDataToState', () => {
     const dbCall = vi
       .spyOn(db, 'loadEmojiByHexcode')
       .mockRejectedValue(new db.LocaleNotLoadedError('en'));
-    vi.spyOn(loader, 'importEmojiData').mockResolvedValueOnce();
+    vi.spyOn(loader, 'importEmojiData').mockResolvedValueOnce(undefined);
     const consoleCall = vi
       .spyOn(console, 'warn')
       .mockImplementationOnce(() => null);

app/javascript/flavours/glitch/features/emoji/worker.ts

@@ -1,18 +1,25 @@
-import { importEmojiData, importCustomEmojiData } from './loader';
+import { importCustomEmojiData, importEmojiData } from './loader';
 
 addEventListener('message', handleMessage);
 self.postMessage('ready'); // After the worker is ready, notify the main thread
 
-function handleMessage(event: MessageEvent<string>) {
-  const { data: locale } = event;
-  void loadData(locale);
+function handleMessage(event: MessageEvent<{ locale: string; path?: string }>) {
+  const {
+    data: { locale, path },
+  } = event;
+  void loadData(locale, path);
 }
 
-async function loadData(locale: string) {
-  if (locale !== 'custom') {
-    await importEmojiData(locale);
+async function loadData(locale: string, path?: string) {
+  let importCount: number | undefined;
+  if (locale === 'custom') {
+    importCount = (await importCustomEmojiData())?.length;
+  } else if (path) {
+    importCount = (await importEmojiData(locale, path))?.length;
   } else {
-    await importCustomEmojiData();
+    throw new Error('Path is required for loading locale emoji data');
+  }
+  if (importCount) {
+    self.postMessage(`loaded ${importCount} emojis into ${locale}`);
   }
-  self.postMessage(`loaded ${locale}`);
 }

app/javascript/flavours/glitch/features/status/components/card.jsx

@@ -37,7 +37,10 @@ const handleIframeUrl = (html, url, providerName) => {
     iframeUrl.searchParams.set('autoplay', 1)
     iframeUrl.searchParams.set('auto_play', 1)
 
-    if (startTime && providerName === "YouTube") iframeUrl.searchParams.set('start', startTime)
+    if (providerName === 'YouTube') {
+      iframeUrl.searchParams.set('start', startTime || '');
+      iframe.referrerPolicy = 'strict-origin-when-cross-origin';
+    }
 
     iframe.src = iframeUrl.href
 

app/javascript/flavours/glitch/features/status/components/detailed_status.tsx

@@ -4,7 +4,7 @@
                   @typescript-eslint/no-unsafe-assignment */
 
 import type { CSSProperties } from 'react';
-import { useState, useRef, useCallback } from 'react';
+import { useState, useRef, useCallback, useEffect } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
@@ -57,6 +57,8 @@ export const DetailedStatus: React.FC<{
   pictureInPicture: any;
   onToggleHidden?: (status: any) => void;
   onToggleMediaVisibility?: () => void;
+  ancestors?: number;
+  multiColumn?: boolean;
   expanded: boolean;
 }> = ({
   status,
@@ -72,6 +74,8 @@ export const DetailedStatus: React.FC<{
   pictureInPicture,
   onToggleMediaVisibility,
   onToggleHidden,
+  ancestors = 0,
+  multiColumn = false,
   expanded,
 }) => {
   const properStatus = status?.get('reblog') ?? status;
@@ -136,6 +140,30 @@ export const DetailedStatus: React.FC<{
     if (onTranslate) onTranslate(status);
   }, [onTranslate, status]);
 
+  // The component is managed and will change if the status changes
+  // Ancestors can increase when loading a thread, in which case we want to scroll,
+  // or decrease if a post is deleted, in which case we don't want to mess with it
+  const previousAncestors = useRef(-1);
+  useEffect(() => {
+    if (nodeRef.current && previousAncestors.current < ancestors) {
+      nodeRef.current.scrollIntoView(true);
+
+      // In the single-column interface, `scrollIntoView` will put the post behind the header, so compensate for that.
+      if (!multiColumn) {
+        const offset = document
+          .querySelector('.column-header__wrapper')
+          ?.getBoundingClientRect().bottom;
+
+        if (offset) {
+          const scrollingElement = document.scrollingElement ?? document.body;
+          scrollingElement.scrollBy(0, -offset);
+        }
+      }
+    }
+
+    previousAncestors.current = ancestors;
+  }, [ancestors, multiColumn]);
+
   if (!properStatus) {
     return null;
   }

app/javascript/flavours/glitch/features/status/index.jsx

@@ -162,7 +162,6 @@ class Status extends ImmutablePureComponent {
   componentDidMount () {
     attachFullscreenListener(this.onFullScreenChange);
     this.props.dispatch(fetchStatus(this.props.params.statusId, { forceFetch: true }));
-    this._scrollStatusIntoView();
   }
 
   static getDerivedStateFromProps(props, state) {
@@ -512,35 +511,11 @@ class Status extends ImmutablePureComponent {
     this.statusNode = c;
   };
 
-  _scrollStatusIntoView () {
-    const { status, multiColumn } = this.props;
-
-    if (status) {
-      requestIdleCallback(() => {
-        this.statusNode?.scrollIntoView(true);
-
-        // In the single-column interface, `scrollIntoView` will put the post behind the header,
-        // so compensate for that.
-        if (!multiColumn) {
-          const offset = document.querySelector('.column-header__wrapper')?.getBoundingClientRect()?.bottom;
-          if (offset) {
-            const scrollingElement = document.scrollingElement || document.body;
-            scrollingElement.scrollBy(0, -offset);
-          }
-        }
-      });
-    }
-  }
-
   componentDidUpdate (prevProps) {
-    const { status, ancestorsIds, descendantsIds } = this.props;
+    const { status, descendantsIds } = this.props;
 
     const isSameStatus = status && (prevProps.status?.get('id') === status.get('id'));
 
-    if (status && (ancestorsIds.length > prevProps.ancestorsIds.length || !isSameStatus)) {
-      this._scrollStatusIntoView();
-    }
-
     // Only highlight replies after the initial load
     if (prevProps.descendantsIds.length && isSameStatus) {
       const newRepliesIds = difference(descendantsIds, prevProps.descendantsIds);
@@ -653,6 +628,8 @@ class Status extends ImmutablePureComponent {
                   showMedia={this.state.showMedia}
                   onToggleMediaVisibility={this.handleToggleMediaVisibility}
                   pictureInPicture={pictureInPicture}
+                  ancestors={this.props.ancestorsIds.length}
+                  multiColumn={multiColumn}
                 />
 
                 <ActionBar

app/javascript/flavours/glitch/features/ui/util/focusUtils.ts

@@ -1,5 +1,3 @@
-import { initialState } from '@/flavours/glitch/initial_state';
-
 interface FocusColumnOptions {
   index?: number;
   focusItem?: 'first' | 'first-visible';
@@ -14,7 +12,10 @@ export function focusColumn({
   focusItem = 'first',
 }: FocusColumnOptions = {}) {
   // Skip the leftmost drawer in multi-column mode
-  const indexOffset = initialState?.meta.advanced_layout ? 1 : 0;
+  const isMultiColumnLayout = !!document.querySelector(
+    'body.layout-multiple-columns',
+  );
+  const indexOffset = isMultiColumnLayout ? 1 : 0;
 
   const column = document.querySelector(
     `.column:nth-child(${index + indexOffset})`,

app/javascript/flavours/glitch/main.tsx

@@ -9,7 +9,6 @@ import { me, reduceMotion } from 'flavours/glitch/initial_state';
 import ready from 'flavours/glitch/ready';
 import { store } from 'flavours/glitch/store';
 
-import { initializeEmoji } from './features/emoji';
 import { isProduction, isDevelopment } from './utils/environment';
 
 function main() {
@@ -30,6 +29,7 @@ function main() {
       });
     }
 
+    const { initializeEmoji } = await import('./features/emoji/index');
     initializeEmoji();
 
     const root = createRoot(mountNode);

app/javascript/flavours/glitch/reducers/compose.js

@@ -213,6 +213,7 @@ function continueThread (state, status) {
     map.set('focusDate', new Date());
     map.set('caretPosition', null);
     map.set('preselectDate', new Date());
+    map.set('quoted_status_id', null);
   });
 }
 
@@ -417,14 +418,16 @@ export const composeReducer = (state = initialState, action) => {
     const isDirect = state.get('privacy') === 'direct';
     return state
       .set('quoted_status_id', isDirect ? null : status.get('id'))
-      .set('spoiler', status.get('sensitive'))
-      .set('spoiler_text', status.get('spoiler_text'))
+      .update('spoiler', spoiler => (spoiler) || !!status.get('spoiler_text'))
+      .update('spoiler_text', (spoiler_text) => spoiler_text || status.get('spoiler_text'))
       .update('privacy', (visibility) => {
         if (['public', 'unlisted'].includes(visibility) && status.get('visibility') === 'private') {
           return 'private';
         }
         return visibility;
-      });
+      }).update('advanced_options',
+        map => map.merge(new ImmutableMap({ do_not_federate: !!status.get('local_only') })),
+      );
   } else if (quoteComposeCancel.match(action)) {
     return state.set('quoted_status_id', null);
   } else if (setComposeQuotePolicy.match(action)) {
@@ -644,7 +647,7 @@ export const composeReducer = (state = initialState, action) => {
         map => map.merge(new ImmutableMap({ do_not_federate })),
       );
       map.set('id', null);
-      map.set('quoted_status_id', action.status.getIn(['quote', 'quoted_status']));
+      map.set('quoted_status_id', action.status.getIn(['quote', 'quoted_status'], null));
       // Mastodon-authored posts can be expected to have at most one automatic approval policy
       map.set('quote_policy', action.status.getIn(['quote_approval', 'automatic', 0]) || 'nobody');
 
@@ -687,7 +690,7 @@ export const composeReducer = (state = initialState, action) => {
       map.set('idempotencyKey', uuid());
       map.set('sensitive', action.status.get('sensitive'));
       map.set('language', action.status.get('language'));
-      map.set('quoted_status_id', action.status.getIn(['quote', 'quoted_status']));
+      map.set('quoted_status_id', action.status.getIn(['quote', 'quoted_status'], null));
       // Mastodon-authored posts can be expected to have at most one automatic approval policy
       map.set('quote_policy', action.status.getIn(['quote_approval', 'automatic', 0]) || 'nobody');
 

app/javascript/flavours/glitch/reducers/statuses.js

@@ -65,6 +65,10 @@ const statusTranslateUndo = (state, id) => {
   });
 };
 
+const removeStatusStub = (state, id) => {
+  return state.getIn([id, 'id']) ? state.deleteIn([id, 'isLoading']) : state.delete(id);
+}
+
 
 /** @type {ImmutableMap<string, import('flavours/glitch/models/status').Status>} */
 const initialState = ImmutableMap();
@@ -92,11 +96,10 @@ export default function statuses(state = initialState, action) {
     return state.setIn([action.id, 'isLoading'], true);
   case STATUS_FETCH_FAIL: {
     if (action.parentQuotePostId && action.error.status === 404) {
-      return state
-        .delete(action.id)
+      return removeStatusStub(state, action.id)
         .setIn([action.parentQuotePostId, 'quote', 'state'], 'deleted')
     } else {
-      return state.delete(action.id);
+      return removeStatusStub(state, action.id);
     }
   }
   case STATUS_IMPORT:

app/javascript/flavours/glitch/selectors/index.js

@@ -32,7 +32,11 @@ function getStatusResultFunction(
     };
   }
 
-  if (statusBase.get('isLoading') && !statusBase.get('content')) {
+  // When a status is loading, a `isLoading` property is set
+  // A status can be loading because it is not known yet (in which case it will only contain `isLoading`)
+  // or because it is being re-fetched; in the latter case, `visibility` will always be set to a non-empty
+  // string.
+  if (statusBase.get('isLoading') && !statusBase.get('visibility')) {
     return {
       status: null,
       loadingState: 'loading',

app/javascript/flavours/glitch/styles/_mixins.scss

@@ -11,7 +11,7 @@
   }
 }
 
-@mixin search-input() {
+@mixin search-input {
   outline: 0;
   box-sizing: border-box;
   width: 100%;
@@ -26,7 +26,7 @@
   margin: 0;
 }
 
-@mixin search-popout() {
+@mixin search-popout {
   background: $simple-background-color;
   border-radius: 4px;
   padding: 10px 14px;

app/javascript/flavours/glitch/styles/accounts.scss

@@ -70,7 +70,7 @@
       margin-inline-start: 15px;
       text-align: start;
 
-      i[data-hidden] {
+      svg[data-hidden] {
         display: none;
       }
 
@@ -138,7 +138,7 @@
 
   .newer {
     float: right;
-    padding-inline-start: 0;
+    padding-inline-end: 0;
   }
 
   .disabled {
@@ -204,6 +204,7 @@
 }
 
 .information-badge,
+.simple_form .overridden,
 .simple_form .recommended,
 .simple_form .not_recommended {
   background-color: color.change($ui-secondary-color, $alpha: 0.1);

app/javascript/flavours/glitch/styles/basics.scss

@@ -168,6 +168,10 @@ a {
 button {
   font-family: inherit;
   cursor: pointer;
+
+  &:focus:not(:focus-visible) {
+    outline: none;
+  }
 }
 
 .app-holder {

app/javascript/flavours/glitch/styles/forms.scss

@@ -700,9 +700,10 @@ code {
       font-family: inherit;
       pointer-events: none;
       cursor: default;
-      max-width: 140px;
+      max-width: 50%;
       white-space: nowrap;
       overflow: hidden;
+      text-overflow: ellipsis;
 
       &::after {
         content: '';
@@ -831,7 +832,7 @@ code {
     }
   }
 
-  @media screen and (width <= 740px) and (width >= 441px) {
+  @media screen and (440px < width <= 740px) {
     margin-top: 40px;
   }
 

app/javascript/flavours/glitch/styles/rtl.scss

@@ -41,27 +41,11 @@ body.rtl {
     float: left;
   }
 
-  .activity-stream .status.light {
-    padding-left: 10px;
-    padding-right: 68px;
-  }
-
-  .status__info .status__display-name,
-  .activity-stream .status.light .status__display-name {
+  .status__info .status__display-name {
     padding-left: 25px;
     padding-right: 0;
   }
 
-  .activity-stream .pre-header {
-    padding-right: 68px;
-    padding-left: 0;
-  }
-
-  .activity-stream .pre-header .pre-header__icon {
-    left: auto;
-    right: 42px;
-  }
-
   .account__header__tabs__buttons > .icon-button {
     margin-right: 0;
     margin-left: 8px;
@@ -93,6 +77,10 @@ body.rtl {
     direction: rtl;
   }
 
+  .react-swipeable-view-container > * {
+    direction: rtl;
+  }
+
   .column-back-button__icon {
     transform: scale(-1, 1);
   }

app/javascript/mastodon/actions/compose.js

@@ -675,8 +675,8 @@ export function selectComposeSuggestion(position, token, suggestion, path) {
 
       dispatch(useEmoji(suggestion));
     } else if (suggestion.type === 'hashtag') {
-      completion    = suggestion.name.slice(token.length - 1);
-      startPosition = position + token.length;
+      completion    = token + suggestion.name.slice(token.length - 1);
+      startPosition = position - 1;
     } else if (suggestion.type === 'account') {
       completion    = `@${getState().getIn(['accounts', suggestion.id, 'acct'])}`;
       startPosition = position - 1;

app/javascript/mastodon/actions/importer/normalizer.js

@@ -112,7 +112,7 @@ export function normalizeStatus(status, normalOldStatus, { bogusQuotePolicy = fa
   }
 
   if (normalOldStatus) {
-    normalStatus.quote_approval ||= normalOldStatus.quote_approval;
+    normalStatus.quote_approval ||= normalOldStatus.get('quote_approval');
 
     const list = normalOldStatus.get('media_attachments');
     if (normalStatus.media_attachments && list) {

app/javascript/mastodon/actions/statuses.js

@@ -85,6 +85,8 @@ export function fetchStatus(id, {
       dispatch(fetchStatusSuccess(skipLoading));
     }).catch(error => {
       dispatch(fetchStatusFail(id, error, skipLoading, parentQuotePostId));
+      if (error.status === 404)
+        dispatch(deleteFromTimelines(id));
     });
   };
 }

app/javascript/mastodon/components/autosuggest_input.jsx

@@ -28,7 +28,7 @@ const textAtCursorMatchesToken = (str, caretPosition, searchTokens) => {
     return [null, null];
   }
 
-  word = word.trim().toLowerCase();
+  word = word.trim();
 
   if (word.length > 0) {
     return [left + 1, word];

app/javascript/mastodon/components/autosuggest_textarea.jsx

@@ -29,7 +29,7 @@ const textAtCursorMatchesToken = (str, caretPosition) => {
     return [null, null];
   }
 
-  word = word.trim().toLowerCase();
+  word = word.trim();
 
   if (word.length > 0) {
     return [left + 1, word];

app/javascript/mastodon/components/hotkeys/index.tsx

@@ -180,25 +180,24 @@ export function useHotkeys<T extends HTMLElement>(handlers: HandlerMap) {
 
       if (shouldHandleEvent) {
         const matchCandidates: {
-          handler: (event: KeyboardEvent) => void;
+          // A candidate will be have an undefined handler if it's matched,
+          // but handled in a parent component rather than this one.
+          handler: ((event: KeyboardEvent) => void) | undefined;
           priority: number;
         }[] = [];
 
         (Object.keys(hotkeyMatcherMap) as HotkeyName[]).forEach(
           (handlerName) => {
             const handler = handlersRef.current[handlerName];
+            const hotkeyMatcher = hotkeyMatcherMap[handlerName];
 
-            if (handler) {
-              const hotkeyMatcher = hotkeyMatcherMap[handlerName];
+            const { isMatch, priority } = hotkeyMatcher(
+              event,
+              bufferedKeys.current,
+            );
 
-              const { isMatch, priority } = hotkeyMatcher(
-                event,
-                bufferedKeys.current,
-              );
-
-              if (isMatch) {
-                matchCandidates.push({ handler, priority });
-              }
+            if (isMatch) {
+              matchCandidates.push({ handler, priority });
             }
           },
         );

app/javascript/mastodon/components/status/handled_link.tsx

@@ -27,16 +27,18 @@ export const HandledLink: FC<HandledLinkProps & ComponentProps<'a'>> = ({
 }) => {
   // Handle hashtags
   if (
-    text.startsWith('#') ||
-    prevText?.endsWith('#') ||
-    text.startsWith('＃') ||
-    prevText?.endsWith('＃')
+    (text.startsWith('#') ||
+      prevText?.endsWith('#') ||
+      text.startsWith('＃') ||
+      prevText?.endsWith('＃')) &&
+    !text.includes('%')
   ) {
     const hashtag = text.slice(1).trim();
+
     return (
       <Link
         className={classNames('mention hashtag', className)}
-        to={`/tags/${hashtag}`}
+        to={`/tags/${encodeURIComponent(hashtag)}`}
         rel='tag'
         data-menu-hashtag={hashtagAccountId}
       >
@@ -73,7 +75,7 @@ export const HandledLink: FC<HandledLinkProps & ComponentProps<'a'>> = ({
       title={href}
       className={classNames('unhandled-link', className)}
       target='_blank'
-      rel='noreferrer noopener'
+      rel='noopener'
       translate='no'
     >
       {children}

app/javascript/mastodon/features/compose/components/compose_form.jsx

@@ -102,6 +102,7 @@ class ComposeForm extends ImmutablePureComponent {
   handleKeyDownPost = (e) => {
     if (e.key.toLowerCase() === 'enter' && (e.ctrlKey || e.metaKey)) {
         this.handleSubmit();
+        e.preventDefault();
     }
     this.blurOnEscape(e);
   };

app/javascript/mastodon/features/compose/containers/compose_form_container.js

@@ -13,6 +13,7 @@ import {
 import { pasteLinkCompose } from 'mastodon/actions/compose_typed';
 import { openModal } from 'mastodon/actions/modal';
 import { PRIVATE_QUOTE_MODAL_ID } from 'mastodon/features/ui/components/confirmation_modals/private_quote_notify';
+import { me } from 'mastodon/initial_state';
 
 import ComposeForm from '../components/compose_form';
 
@@ -36,6 +37,7 @@ const mapStateToProps = state => ({
   quoteToPrivate:
     !!state.getIn(['compose', 'quoted_status_id'])
     && state.getIn(['compose', 'privacy']) === 'private'
+    && state.getIn(['statuses', state.getIn(['compose', 'quoted_status_id']), 'account']) !== me
     && !state.getIn(['settings', 'dismissed_banners', PRIVATE_QUOTE_MODAL_ID]),
   isInReply: state.getIn(['compose', 'in_reply_to']) !== null,
   lang: state.getIn(['compose', 'language']),

app/javascript/mastodon/features/emoji/index.ts

@@ -1,6 +1,7 @@
 import { initialState } from '@/mastodon/initial_state';
 
 import { toSupportedLocale } from './locale';
+import type { LocaleOrCustom } from './types';
 import { emojiLogger } from './utils';
 // eslint-disable-next-line import/default -- Importing via worker loader.
 import EmojiWorker from './worker?worker&inline';
@@ -24,19 +25,17 @@ export function initializeEmoji() {
   }
 
   if (worker) {
-    // Assign worker to const to make TS happy inside the event listener.
-    const thisWorker = worker;
     const timeoutId = setTimeout(() => {
       log('worker is not ready after timeout');
       worker = null;
       void fallbackLoad();
     }, WORKER_TIMEOUT);
-    thisWorker.addEventListener('message', (event: MessageEvent<string>) => {
+    worker.addEventListener('message', (event: MessageEvent<string>) => {
       const { data: message } = event;
       if (message === 'ready') {
         log('worker ready, loading data');
         clearTimeout(timeoutId);
-        thisWorker.postMessage('custom');
+        messageWorker('custom');
         void loadEmojiLocale(userLocale);
         // Load English locale as well, because people are still used to
         // using it from before we supported other locales.
@@ -55,20 +54,35 @@ export function initializeEmoji() {
 async function fallbackLoad() {
   log('falling back to main thread for loading');
   const { importCustomEmojiData } = await import('./loader');
-  await importCustomEmojiData();
+  const emojis = await importCustomEmojiData();
+  if (emojis) {
+    log('loaded %d custom emojis', emojis.length);
+  }
   await loadEmojiLocale(userLocale);
   if (userLocale !== 'en') {
     await loadEmojiLocale('en');
   }
 }
 
-export async function loadEmojiLocale(localeString: string) {
+async function loadEmojiLocale(localeString: string) {
   const locale = toSupportedLocale(localeString);
+  const { importEmojiData, localeToPath } = await import('./loader');
 
   if (worker) {
-    worker.postMessage(locale);
+    const path = await localeToPath(locale);
+    log('asking worker to load locale %s from %s', locale, path);
+    messageWorker(locale, path);
   } else {
-    const { importEmojiData } = await import('./loader');
-    await importEmojiData(locale);
+    const emojis = await importEmojiData(locale);
+    if (emojis) {
+      log('loaded %d emojis to locale %s', emojis.length, locale);
+    }
   }
 }
+
+function messageWorker(locale: LocaleOrCustom, path?: string) {
+  if (!worker) {
+    return;
+  }
+  worker.postMessage({ locale, path });
+}

app/javascript/mastodon/features/emoji/loader.ts

@@ -8,44 +8,64 @@ import {
   putLatestEtag,
 } from './database';
 import { toSupportedLocale, toSupportedLocaleOrCustom } from './locale';
-import type { CustomEmojiData, LocaleOrCustom } from './types';
-import { emojiLogger } from './utils';
+import type { CustomEmojiData } from './types';
 
-const log = emojiLogger('loader');
-
-export async function importEmojiData(localeString: string) {
+export async function importEmojiData(localeString: string, path?: string) {
   const locale = toSupportedLocale(localeString);
-  const emojis = await fetchAndCheckEtag<CompactEmoji[]>(locale);
+
+  // Validate the provided path.
+  if (path && !/^[/a-z]*\/packs\/assets\/compact-\w+\.json$/.test(path)) {
+    throw new Error('Invalid path for emoji data');
+  } else {
+    // Otherwise get the path if not provided.
+    path ??= await localeToPath(locale);
+  }
+
+  const emojis = await fetchAndCheckEtag<CompactEmoji[]>(locale, path);
   if (!emojis) {
     return;
   }
   const flattenedEmojis: FlatCompactEmoji[] = flattenEmojiData(emojis);
-  log('loaded %d for %s locale', flattenedEmojis.length, locale);
   await putEmojiData(flattenedEmojis, locale);
+  return flattenedEmojis;
 }
 
 export async function importCustomEmojiData() {
-  const emojis = await fetchAndCheckEtag<CustomEmojiData[]>('custom');
+  const emojis = await fetchAndCheckEtag<CustomEmojiData[]>(
+    'custom',
+    '/api/v1/custom_emojis',
+  );
   if (!emojis) {
     return;
   }
-  log('loaded %d custom emojis', emojis.length);
   await putCustomEmojiData(emojis);
+  return emojis;
 }
 
-async function fetchAndCheckEtag<ResultType extends object[]>(
-  localeOrCustom: LocaleOrCustom,
+const modules = import.meta.glob<string>(
+  '../../../../../node_modules/emojibase-data/**/compact.json',
+  {
+    query: '?url',
+    import: 'default',
+  },
+);
+
+export function localeToPath(locale: Locale) {
+  const key = `../../../../../node_modules/emojibase-data/${locale}/compact.json`;
+  if (!modules[key] || typeof modules[key] !== 'function') {
+    throw new Error(`Unsupported locale: ${locale}`);
+  }
+  return modules[key]();
+}
+
+export async function fetchAndCheckEtag<ResultType extends object[]>(
+  localeString: string,
+  path: string,
 ): Promise<ResultType | null> {
-  const locale = toSupportedLocaleOrCustom(localeOrCustom);
+  const locale = toSupportedLocaleOrCustom(localeString);
 
   // Use location.origin as this script may be loaded from a CDN domain.
-  const url = new URL(location.origin);
-  if (locale === 'custom') {
-    url.pathname = '/api/v1/custom_emojis';
-  } else {
-    const modulePath = await localeToPath(locale);
-    url.pathname = modulePath;
-  }
+  const url = new URL(path, location.origin);
 
   const oldEtag = await loadLatestEtag(locale);
   const response = await fetch(url, {
@@ -60,38 +80,20 @@ async function fetchAndCheckEtag<ResultType extends object[]>(
   }
   if (!response.ok) {
     throw new Error(
-      `Failed to fetch emoji data for ${localeOrCustom}: ${response.statusText}`,
+      `Failed to fetch emoji data for ${locale}: ${response.statusText}`,
     );
   }
 
   const data = (await response.json()) as ResultType;
   if (!Array.isArray(data)) {
-    throw new Error(
-      `Unexpected data format for ${localeOrCustom}: expected an array`,
-    );
+    throw new Error(`Unexpected data format for ${locale}: expected an array`);
   }
 
   // Store the ETag for future requests
   const etag = response.headers.get('ETag');
   if (etag) {
-    await putLatestEtag(etag, localeOrCustom);
+    await putLatestEtag(etag, localeString);
   }
 
   return data;
 }
-
-const modules = import.meta.glob<string>(
-  '../../../../../node_modules/emojibase-data/**/compact.json',
-  {
-    query: '?url',
-    import: 'default',
-  },
-);
-
-function localeToPath(locale: Locale) {
-  const key = `../../../../../node_modules/emojibase-data/${locale}/compact.json`;
-  if (!modules[key] || typeof modules[key] !== 'function') {
-    throw new Error(`Unsupported locale: ${locale}`);
-  }
-  return modules[key]();
-}

app/javascript/mastodon/features/emoji/render.test.ts

@@ -162,7 +162,7 @@ describe('loadEmojiDataToState', () => {
     const dbCall = vi
       .spyOn(db, 'loadEmojiByHexcode')
       .mockRejectedValue(new db.LocaleNotLoadedError('en'));
-    vi.spyOn(loader, 'importEmojiData').mockResolvedValueOnce();
+    vi.spyOn(loader, 'importEmojiData').mockResolvedValueOnce(undefined);
     const consoleCall = vi
       .spyOn(console, 'warn')
       .mockImplementationOnce(() => null);

app/javascript/mastodon/features/emoji/worker.ts

@@ -1,18 +1,25 @@
-import { importEmojiData, importCustomEmojiData } from './loader';
+import { importCustomEmojiData, importEmojiData } from './loader';
 
 addEventListener('message', handleMessage);
 self.postMessage('ready'); // After the worker is ready, notify the main thread
 
-function handleMessage(event: MessageEvent<string>) {
-  const { data: locale } = event;
-  void loadData(locale);
+function handleMessage(event: MessageEvent<{ locale: string; path?: string }>) {
+  const {
+    data: { locale, path },
+  } = event;
+  void loadData(locale, path);
 }
 
-async function loadData(locale: string) {
-  if (locale !== 'custom') {
-    await importEmojiData(locale);
+async function loadData(locale: string, path?: string) {
+  let importCount: number | undefined;
+  if (locale === 'custom') {
+    importCount = (await importCustomEmojiData())?.length;
+  } else if (path) {
+    importCount = (await importEmojiData(locale, path))?.length;
   } else {
-    await importCustomEmojiData();
+    throw new Error('Path is required for loading locale emoji data');
+  }
+  if (importCount) {
+    self.postMessage(`loaded ${importCount} emojis into ${locale}`);
   }
-  self.postMessage(`loaded ${locale}`);
 }

app/javascript/mastodon/features/status/components/card.jsx

@@ -48,7 +48,10 @@ const handleIframeUrl = (html, url, providerName) => {
     iframeUrl.searchParams.set('autoplay', 1)
     iframeUrl.searchParams.set('auto_play', 1)
 
-    if (startTime && providerName === "YouTube") iframeUrl.searchParams.set('start', startTime)
+    if (providerName === 'YouTube') {
+      iframeUrl.searchParams.set('start', startTime || '');
+      iframe.referrerPolicy = 'strict-origin-when-cross-origin';
+    }
 
     iframe.src = iframeUrl.href
 

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

@@ -4,7 +4,7 @@
                   @typescript-eslint/no-unsafe-assignment */
 
 import type { CSSProperties } from 'react';
-import { useState, useRef, useCallback } from 'react';
+import { useState, useRef, useCallback, useEffect } from 'react';
 
 import { FormattedMessage } from 'react-intl';
 
@@ -55,6 +55,8 @@ export const DetailedStatus: React.FC<{
   pictureInPicture: any;
   onToggleHidden?: (status: any) => void;
   onToggleMediaVisibility?: () => void;
+  ancestors?: number;
+  multiColumn?: boolean;
 }> = ({
   status,
   onOpenMedia,
@@ -69,6 +71,8 @@ export const DetailedStatus: React.FC<{
   pictureInPicture,
   onToggleMediaVisibility,
   onToggleHidden,
+  ancestors = 0,
+  multiColumn = false,
 }) => {
   const properStatus = status?.get('reblog') ?? status;
   const [height, setHeight] = useState(0);
@@ -123,6 +127,30 @@ export const DetailedStatus: React.FC<{
     if (onTranslate) onTranslate(status);
   }, [onTranslate, status]);
 
+  // The component is managed and will change if the status changes
+  // Ancestors can increase when loading a thread, in which case we want to scroll,
+  // or decrease if a post is deleted, in which case we don't want to mess with it
+  const previousAncestors = useRef(-1);
+  useEffect(() => {
+    if (nodeRef.current && previousAncestors.current < ancestors) {
+      nodeRef.current.scrollIntoView(true);
+
+      // In the single-column interface, `scrollIntoView` will put the post behind the header, so compensate for that.
+      if (!multiColumn) {
+        const offset = document
+          .querySelector('.column-header__wrapper')
+          ?.getBoundingClientRect().bottom;
+
+        if (offset) {
+          const scrollingElement = document.scrollingElement ?? document.body;
+          scrollingElement.scrollBy(0, -offset);
+        }
+      }
+    }
+
+    previousAncestors.current = ancestors;
+  }, [ancestors, multiColumn]);
+
   if (!properStatus) {
     return null;
   }

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

@@ -164,8 +164,6 @@ class Status extends ImmutablePureComponent {
 
   componentDidMount () {
     attachFullscreenListener(this.onFullScreenChange);
-
-    this._scrollStatusIntoView();
   }
 
   UNSAFE_componentWillReceiveProps (nextProps) {
@@ -487,35 +485,11 @@ class Status extends ImmutablePureComponent {
     this.statusNode = c;
   };
 
-  _scrollStatusIntoView () {
-    const { status, multiColumn } = this.props;
-
-    if (status) {
-      requestIdleCallback(() => {
-        this.statusNode?.scrollIntoView(true);
-
-        // In the single-column interface, `scrollIntoView` will put the post behind the header,
-        // so compensate for that.
-        if (!multiColumn) {
-          const offset = document.querySelector('.column-header__wrapper')?.getBoundingClientRect()?.bottom;
-          if (offset) {
-            const scrollingElement = document.scrollingElement || document.body;
-            scrollingElement.scrollBy(0, -offset);
-          }
-        }
-      });
-    }
-  }
-
   componentDidUpdate (prevProps) {
-    const { status, ancestorsIds, descendantsIds } = this.props;
+    const { status, descendantsIds } = this.props;
 
     const isSameStatus = status && (prevProps.status?.get('id') === status.get('id'));
 
-    if (status && (ancestorsIds.length > prevProps.ancestorsIds.length || !isSameStatus)) {
-      this._scrollStatusIntoView();
-    }
-
     // Only highlight replies after the initial load
     if (prevProps.descendantsIds.length && isSameStatus) {
       const newRepliesIds = difference(descendantsIds, prevProps.descendantsIds);
@@ -619,6 +593,8 @@ class Status extends ImmutablePureComponent {
                   showMedia={this.state.showMedia}
                   onToggleMediaVisibility={this.handleToggleMediaVisibility}
                   pictureInPicture={pictureInPicture}
+                  ancestors={this.props.ancestorsIds.length}
+                  multiColumn={multiColumn}
                 />
 
                 <ActionBar

app/javascript/mastodon/features/ui/util/focusUtils.ts

@@ -1,5 +1,3 @@
-import { initialState } from '@/mastodon/initial_state';
-
 interface FocusColumnOptions {
   index?: number;
   focusItem?: 'first' | 'first-visible';
@@ -14,7 +12,10 @@ export function focusColumn({
   focusItem = 'first',
 }: FocusColumnOptions = {}) {
   // Skip the leftmost drawer in multi-column mode
-  const indexOffset = initialState?.meta.advanced_layout ? 1 : 0;
+  const isMultiColumnLayout = !!document.querySelector(
+    'body.layout-multiple-columns',
+  );
+  const indexOffset = isMultiColumnLayout ? 1 : 0;
 
   const column = document.querySelector(
     `.column:nth-child(${index + indexOffset})`,

app/javascript/mastodon/locales/ca.json

@@ -248,6 +248,8 @@
   "confirmations.missing_alt_text.title": "Hi voleu afegir text alternatiu?",
   "confirmations.mute.confirm": "Silencia",
   "confirmations.private_quote_notify.cancel": "Torna a l'edició",
+  "confirmations.private_quote_notify.confirm": "Publica la publicació",
+  "confirmations.private_quote_notify.do_not_show_again": "No tornis a mostrar-me aquest missatge",
   "confirmations.private_quote_notify.message": "La persona que citeu i altres mencionades rebran una notificació i podran veure la vostra publicació, encara que no us segueixen.",
   "confirmations.private_quote_notify.title": "Voleu compartir amb seguidors i usuaris mencionats?",
   "confirmations.quiet_post_quote_info.dismiss": "No m'ho tornis a recordar",
@@ -339,7 +341,7 @@
   "empty_column.bookmarked_statuses": "Encara no has marcat cap tut. Quan en marquis un, apareixerà aquí.",
   "empty_column.community": "La línia de temps local és buida. Escriu alguna cosa públicament per posar-ho tot en marxa!",
   "empty_column.direct": "Encara no tens mencions privades. Quan n'enviïs o en rebis una, et sortirà aquí.",
-  "empty_column.disabled_feed": "Aquest canal ha estat desactivat per l'administració del vostre servidor.",
+  "empty_column.disabled_feed": "L'administració del vostre servidor ha desactivat aquest canal.",
   "empty_column.domain_blocks": "Encara no hi ha dominis blocats.",
   "empty_column.explore_statuses": "No hi ha res en tendència ara mateix. Revisa-ho més tard!",
   "empty_column.favourited_statuses": "Encara no has afavorit cap tut. Quan ho facis, apareixerà aquí.",

app/javascript/mastodon/locales/da.json

@@ -15,7 +15,7 @@
   "about.rules": "Serverregler",
   "account.account_note_header": "Personligt notat",
   "account.add_or_remove_from_list": "Tilføj eller fjern fra lister",
-  "account.badges.bot": "Bot",
+  "account.badges.bot": "Automatisert",
   "account.badges.group": "Gruppe",
   "account.block": "Blokér @{name}",
   "account.block_domain": "Blokér domænet {domain}",
@@ -28,7 +28,7 @@
   "account.disable_notifications": "Giv mig ikke længere en notifikation, når @{name} laver indlæg",
   "account.domain_blocking": "Blokerer domæne",
   "account.edit_profile": "Redigér profil",
-  "account.edit_profile_short": "Redigér",
+  "account.edit_profile_short": "Rediger",
   "account.enable_notifications": "Giv mig besked, når @{name} laver indlæg",
   "account.endorse": "Fremhæv på profil",
   "account.familiar_followers_many": "Følges af {name1}, {name2} og {othersCount, plural, one {# mere, man kender} other {# mere, du kender}}",
@@ -51,7 +51,7 @@
   "account.followers_counter": "{count, plural, one {{counter} følger} other {{counter} følgere}}",
   "account.followers_you_know_counter": "{counter} du kender",
   "account.following": "Følger",
-  "account.following_counter": "{count, plural, one {{counter} følger} other {{counter} følger}}",
+  "account.following_counter": "{count, plural, one {{counter} fulgt} other {{counter} fulgte}}",
   "account.follows.empty": "Denne bruger følger ikke nogen endnu.",
   "account.follows_you": "Følger dig",
   "account.go_to_profile": "Gå til profil",
@@ -117,20 +117,20 @@
   "annual_report.summary.archetype.lurker": "Lureren",
   "annual_report.summary.archetype.oracle": "Oraklet",
   "annual_report.summary.archetype.pollster": "Afstemningsmageren",
-  "annual_report.summary.archetype.replier": "Den social sommerfugl",
+  "annual_report.summary.archetype.replier": "Den sociale sommerfugl",
   "annual_report.summary.followers.followers": "følgere",
   "annual_report.summary.followers.total": "{count} i alt",
   "annual_report.summary.here_it_is": "Her er dit {year} i sammendrag:",
   "annual_report.summary.highlighted_post.by_favourites": "mest favoritmarkerede indlæg",
   "annual_report.summary.highlighted_post.by_reblogs": "mest fremhævede indlæg",
-  "annual_report.summary.highlighted_post.by_replies": "mest besvarede indlæg",
+  "annual_report.summary.highlighted_post.by_replies": "indlæg med flest svar",
   "annual_report.summary.highlighted_post.possessive": "{name}s",
   "annual_report.summary.most_used_app.most_used_app": "mest benyttede app",
   "annual_report.summary.most_used_hashtag.most_used_hashtag": "mest benyttede hashtag",
   "annual_report.summary.most_used_hashtag.none": "Intet",
   "annual_report.summary.new_posts.new_posts": "nye indlæg",
   "annual_report.summary.percentile.text": "<topLabel>Dermed er du i top</topLabel><percentage></percentage><bottomLabel>af {domain}-brugere.</bottomLabel>",
-  "annual_report.summary.percentile.we_wont_tell_bernie": "Vi fortæller det ikke til Pernille Skipper.",
+  "annual_report.summary.percentile.we_wont_tell_bernie": "Vi fortæller det ikke til nogen.",
   "annual_report.summary.thanks": "Tak for at være en del af Mastodon!",
   "attachments_list.unprocessed": "(ubehandlet)",
   "audio.hide": "Skjul lyd",
@@ -144,7 +144,7 @@
   "block_modal.you_wont_see_mentions": "Du vil ikke se indlæg, som omtaler vedkommende.",
   "boost_modal.combo": "Du kan trykke {combo} for at springe dette over næste gang",
   "boost_modal.reblog": "Fremhæv indlæg?",
-  "boost_modal.undo_reblog": "Fjern fremhævning af indlæg?",
+  "boost_modal.undo_reblog": "Fjern fremhævelse af indlæg?",
   "bundle_column_error.copy_stacktrace": "Kopiér fejlrapport",
   "bundle_column_error.error.body": "Den anmodede side kunne ikke gengives. Dette kan skyldes flere typer fejl.",
   "bundle_column_error.error.title": "Åh nej!",
@@ -152,12 +152,12 @@
   "bundle_column_error.network.title": "Netværksfejl",
   "bundle_column_error.retry": "Forsøg igen",
   "bundle_column_error.return": "Tilbage til hjem",
-  "bundle_column_error.routing.body": "Den anmodede side kunne ikke findes. Er du sikker på, at URL'en er korrekt?",
+  "bundle_column_error.routing.body": "Den ønskede side kunne ikke findes. Er du sikker på, at URL'en i adresselinjen er korrekt?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Luk",
   "bundle_modal_error.message": "Noget gik galt under indlæsningen af denne skærm.",
   "bundle_modal_error.retry": "Forsøg igen",
-  "closed_registrations.other_server_instructions": "Da Mastodon er decentraliseret, kan du oprette en konto på en anden server og stadig interagere med denne.",
+  "closed_registrations.other_server_instructions": "Eftersom Mastodon er decentraliseret, kan du oprette en konto på en anden server og stadig interagere med denne.",
   "closed_registrations_modal.description": "Oprettelse af en konto på {domain} er i øjeblikket ikke muligt, men husk på, at du ikke behøver en konto specifikt på {domain} for at bruge Mastodon.",
   "closed_registrations_modal.find_another_server": "Find en anden server",
   "closed_registrations_modal.preamble": "Mastodon er decentraliseret, så uanset hvor du opretter din konto, vil du være i stand til at følge og interagere med hvem som helst på denne server. Du kan endda selv være vært for den!",
@@ -168,7 +168,7 @@
   "column.community": "Lokal tidslinje",
   "column.create_list": "Opret liste",
   "column.direct": "Private omtaler",
-  "column.directory": "Tjek profiler",
+  "column.directory": "Gennemse profiler",
   "column.domain_blocks": "Blokerede domæner",
   "column.edit_list": "Redigér liste",
   "column.favourites": "Favoritter",
@@ -229,7 +229,7 @@
   "confirmations.delete_list.title": "Slet liste?",
   "confirmations.discard_draft.confirm": "Kassér og fortsæt",
   "confirmations.discard_draft.edit.cancel": "Fortsæt redigering",
-  "confirmations.discard_draft.edit.message": "Hvis du fortsætter, kasseres alle ændringer, du har foretaget i det indlæg, du er i gang med at redigere.",
+  "confirmations.discard_draft.edit.message": "Hvis du fortsætter, vil alle ændringer, du har foretaget i det indlæg, du er er ved at redigere, blive slettet.",
   "confirmations.discard_draft.edit.title": "Kassér ændringer til dit indlæg?",
   "confirmations.discard_draft.post.cancel": "Genoptag udkast",
   "confirmations.discard_draft.post.message": "Hvis du fortsætter, kasseres det indlæg, du er i gang med at udforme.",
@@ -273,7 +273,7 @@
   "confirmations.withdraw_request.title": "Annullér anmodning om at følge {name}?",
   "content_warning.hide": "Skjul indlæg",
   "content_warning.show": "Vis alligevel",
-  "content_warning.show_more": "Vis flere",
+  "content_warning.show_more": "Vis mere",
   "conversation.delete": "Slet samtale",
   "conversation.mark_as_read": "Markér som læst",
   "conversation.open": "Vis samtale",
@@ -325,7 +325,7 @@
   "emoji_button.not_found": "Ingen matchende emojis fundet",
   "emoji_button.objects": "Objekter",
   "emoji_button.people": "Personer",
-  "emoji_button.recent": "Oftest brugt",
+  "emoji_button.recent": "Ofte brugt",
   "emoji_button.search": "Søg...",
   "emoji_button.search_results": "Søgeresultater",
   "emoji_button.symbols": "Symboler",
@@ -337,7 +337,7 @@
   "empty_column.account_suspended": "Konto suspenderet",
   "empty_column.account_timeline": "Ingen indlæg her!",
   "empty_column.account_unavailable": "Profil utilgængelig",
-  "empty_column.blocks": "Ingen brugere blokeret endnu.",
+  "empty_column.blocks": "Du har ikke blokeret nogle brugere endnu.",
   "empty_column.bookmarked_statuses": "Du har ingen bogmærkede indlæg endnu. Når du bogmærker ét, vil det dukke op hér.",
   "empty_column.community": "Den lokale tidslinje er tom. Skriv noget offentligt for at sætte tingene i gang!",
   "empty_column.direct": "Du har ikke nogen private omtaler endnu. Når du sender eller modtager en, vil den blive vist her.",
@@ -366,7 +366,7 @@
   "explore.trending_links": "Nyheder",
   "explore.trending_statuses": "Indlæg",
   "explore.trending_tags": "Hashtags",
-  "featured_carousel.header": "{count, plural, one {Fastgjort indlæg} other {Fastgjorte indlæg}}",
+  "featured_carousel.header": "{count, plural, one {fastgjort indlæg} other {fastgjorte indlæg}}",
   "featured_carousel.next": "Næste",
   "featured_carousel.post": "Indlæg",
   "featured_carousel.previous": "Foregående",
@@ -506,7 +506,7 @@
   "keyboard_shortcuts.pinned": "Åbn liste over fastgjorte indlæg",
   "keyboard_shortcuts.profile": "Åbn forfatters profil",
   "keyboard_shortcuts.quote": "Citér indlæg",
-  "keyboard_shortcuts.reply": "Besvar indlægget",
+  "keyboard_shortcuts.reply": "Besvar indlæg",
   "keyboard_shortcuts.requests": "Åbn liste over følgeanmodninger",
   "keyboard_shortcuts.search": "Fokusér søgebjælke",
   "keyboard_shortcuts.spoilers": "Vis/skjul indholdsadvarsel-felt",
@@ -580,7 +580,7 @@
   "navigation_bar.filters": "Skjulte ord",
   "navigation_bar.follow_requests": "Følgeanmodninger",
   "navigation_bar.followed_tags": "Hashtags, som følges",
-  "navigation_bar.follows_and_followers": "Følges og følgere",
+  "navigation_bar.follows_and_followers": "Følger og følgere",
   "navigation_bar.import_export": "Import og eksport",
   "navigation_bar.lists": "Lister",
   "navigation_bar.live_feed_local": "Live feed (lokalt)",
@@ -606,7 +606,7 @@
   "notification.admin.report_statuses_other": "{name} anmeldte {target}",
   "notification.admin.sign_up": "{name} tilmeldte sig",
   "notification.admin.sign_up.name_and_others": "{name} og {count, plural, one {# anden} other {# andre}} tilmeldte sig",
-  "notification.annual_report.message": "{year} #Wrapstodon venter! Afslør årets højdepunkter og mindeværdige øjeblikke på Mastodon!",
+  "notification.annual_report.message": "Din {year} #Wrapstodon venter! Afslør årets højdepunkter og mindeværdige øjeblikke på Mastodon!",
   "notification.annual_report.view": "Vis #Wrapstodon",
   "notification.favourite": "{name} føjede dit indlæg til favoritter",
   "notification.favourite.name_and_others_with_link": "{name} og <a>{count, plural, one {# anden} other {# andre}}</a> føjede dit indlæg til favoritter",
@@ -674,7 +674,7 @@
   "notifications.column_settings.filter_bar.category": "Hurtigfiltreringsbjælke",
   "notifications.column_settings.follow": "Nye følgere:",
   "notifications.column_settings.follow_request": "Nye følgeanmodninger:",
-  "notifications.column_settings.group": "Gruppere",
+  "notifications.column_settings.group": "Gruppér",
   "notifications.column_settings.mention": "Omtaler:",
   "notifications.column_settings.poll": "Afstemningsresultater:",
   "notifications.column_settings.push": "Push-notifikationer",
@@ -763,7 +763,7 @@
   "privacy_policy.last_updated": "Senest opdateret {date}",
   "privacy_policy.title": "Privatlivspolitik",
   "quote_error.edit": "Citater kan ikke tilføjes ved redigering af et indlæg.",
-  "quote_error.poll": "Citering ikke tilladt i afstemninger.",
+  "quote_error.poll": "Citering er ikke tilladt med afstemninger.",
   "quote_error.private_mentions": "Citering er ikke tilladt med direkte omtaler.",
   "quote_error.quote": "Kun ét citat ad gangen er tilladt.",
   "quote_error.unauthorized": "Du har ikke tilladelse til at citere dette indlæg.",
@@ -866,7 +866,7 @@
   "search_results.title": "Søg efter \"{q}\"",
   "server_banner.about_active_users": "Personer, som brugte denne server de seneste 30 dage (månedlige aktive brugere)",
   "server_banner.active_users": "aktive brugere",
-  "server_banner.administered_by": "Håndteres af:",
+  "server_banner.administered_by": "Administreret af:",
   "server_banner.is_one_of_many": "{domain} er en af de mange uafhængige Mastodon-servere, du kan bruge for at deltage i fediverset.",
   "server_banner.server_stats": "Serverstatstik:",
   "sign_in_banner.create_account": "Opret konto",
@@ -901,7 +901,7 @@
   "status.edited": "Senest redigeret {date}",
   "status.edited_x_times": "Redigeret {count, plural, one {{count} gang} other {{count} gange}}",
   "status.embed": "Hent indlejringskode",
-  "status.favourite": "Favorit",
+  "status.favourite": "Favoritmarkér",
   "status.favourites": "{count, plural, one {# favorit} other {# favoritter}}",
   "status.filter": "Filtrér dette indlæg",
   "status.history.created": "{name} oprettet {date}",
@@ -990,7 +990,7 @@
   "units.short.million": "{count} mio.",
   "units.short.thousand": "{count} tusind",
   "upload_area.title": "Træk og slip for at uploade",
-  "upload_button.label": "Tilføj billed-, video- eller lydfil(er)",
+  "upload_button.label": "Tilføj billeder, en video- eller lydfil",
   "upload_error.limit": "Grænse for filupload nået.",
   "upload_error.poll": "Filupload ikke tilladt for afstemninger.",
   "upload_error.quote": "Fil-upload ikke tilladt i citater.",

app/javascript/mastodon/locales/de.json

@@ -1,13 +1,13 @@
 {
-  "about.blocks": "Moderierte Server",
+  "about.blocks": "Eingeschränkte Server",
   "about.contact": "Kontakt:",
   "about.default_locale": "Standard",
   "about.disclaimer": "Mastodon ist eine freie, quelloffene Software und eine Marke der Mastodon gGmbH.",
-  "about.domain_blocks.no_reason_available": "Grund unbekannt",
+  "about.domain_blocks.no_reason_available": "Keinen Grund angegeben",
   "about.domain_blocks.preamble": "Mastodon erlaubt es dir grundsätzlich, alle Inhalte von allen Nutzer*innen auf allen Servern im Fediverse zu sehen und mit ihnen zu interagieren. Für diesen Server gibt es aber ein paar Ausnahmen.",
   "about.domain_blocks.silenced.explanation": "Standardmäßig werden von diesem Server keine Inhalte oder Profile angezeigt. Du kannst die Profile und Inhalte aber dennoch sehen, wenn du explizit nach diesen suchst oder diesen folgst.",
-  "about.domain_blocks.silenced.title": "Ausgeblendet",
-  "about.domain_blocks.suspended.explanation": "Es werden keine Daten von diesem Server verarbeitet, gespeichert oder ausgetauscht, sodass eine Interaktion oder Kommunikation mit Nutzer*innen dieses Servers nicht möglich ist.",
+  "about.domain_blocks.silenced.title": "Stummgeschaltet",
+  "about.domain_blocks.suspended.explanation": "Es werden keine Daten von diesem Server verarbeitet, gespeichert oder ausgetauscht, sodass eine Interaktion oder Kommunikation mit Profilen dieses Servers nicht möglich ist.",
   "about.domain_blocks.suspended.title": "Gesperrt",
   "about.language_label": "Sprache",
   "about.not_available": "Diese Informationen sind auf diesem Server nicht verfügbar.",
@@ -15,21 +15,21 @@
   "about.rules": "Serverregeln",
   "account.account_note_header": "Persönliche Notiz",
   "account.add_or_remove_from_list": "Hinzufügen oder Entfernen von Listen",
-  "account.badges.bot": "Automatisiert",
+  "account.badges.bot": "Bot",
   "account.badges.group": "Gruppe",
   "account.block": "@{name} blockieren",
-  "account.block_domain": "{domain} sperren",
+  "account.block_domain": "{domain} blockieren",
   "account.block_short": "Blockieren",
   "account.blocked": "Blockiert",
   "account.blocking": "Blockiert",
-  "account.cancel_follow_request": "Follower-Anfrage zurückziehen",
+  "account.cancel_follow_request": "Anfrage zurückziehen",
   "account.copy": "Link zum Profil kopieren",
   "account.direct": "@{name} privat erwähnen",
-  "account.disable_notifications": "Höre auf mich zu benachrichtigen wenn @{name} etwas postet",
+  "account.disable_notifications": "Benachrichtige mich nicht mehr, wenn @{name} etwas veröffentlicht",
   "account.domain_blocking": "Domain blockiert",
   "account.edit_profile": "Profil bearbeiten",
   "account.edit_profile_short": "Bearbeiten",
-  "account.enable_notifications": "Benachrichtige mich wenn @{name} etwas postet",
+  "account.enable_notifications": "Benachrichtige mich, wenn @{name} etwas veröffentlicht",
   "account.endorse": "Im Profil vorstellen",
   "account.familiar_followers_many": "Gefolgt von {name1}, {name2} und {othersCount, plural, one {einem weiteren Profil, das dir bekannt ist} other {# weiteren Profilen, die dir bekannt sind}}",
   "account.familiar_followers_one": "Gefolgt von {name1}",
@@ -37,13 +37,13 @@
   "account.featured": "Vorgestellt",
   "account.featured.accounts": "Profile",
   "account.featured.hashtags": "Hashtags",
-  "account.featured_tags.last_status_at": "Letzter Beitrag am {date}",
+  "account.featured_tags.last_status_at": "Neuester Beitrag vom {date}",
   "account.featured_tags.last_status_never": "Keine Beiträge",
   "account.follow": "Folgen",
   "account.follow_back": "Ebenfalls folgen",
-  "account.follow_back_short": "Ebenfalls folgen",
+  "account.follow_back_short": "Zurückfolgen",
   "account.follow_request": "Anfrage zum Folgen",
-  "account.follow_request_cancel": "Anfrage abbrechen",
+  "account.follow_request_cancel": "Anfrage zurückziehen",
   "account.follow_request_cancel_short": "Abbrechen",
   "account.follow_request_short": "Anfragen",
   "account.followers": "Follower",
@@ -58,8 +58,8 @@
   "account.hide_reblogs": "Geteilte Beiträge von @{name} ausblenden",
   "account.in_memoriam": "Zum Andenken.",
   "account.joined_short": "Mitglied seit",
-  "account.languages": "Sprache ändern.",
-  "account.link_verified_on": "Das Profil mit dieser E-Mail-Adresse wurde bereits am {date} verifiziert",
+  "account.languages": "Ausgewählte Sprachen ändern",
+  "account.link_verified_on": "Das Profil mit dieser E-Mail-Adresse wurde bereits am {date} bestätigt",
   "account.locked_info": "Die Privatsphäre dieses Kontos wurde auf „geschützt“ gesetzt. Die Person bestimmt manuell, wer ihrem Profil folgen darf.",
   "account.media": "Medien",
   "account.mention": "@{name} erwähnen",
@@ -73,51 +73,51 @@
   "account.no_bio": "Keine Beschreibung verfügbar.",
   "account.open_original_page": "Ursprüngliche Seite öffnen",
   "account.posts": "Beiträge",
-  "account.posts_with_replies": "Beiträge und Antworten",
-  "account.remove_from_followers": "{name} als Follower entfernen",
+  "account.posts_with_replies": "Beiträge & Antworten",
+  "account.remove_from_followers": "@{name} als Follower entfernen",
   "account.report": "@{name} melden",
   "account.requested_follow": "{name} möchte dir folgen",
   "account.requests_to_follow_you": "Möchte dir folgen",
   "account.share": "Profil von @{name} teilen",
   "account.show_reblogs": "Geteilte Beiträge von @{name} anzeigen",
   "account.statuses_counter": "{count, plural, one {{counter} Beitrag} other {{counter} Beiträge}}",
-  "account.unblock": "{name} nicht mehr blockieren",
+  "account.unblock": "Blockierung von {name} aufheben",
   "account.unblock_domain": "Blockierung von {domain} aufheben",
-  "account.unblock_domain_short": "Entsperren",
+  "account.unblock_domain_short": "Blockierung aufheben",
   "account.unblock_short": "Blockierung aufheben",
   "account.unendorse": "Im Profil nicht mehr vorstellen",
   "account.unfollow": "Entfolgen",
   "account.unmute": "Stummschaltung von @{name} aufheben",
   "account.unmute_notifications_short": "Stummschaltung der Benachrichtigungen aufheben",
   "account.unmute_short": "Stummschaltung aufheben",
-  "account_note.placeholder": "Klicken, um Notiz hinzuzufügen",
-  "admin.dashboard.daily_retention": "Verweildauer der Nutzer*innen pro Tag nach der Registrierung",
-  "admin.dashboard.monthly_retention": "Verweildauer der Nutzer*innen pro Monat nach der Registrierung",
+  "account_note.placeholder": "Klicken, um private Anmerkung hinzuzufügen",
+  "admin.dashboard.daily_retention": "Verweildauer der Nutzer*innen pro Tag seit der Registrierung",
+  "admin.dashboard.monthly_retention": "Verweildauer der Nutzer*innen pro Monat seit der Registrierung",
   "admin.dashboard.retention.average": "Durchschnitt",
   "admin.dashboard.retention.cohort": "Monat der Registrierung",
   "admin.dashboard.retention.cohort_size": "Neue Konten",
-  "admin.impact_report.instance_accounts": "Profilkonten, die dadurch gelöscht würden",
+  "admin.impact_report.instance_accounts": "Konten, die dadurch gelöscht würden",
   "admin.impact_report.instance_followers": "Follower, die unsere Nutzer*innen verlieren würden",
   "admin.impact_report.instance_follows": "Follower, die deren Nutzer*innen verlieren würden",
   "admin.impact_report.title": "Zusammenfassung der Auswirkung",
-  "alert.rate_limited.message": "Bitte versuche es nach {retry_time, time, medium} erneut.",
+  "alert.rate_limited.message": "Bitte versuche es um {retry_time, time, medium} erneut.",
   "alert.rate_limited.title": "Anfragelimit überschritten",
   "alert.unexpected.message": "Ein unerwarteter Fehler ist aufgetreten.",
-  "alert.unexpected.title": "Oha!",
+  "alert.unexpected.title": "Ups!",
   "alt_text_badge.title": "Bildbeschreibung",
   "alt_text_modal.add_alt_text": "Bildbeschreibung hinzufügen",
   "alt_text_modal.add_text_from_image": "Text aus Bild hinzufügen",
   "alt_text_modal.cancel": "Abbrechen",
   "alt_text_modal.change_thumbnail": "Vorschaubild ändern",
-  "alt_text_modal.describe_for_people_with_hearing_impairments": "Beschreibe den Inhalt für Menschen mit Schwerhörigkeit …",
-  "alt_text_modal.describe_for_people_with_visual_impairments": "Beschreibe den Inhalt für Menschen mit Sehschwäche …",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Beschreibe den Inhalt für Menschen, die taub oder hörbehindert sind …",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Beschreibe den Inhalt für Menschen, die blind oder sehbehindert sind …",
   "alt_text_modal.done": "Fertig",
   "announcement.announcement": "Ankündigung",
   "annual_report.summary.archetype.booster": "Trendjäger*in",
   "annual_report.summary.archetype.lurker": "Beobachter*in",
   "annual_report.summary.archetype.oracle": "Universaltalent",
   "annual_report.summary.archetype.pollster": "Meinungsforscher*in",
-  "annual_report.summary.archetype.replier": "Sozialer Schmetterling",
+  "annual_report.summary.archetype.replier": "Gesellige*r",
   "annual_report.summary.followers.followers": "Follower",
   "annual_report.summary.followers.total": "{count} insgesamt",
   "annual_report.summary.here_it_is": "Dein Jahresrückblick für {year}:",
@@ -142,13 +142,13 @@
   "block_modal.they_will_know": "Das Profil wird erkennen können, dass du es blockiert hast.",
   "block_modal.title": "Profil blockieren?",
   "block_modal.you_wont_see_mentions": "Du wirst keine Beiträge sehen, die dieses Profil erwähnen.",
-  "boost_modal.combo": "Mit {combo} erscheint dieses Fenster beim nächsten Mal nicht mehr",
+  "boost_modal.combo": "Mit {combo} erscheint dieses Fenster nicht mehr",
   "boost_modal.reblog": "Beitrag teilen?",
   "boost_modal.undo_reblog": "Beitrag nicht mehr teilen?",
   "bundle_column_error.copy_stacktrace": "Fehlerbericht kopieren",
   "bundle_column_error.error.body": "Die angeforderte Seite konnte nicht dargestellt werden. Dies könnte auf einen Fehler in unserem Code oder auf ein Browser-Kompatibilitätsproblem zurückzuführen sein.",
   "bundle_column_error.error.title": "Oh nein!",
-  "bundle_column_error.network.body": "Beim Versuch, diese Seite zu laden, ist ein Fehler aufgetreten. Dies könnte auf ein vorübergehendes Problem mit Ihrer Internetverbindung oder diesem Server zurückzuführen sein.",
+  "bundle_column_error.network.body": "Beim Versuch, diese Seite zu laden, ist ein Fehler aufgetreten. Dies könnte auf ein vorübergehendes Problem mit deiner Internetverbindung oder diesem Server zurückzuführen sein.",
   "bundle_column_error.network.title": "Netzwerkfehler",
   "bundle_column_error.retry": "Erneut versuchen",
   "bundle_column_error.return": "Zurück zur Startseite",
@@ -157,10 +157,10 @@
   "bundle_modal_error.close": "Schließen",
   "bundle_modal_error.message": "Beim Laden des Inhalts ist etwas schiefgelaufen.",
   "bundle_modal_error.retry": "Erneut versuchen",
-  "closed_registrations.other_server_instructions": "Da Mastodon dezentralisiert ist, kannst du ein Konto auf einem anderen Server erstellen und trotzdem mit diesem Server interagieren.",
-  "closed_registrations_modal.description": "Das Anlegen eines Kontos auf {domain} ist derzeit nicht möglich, aber bedenke, dass du kein extra Konto auf {domain} benötigst, um Mastodon nutzen zu können.",
-  "closed_registrations_modal.find_another_server": "Einen anderen Server auswählen",
-  "closed_registrations_modal.preamble": "Mastodon ist dezentralisiert, das heißt, unabhängig davon, wo du dein Konto erstellt hast, kannst du jedem Profil auf diesem Server folgen und mit ihm interagieren. Du kannst sogar deinen eigenen Server hosten!",
+  "closed_registrations.other_server_instructions": "Da Mastodon dezentralisiert ist, kannst du dich auch woanders im Fediverse registrieren und trotzdem mit diesem Server in Kontakt bleiben.",
+  "closed_registrations_modal.description": "Das Anlegen eines Kontos auf {domain} ist derzeit nicht möglich, aber bedenke, dass du nicht zwingend auf {domain} ein Konto benötigst, um Mastodon nutzen zu können.",
+  "closed_registrations_modal.find_another_server": "Anderen Server suchen",
+  "closed_registrations_modal.preamble": "Mastodon ist dezentralisiert, das heißt, unabhängig davon, wo du dein Konto erstellst, kannst du jedem Profil auf diesem Server folgen und mit ihm interagieren. Du kannst sogar deinen eigenen Mastodon-Server hosten!",
   "closed_registrations_modal.title": "Bei Mastodon registrieren",
   "column.about": "Über",
   "column.blocks": "Blockierte Profile",
@@ -168,12 +168,12 @@
   "column.community": "Lokale Timeline",
   "column.create_list": "Liste erstellen",
   "column.direct": "Private Erwähnungen",
-  "column.directory": "Profile durchsuchen",
+  "column.directory": "Profile durchstöbern",
   "column.domain_blocks": "Blockierte Domains",
   "column.edit_list": "Liste bearbeiten",
   "column.favourites": "Favoriten",
   "column.firehose": "Live-Feeds",
-  "column.firehose_local": "Live-Feed für diesen Server",
+  "column.firehose_local": "Live-Feed dieses Servers",
   "column.firehose_singular": "Live-Feed",
   "column.follow_requests": "Follower-Anfragen",
   "column.home": "Startseite",
@@ -193,7 +193,7 @@
   "column_search.cancel": "Abbrechen",
   "community.column_settings.local_only": "Nur lokal",
   "community.column_settings.media_only": "Nur Beiträge mit Medien",
-  "community.column_settings.remote_only": "Nur andere Mastodon-Server",
+  "community.column_settings.remote_only": "Nur andere Server im Fediverse",
   "compose.error.blank_post": "Beitrag muss einen Inhalt haben.",
   "compose.language.change": "Sprache festlegen",
   "compose.language.search": "Sprachen suchen …",
@@ -201,18 +201,18 @@
   "compose.published.open": "Öffnen",
   "compose.saved.body": "Beitrag gespeichert.",
   "compose_form.direct_message_warning_learn_more": "Mehr erfahren",
-  "compose_form.encryption_warning": "Beiträge auf Mastodon sind nicht Ende-zu-Ende-verschlüsselt. Teile keine sensiblen Informationen über Mastodon.",
+  "compose_form.encryption_warning": "Beiträge auf Mastodon sind nicht Ende-zu-Ende-verschlüsselt. Teile keine sensiblen Informationen über Mastodon, auch nicht als „private Erwähnung“.",
   "compose_form.hashtag_warning": "Dieser Beitrag wird unter keinem Hashtag sichtbar sein, weil er nicht öffentlich ist. Nur öffentliche Beiträge können nach Hashtags durchsucht werden.",
   "compose_form.lock_disclaimer": "Dein Profil ist nicht {locked}. Andere können dir folgen und deine Beiträge sehen, die nur für Follower bestimmt sind.",
   "compose_form.lock_disclaimer.lock": "geschützt",
   "compose_form.placeholder": "Was gibts Neues?",
-  "compose_form.poll.duration": "Umfragedauer",
+  "compose_form.poll.duration": "Laufzeit",
   "compose_form.poll.multiple": "Mehrfachauswahl",
   "compose_form.poll.option_placeholder": "{number}. Auswahl",
   "compose_form.poll.single": "Einfachauswahl",
   "compose_form.poll.switch_to_multiple": "Mehrfachauswahl erlauben",
   "compose_form.poll.switch_to_single": "Nur Einfachauswahl erlauben",
-  "compose_form.poll.type": "Art",
+  "compose_form.poll.type": "Typ",
   "compose_form.publish": "Veröffentlichen",
   "compose_form.reply": "Antworten",
   "compose_form.save_changes": "Aktualisieren",
@@ -225,7 +225,7 @@
   "confirmations.delete.message": "Möchtest du diesen Beitrag wirklich löschen?",
   "confirmations.delete.title": "Beitrag löschen?",
   "confirmations.delete_list.confirm": "Löschen",
-  "confirmations.delete_list.message": "Möchtest du diese Liste für immer löschen?",
+  "confirmations.delete_list.message": "Bist du dir sicher, dass du diese Liste endgültig löschen möchtest?",
   "confirmations.delete_list.title": "Liste löschen?",
   "confirmations.discard_draft.confirm": "Verwerfen und fortfahren",
   "confirmations.discard_draft.edit.cancel": "Bearbeitung fortsetzen",
@@ -240,33 +240,33 @@
   "confirmations.follow_to_list.message": "Du musst {name} folgen, um das Profil zu einer Liste hinzufügen zu können.",
   "confirmations.follow_to_list.title": "Profil folgen?",
   "confirmations.logout.confirm": "Abmelden",
-  "confirmations.logout.message": "Möchtest du dich wirklich abmelden?",
+  "confirmations.logout.message": "Möchtest du dich wirklich ausloggen?",
   "confirmations.logout.title": "Abmelden?",
   "confirmations.missing_alt_text.confirm": "Bildbeschreibung hinzufügen",
-  "confirmations.missing_alt_text.message": "Dein Beitrag enthält Medien ohne Bildbeschreibung. Mit Alt-Texten erreichst du auch Menschen mit einer Sehschwäche.",
+  "confirmations.missing_alt_text.message": "Dein Beitrag enthält Medien ohne Bildbeschreibung. Mit ALT-Texten erreichst Du auch Menschen, die blind oder sehbehindert sind.",
   "confirmations.missing_alt_text.secondary": "Trotzdem veröffentlichen",
   "confirmations.missing_alt_text.title": "Bildbeschreibung hinzufügen?",
   "confirmations.mute.confirm": "Stummschalten",
-  "confirmations.private_quote_notify.cancel": "Zurück zum Bearbeiten",
+  "confirmations.private_quote_notify.cancel": "Zurück zur Bearbeitung",
   "confirmations.private_quote_notify.confirm": "Beitrag veröffentlichen",
   "confirmations.private_quote_notify.do_not_show_again": "Diesen Hinweis nicht mehr anzeigen",
   "confirmations.private_quote_notify.message": "Dein Beitrag wird von dem zitierten sowie den erwähnten Profilen gesehen werden können, auch wenn sie dir nicht folgen.",
   "confirmations.private_quote_notify.title": "Mit Followern und erwähnten Profilen teilen?",
-  "confirmations.quiet_post_quote_info.dismiss": "Nicht mehr anzeigen",
+  "confirmations.quiet_post_quote_info.dismiss": "Nicht erneut erinnern",
   "confirmations.quiet_post_quote_info.got_it": "Verstanden",
   "confirmations.quiet_post_quote_info.message": "Beim Zitieren eines Beitrags, dessen Sichtbarkeit „Öffentlich (still)“ ist, wird auch dein Beitrag, der das Zitat enthält, aus den Trends und öffentlichen Timelines ausgeblendet.",
   "confirmations.quiet_post_quote_info.title": "Zitieren eines Beitrags mit der Sichtbarkeit „Öffentlich (still)“",
   "confirmations.redraft.confirm": "Löschen und neu erstellen",
   "confirmations.redraft.message": "Möchtest du diesen Beitrag wirklich löschen und neu verfassen? Alle Favoriten sowie die bisher geteilten Beiträge werden verloren gehen und Antworten auf den ursprünglichen Beitrag verlieren den Zusammenhang.",
-  "confirmations.redraft.title": "Beitrag löschen und neu verfassen?",
+  "confirmations.redraft.title": "Beitrag löschen & neu verfassen?",
   "confirmations.remove_from_followers.confirm": "Follower entfernen",
   "confirmations.remove_from_followers.message": "{name} wird dir nicht länger folgen. Bist du dir sicher?",
   "confirmations.remove_from_followers.title": "Follower entfernen?",
   "confirmations.revoke_quote.confirm": "Zitat entfernen",
   "confirmations.revoke_quote.message": "Diese Aktion kann nicht rückgängig gemacht werden.",
-  "confirmations.revoke_quote.title": "Zitieren meines Beitrags entfernen?",
-  "confirmations.unblock.confirm": "Nicht mehr blockieren",
-  "confirmations.unblock.title": "{name} nicht mehr blockieren?",
+  "confirmations.revoke_quote.title": "Mein Zitat aus diesem Beitrag entfernen?",
+  "confirmations.unblock.confirm": "Blockierung aufheben",
+  "confirmations.unblock.title": "Blockierung von {name} aufheben?",
   "confirmations.unfollow.confirm": "Entfolgen",
   "confirmations.unfollow.title": "{name} entfolgen?",
   "confirmations.withdraw_request.confirm": "Anfrage zurückziehen",
@@ -282,8 +282,8 @@
   "copypaste.copied": "Kopiert",
   "copypaste.copy_to_clipboard": "In die Zwischenablage kopieren",
   "directory.federated": "Aus bekanntem Fediverse",
-  "directory.local": "Nur von der Domain {domain}",
-  "directory.new_arrivals": "Neue Benutzer*innen",
+  "directory.local": "Nur von dieser Domain {domain}",
+  "directory.new_arrivals": "Neue Profile",
   "directory.recently_active": "Kürzlich aktiv",
   "disabled_account_banner.account_settings": "Kontoeinstellungen",
   "disabled_account_banner.text": "Dein Konto {disabledAccount} ist derzeit deaktiviert.",
@@ -302,25 +302,25 @@
   "domain_pill.activitypub_lets_connect": "Somit kannst du dich nicht nur auf Mastodon mit Leuten verbinden und mit ihnen interagieren, sondern über alle sozialen Apps hinweg.",
   "domain_pill.activitypub_like_language": "ActivityPub ist sozusagen die Sprache, die Mastodon mit anderen sozialen Netzwerken spricht.",
   "domain_pill.server": "Server",
-  "domain_pill.their_handle": "Deren Adresse:",
-  "domain_pill.their_server": "Deren digitale Heimat. Hier „leben“ alle Beiträge von diesem Profil.",
-  "domain_pill.their_username": "Deren eindeutigen Identität auf dem betreffenden Server. Es ist möglich, Profile mit dem gleichen Profilnamen auf verschiedenen Servern zu finden.",
+  "domain_pill.their_handle": "Vollständige Adresse:",
+  "domain_pill.their_server": "Die digitale Heimat, in der sich alle Beiträge dieses Profils befinden.",
+  "domain_pill.their_username": "Die eindeutige Identifizierung auf einem Server. Es ist möglich, denselben Profilnamen auf verschiedenen Servern im Fediverse zu finden.",
   "domain_pill.username": "Profilname",
   "domain_pill.whats_in_a_handle": "Woraus besteht eine Adresse?",
-  "domain_pill.who_they_are": "Adressen teilen mit, wer jemand ist und wo sich jemand aufhält. Daher kannst du mit Leuten im gesamten Social Web interagieren, wenn es eine durch <button>ActivityPub angetriebene Plattform</button> ist.",
+  "domain_pill.who_they_are": "Adressen teilen mit, wer jemand ist und wo sich jemand im Fediverse aufhält. Daher kannst du mit Leuten im gesamten Social Web interagieren, wenn es eine durch <button>ActivityPub angetriebene Plattform</button> ist.",
   "domain_pill.who_you_are": "Deine Adresse teilt mit, wer du bist und wo du dich aufhältst. Daher können andere Leute im gesamten Social Web mit dir interagieren, wenn es eine durch <button>ActivityPub angetriebene Plattform</button> ist.",
   "domain_pill.your_handle": "Deine Adresse:",
   "domain_pill.your_server": "Deine digitale Heimat. Hier „leben“ alle Beiträge von dir. Falls es dir hier nicht gefällt, kannst du jederzeit den Server wechseln und ebenso deine Follower übertragen.",
   "domain_pill.your_username": "Deine eindeutige Identität auf diesem Server. Es ist möglich, Profile mit dem gleichen Profilnamen auf verschiedenen Servern zu finden.",
   "dropdown.empty": "Option auswählen",
-  "embed.instructions": "Du kannst diesen Beitrag auf deiner Website einbetten, indem du den nachfolgenden Code kopierst.",
+  "embed.instructions": "Du kannst diesen Beitrag außerhalb des Fediverse (z. B. in deine Website) einbetten, indem du diesen Code kopierst und dort einfügst.",
   "embed.preview": "Vorschau:",
   "emoji_button.activity": "Aktivitäten",
   "emoji_button.clear": "Leeren",
   "emoji_button.custom": "Spezielle Emojis dieses Servers",
   "emoji_button.flags": "Flaggen",
   "emoji_button.food": "Essen & Trinken",
-  "emoji_button.label": "Emoji einfügen",
+  "emoji_button.label": "Emoji hinzufügen",
   "emoji_button.nature": "Natur",
   "emoji_button.not_found": "Keine passenden Emojis gefunden",
   "emoji_button.objects": "Gegenstände",
@@ -334,7 +334,7 @@
   "empty_column.account_featured.other": "{acct} hat bisher noch nichts vorgestellt. Wusstest du, dass du deine häufig verwendeten Hashtags und sogar Profile von Freund*innen vorstellen kannst?",
   "empty_column.account_featured_other.unknown": "Dieses Profil hat bisher noch nichts vorgestellt.",
   "empty_column.account_hides_collections": "Das Konto hat sich dazu entschieden, diese Information nicht zu veröffentlichen",
-  "empty_column.account_suspended": "Konto gesperrt",
+  "empty_column.account_suspended": "Konto dauerhaft gesperrt",
   "empty_column.account_timeline": "Keine Beiträge vorhanden!",
   "empty_column.account_unavailable": "Profil nicht verfügbar",
   "empty_column.blocks": "Du hast bisher keine Profile blockiert.",
@@ -342,19 +342,19 @@
   "empty_column.community": "Die lokale Timeline ist leer. Schreibe einen öffentlichen Beitrag, um den Stein ins Rollen zu bringen!",
   "empty_column.direct": "Du hast noch keine privaten Erwähnungen. Sobald du eine sendest oder erhältst, wird sie hier erscheinen.",
   "empty_column.disabled_feed": "Diesen Feed haben deine Server-Administrator*innen deaktiviert.",
-  "empty_column.domain_blocks": "Du hast noch keine Domains blockiert.",
-  "empty_column.explore_statuses": "Momentan ist nichts im Trend. Schau später wieder vorbei!",
+  "empty_column.domain_blocks": "Du hast bisher keine Domains blockiert.",
+  "empty_column.explore_statuses": "Momentan trendet nichts. Schau später wieder vorbei!",
   "empty_column.favourited_statuses": "Du hast noch keine Beiträge favorisiert. Sobald du einen favorisierst, wird er hier erscheinen.",
   "empty_column.favourites": "Diesen Beitrag hat bisher noch niemand favorisiert. Sobald es jemand tut, wird das Profil hier erscheinen.",
   "empty_column.follow_requests": "Es liegen derzeit keine Follower-Anfragen vor. Sobald du eine erhältst, wird sie hier erscheinen.",
-  "empty_column.followed_tags": "Du folgst noch keinen Hashtags. Wenn du dies tust, werden sie hier erscheinen.",
+  "empty_column.followed_tags": "Du folgst noch keinen Hashtags. Sobald du Hashtags abonniert hast, werden sie hier angezeigt.",
   "empty_column.hashtag": "Unter diesem Hashtag gibt es noch nichts.",
   "empty_column.home": "Die Timeline deiner Startseite ist leer! Folge mehr Leuten, um sie zu füllen.",
   "empty_column.list": "Diese Liste ist derzeit leer. Wenn Konten auf dieser Liste neue Beiträge veröffentlichen, werden sie hier erscheinen.",
   "empty_column.mutes": "Du hast keine Profile stummgeschaltet.",
   "empty_column.notification_requests": "Alles klar! Hier gibt es nichts. Wenn Sie neue Mitteilungen erhalten, werden diese entsprechend Ihren Einstellungen hier angezeigt.",
   "empty_column.notifications": "Du hast noch keine Benachrichtigungen. Sobald andere Personen mit dir interagieren, wirst du hier darüber informiert.",
-  "empty_column.public": "Hier ist nichts zu sehen! Schreibe etwas öffentlich oder folge Profilen von anderen Servern, um die Timeline aufzufüllen",
+  "empty_column.public": "Hier ist nichts zu sehen! Schreibe einen öffentlichen Beitrag oder folge Profilen von anderen Servern im Fediverse, um die Timeline zu füllen",
   "error.unexpected_crash.explanation": "Wegen eines Fehlers in unserem Code oder aufgrund einer Browser-Inkompatibilität kann diese Seite nicht korrekt angezeigt werden.",
   "error.unexpected_crash.explanation_addons": "Diese Seite konnte nicht korrekt angezeigt werden. Dieser Fehler wird wahrscheinlich durch ein Browser-Add-on oder automatische Übersetzungswerkzeuge verursacht.",
   "error.unexpected_crash.next_steps": "Versuche, die Seite neu zu laden. Wenn das nicht helfen sollte, kannst du das Webinterface von Mastodon vermutlich über einen anderen Browser erreichen – oder du verwendest eine mobile (native) App.",
@@ -362,8 +362,8 @@
   "errors.unexpected_crash.copy_stacktrace": "Fehlerdiagnose in die Zwischenablage kopieren",
   "errors.unexpected_crash.report_issue": "Fehler melden",
   "explore.suggested_follows": "Profile",
-  "explore.title": "Angesagt",
-  "explore.trending_links": "Neuigkeiten",
+  "explore.title": "Im Trend",
+  "explore.trending_links": "Artikel",
   "explore.trending_statuses": "Beiträge",
   "explore.trending_tags": "Hashtags",
   "featured_carousel.header": "{count, plural, one {Angehefteter Beitrag} other {Angeheftete Beiträge}}",
@@ -387,7 +387,7 @@
   "filter_modal.select_filter.subtitle": "Einem vorhandenen Filter hinzufügen oder einen neuen erstellen",
   "filter_modal.select_filter.title": "Diesen Beitrag filtern",
   "filter_modal.title.status": "Beitrag per Filter ausblenden",
-  "filter_warning.matches_filter": "Ausgeblendet wegen des Filters „<span>{title}</span>“",
+  "filter_warning.matches_filter": "Ausgeblendet wegen deines Filters „<span>{title}</span>“",
   "filtered_notifications_banner.pending_requests": "Von {count, plural, =0 {keinem Profil, das dir möglicherweise bekannt ist} one {einem Profil, das dir möglicherweise bekannt ist} other {# Profilen, die dir möglicherweise bekannt sind}}",
   "filtered_notifications_banner.title": "Gefilterte Benachrichtigungen",
   "firehose.all": "Alle Server",
@@ -408,14 +408,14 @@
   "follow_suggestions.personalized_suggestion": "Persönliche Empfehlung",
   "follow_suggestions.popular_suggestion": "Beliebte Empfehlung",
   "follow_suggestions.popular_suggestion_longer": "Beliebt auf {domain}",
-  "follow_suggestions.similar_to_recently_followed_longer": "Ähnlich zu Profilen, denen du seit kurzem folgst",
+  "follow_suggestions.similar_to_recently_followed_longer": "Ähnelt deinen kürzlich gefolgten Profilen",
   "follow_suggestions.view_all": "Alle anzeigen",
-  "follow_suggestions.who_to_follow": "Empfohlene Profile",
-  "followed_tags": "Gefolgte Hashtags",
+  "follow_suggestions.who_to_follow": "Wem folgen?",
+  "followed_tags": "Abonnierte Hashtags",
   "footer.about": "Über",
   "footer.directory": "Profilverzeichnis",
   "footer.get_app": "App herunterladen",
-  "footer.keyboard_shortcuts": "Tastenkombinationen",
+  "footer.keyboard_shortcuts": "Tastaturkürzel",
   "footer.privacy_policy": "Datenschutzerklärung",
   "footer.source_code": "Quellcode anzeigen",
   "footer.status": "Status",
@@ -438,10 +438,10 @@
   "hashtag.counter_by_uses": "{count, plural, one {{counter} Beitrag} other {{counter} Beiträge}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} Beitrag} other {{counter} Beiträge}} heute",
   "hashtag.feature": "Im Profil vorstellen",
-  "hashtag.follow": "Hashtag folgen",
+  "hashtag.follow": "Abonnieren",
   "hashtag.mute": "#{hashtag} stummschalten",
   "hashtag.unfeature": "Im Profil nicht mehr vorstellen",
-  "hashtag.unfollow": "Hashtag entfolgen",
+  "hashtag.unfollow": "Abbestellen",
   "hashtags.and_other": "… und {count, plural, one{# weiterer} other {# weitere}}",
   "hints.profiles.followers_may_be_missing": "Möglicherweise werden für dieses Profil nicht alle Follower angezeigt.",
   "hints.profiles.follows_may_be_missing": "Möglicherweise werden für dieses Profil nicht alle gefolgten Profile angezeigt.",
@@ -451,7 +451,7 @@
   "hints.profiles.see_more_posts": "Weitere Beiträge auf {domain} ansehen",
   "home.column_settings.show_quotes": "Zitierte Beiträge anzeigen",
   "home.column_settings.show_reblogs": "Geteilte Beiträge anzeigen",
-  "home.column_settings.show_replies": "Antworten anzeigen",
+  "home.column_settings.show_replies": "Antworten zu Beiträgen anzeigen",
   "home.hide_announcements": "Ankündigungen ausblenden",
   "home.pending_critical_update.body": "Bitte aktualisiere deinen Mastodon-Server so schnell wie möglich!",
   "home.pending_critical_update.link": "Updates ansehen",
@@ -469,54 +469,54 @@
   "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?",
   "info_button.label": "Hilfe",
-  "info_button.what_is_alt_text": "<h1>Was ist Alt-Text?</h1> <p>Alt-Text bietet Bildbeschreibungen für Personen mit einer Sehschwäche, einer schlechten Internetverbindung und für alle, die zusätzlichen Kontext möchten.</p> <p>Du kannst die Zugänglichkeit und die Verständlichkeit für alle verbessern, indem du eine klare, genaue und objektive Bildbeschreibung hinzufügst.</p> <ul> <li>Erfasse wichtige Elemente</li> <li>Fasse Text in Bildern zusammen</li> <li>Verwende einen korrekten Satzbau</li> <li>Vermeide unwichtige Informationen</li> <li>Konzentriere dich bei komplexen Darstellungen (z. B. Diagramme oder Karten) auf Trends und wichtige Erkenntnisse</li> </ul>",
+  "info_button.what_is_alt_text": "<h1>Was ist Alt-Text?</h1> <p>Der Alt-Text bietet Bildbeschreibungen für blinde und sehbehinderte Menschen, aber auch für alle mit einer schlechten Internetverbindung und wer einen zusätzlichen Kontext möchten.</p> <p>Du kannst die Barrierefreiheit und Verständlichkeit für alle verbessern, indem du eine klare, genaue und objektive Bildbeschreibung erstellst.</p> <ul> <li>Erfasse wichtige Elemente</li> <li>Fasse Texte bildlich zusammen</li> <li>Verwende einen korrekten Satzbau</li> <li>Vermeide unwichtige und überflüssige Informationen</li> <li>Konzentriere dich bei komplexen Darstellungen (z. B. bei Diagrammen oder Karten) auf Veränderungen und Schlüsselwörter</li> </ul>",
   "interaction_modal.action": "Melde dich auf deinem Mastodon-Server an, damit du mit dem Beitrag von {name} interagieren kannst.",
   "interaction_modal.go": "Los",
   "interaction_modal.no_account_yet": "Du hast noch kein Konto?",
-  "interaction_modal.on_another_server": "Auf einem anderen Server",
+  "interaction_modal.on_another_server": "Auf anderem Server",
   "interaction_modal.on_this_server": "Auf diesem Server",
   "interaction_modal.title": "Melde dich an, um fortzufahren",
-  "interaction_modal.username_prompt": "z. B. {example}",
+  "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}}",
   "keyboard_shortcuts.back": "Zurücknavigieren",
-  "keyboard_shortcuts.blocked": "Liste blockierter Profile öffnen",
+  "keyboard_shortcuts.blocked": "Blockierte Profile öffnen",
   "keyboard_shortcuts.boost": "Beitrag teilen",
-  "keyboard_shortcuts.column": "Auf die aktuelle Spalte fokussieren",
+  "keyboard_shortcuts.column": "Aktuelle Spalte fokussieren",
   "keyboard_shortcuts.compose": "Eingabefeld fokussieren",
   "keyboard_shortcuts.description": "Beschreibung",
   "keyboard_shortcuts.direct": "Private Erwähnungen öffnen",
-  "keyboard_shortcuts.down": "Ansicht nach unten bewegen",
+  "keyboard_shortcuts.down": "Auswahl nach unten bewegen",
   "keyboard_shortcuts.enter": "Beitrag öffnen",
   "keyboard_shortcuts.favourite": "Beitrag favorisieren",
   "keyboard_shortcuts.favourites": "Favoriten öffnen",
   "keyboard_shortcuts.federated": "Föderierte Timeline öffnen",
-  "keyboard_shortcuts.heading": "Tastenkombinationen",
+  "keyboard_shortcuts.heading": "Tastenkürzel",
   "keyboard_shortcuts.home": "Startseite öffnen",
   "keyboard_shortcuts.hotkey": "Tastenkürzel",
-  "keyboard_shortcuts.legend": "Tastenkombinationen anzeigen",
+  "keyboard_shortcuts.legend": "Tastenkürzel anzeigen (diese Seite)",
   "keyboard_shortcuts.load_more": "Schaltfläche „Mehr laden“ fokussieren",
   "keyboard_shortcuts.local": "Lokale Timeline öffnen",
   "keyboard_shortcuts.mention": "Profil erwähnen",
-  "keyboard_shortcuts.muted": "Liste stummgeschalteter Profile öffnen",
-  "keyboard_shortcuts.my_profile": "Eigenes Profil aufrufen",
-  "keyboard_shortcuts.notifications": "Benachrichtigungen aufrufen",
-  "keyboard_shortcuts.open_media": "Medieninhalt öffnen",
+  "keyboard_shortcuts.muted": "Stummgeschaltete Profile öffnen",
+  "keyboard_shortcuts.my_profile": "Eigenes Profil öffnen",
+  "keyboard_shortcuts.notifications": "Benachrichtigungen öffnen",
+  "keyboard_shortcuts.open_media": "Medien öffnen",
   "keyboard_shortcuts.pinned": "Liste angehefteter Beiträge öffnen",
   "keyboard_shortcuts.profile": "Profil aufrufen",
   "keyboard_shortcuts.quote": "Beitrag zitieren",
-  "keyboard_shortcuts.reply": "Auf Beitrag antworten",
-  "keyboard_shortcuts.requests": "Liste der Follower-Anfragen aufrufen",
-  "keyboard_shortcuts.search": "Suchleiste fokussieren",
-  "keyboard_shortcuts.spoilers": "Feld für Inhaltswarnung anzeigen/ausblenden",
+  "keyboard_shortcuts.reply": "Beitrag beantworten",
+  "keyboard_shortcuts.requests": "Follower-Anfragen aufrufen",
+  "keyboard_shortcuts.search": "Eingabefeld / Suche fokussieren",
+  "keyboard_shortcuts.spoilers": "Feld für Inhaltswarnung anzeigen / ausblenden",
   "keyboard_shortcuts.start": "„Auf gehts!“ öffnen",
-  "keyboard_shortcuts.toggle_hidden": "Beitragstext hinter der Inhaltswarnung anzeigen/ausblenden",
-  "keyboard_shortcuts.toggle_sensitivity": "Medien anzeigen/ausblenden",
+  "keyboard_shortcuts.toggle_hidden": "Beitrag hinter Inhaltswarnung anzeigen / ausblenden",
+  "keyboard_shortcuts.toggle_sensitivity": "Medien anzeigen / ausblenden",
   "keyboard_shortcuts.toot": "Neuen Beitrag erstellen",
   "keyboard_shortcuts.translate": "Beitrag übersetzen",
-  "keyboard_shortcuts.unfocus": "Eingabefeld/Suche nicht mehr fokussieren",
-  "keyboard_shortcuts.up": "Ansicht nach oben bewegen",
+  "keyboard_shortcuts.unfocus": "Eingabefeld / Suche nicht mehr fokussieren",
+  "keyboard_shortcuts.up": "Auswahl nach oben bewegen",
   "learn_more_link.got_it": "Verstanden",
   "learn_more_link.learn_more": "Mehr erfahren",
   "lightbox.close": "Schließen",
@@ -539,7 +539,7 @@
   "lists.done": "Fertig",
   "lists.edit": "Liste bearbeiten",
   "lists.exclusive": "Mitglieder auf der Startseite ausblenden",
-  "lists.exclusive_hint": "Profile, die sich auf dieser Liste befinden, werden nicht auf deiner Startseite angezeigt, damit deren Beiträge nicht doppelt erscheinen.",
+  "lists.exclusive_hint": "Profile, die sich auf dieser Liste befinden, werden nicht im Feed deiner Startseite angezeigt, damit deren Beiträge nicht doppelt erscheinen.",
   "lists.find_users_to_add": "Suche nach Profilen, um sie hinzuzufügen",
   "lists.list_members_count": "{count, plural, one {# Mitglied} other {# Mitglieder}}",
   "lists.list_name": "Titel der Liste",
@@ -548,19 +548,19 @@
   "lists.no_members_yet": "Keine Mitglieder vorhanden.",
   "lists.no_results_found": "Keine Suchergebnisse.",
   "lists.remove_member": "Entfernen",
-  "lists.replies_policy.followed": "Alle folgenden Profile",
+  "lists.replies_policy.followed": "alle folgenden Profile",
   "lists.replies_policy.list": "Mitglieder der Liste",
-  "lists.replies_policy.none": "Niemanden",
+  "lists.replies_policy.none": "niemanden",
   "lists.save": "Speichern",
   "lists.search": "Suchen",
   "lists.show_replies_to": "Antworten von Listenmitgliedern einbeziehen an …",
   "load_pending": "{count, plural, one {# neuer Beitrag} other {# neue Beiträge}}",
-  "loading_indicator.label": "Wird geladen …",
+  "loading_indicator.label": "Lädt …",
   "media_gallery.hide": "Ausblenden",
   "moved_to_account_banner.text": "Dein Konto {disabledAccount} ist derzeit deaktiviert, weil du zu {movedToAccount} umgezogen bist.",
-  "mute_modal.hide_from_notifications": "Benachrichtigungen ausblenden",
-  "mute_modal.hide_options": "Einstellungen ausblenden",
-  "mute_modal.indefinite": "Bis ich die Stummschaltung aufhebe",
+  "mute_modal.hide_from_notifications": "Auch aus den Benachrichtigungen entfernen",
+  "mute_modal.hide_options": "Optionen ausblenden",
+  "mute_modal.indefinite": "Dauerhaft, bis ich die Stummschaltung aufhebe",
   "mute_modal.show_options": "Optionen anzeigen",
   "mute_modal.they_can_mention_and_follow": "Das Profil wird dich weiterhin erwähnen und dir folgen können, aber du wirst davon nichts sehen.",
   "mute_modal.they_wont_know": "Das Profil wird nicht erkennen können, dass du es stummgeschaltet hast.",
@@ -570,7 +570,7 @@
   "navigation_bar.about": "Über",
   "navigation_bar.account_settings": "Passwort und Sicherheit",
   "navigation_bar.administration": "Administration",
-  "navigation_bar.advanced_interface": "Im erweiterten Webinterface öffnen",
+  "navigation_bar.advanced_interface": "Erweitertes Webinterface öffnen",
   "navigation_bar.automated_deletion": "Automatisiertes Löschen",
   "navigation_bar.blocks": "Blockierte Profile",
   "navigation_bar.bookmarks": "Lesezeichen",
@@ -579,24 +579,24 @@
   "navigation_bar.favourites": "Favoriten",
   "navigation_bar.filters": "Stummgeschaltete Wörter",
   "navigation_bar.follow_requests": "Follower-Anfragen",
-  "navigation_bar.followed_tags": "Gefolgte Hashtags",
-  "navigation_bar.follows_and_followers": "Follower und Folge ich",
-  "navigation_bar.import_export": "Importieren und exportieren",
+  "navigation_bar.followed_tags": "Abonnierte Hashtags",
+  "navigation_bar.follows_and_followers": "Follower & Folge ich",
+  "navigation_bar.import_export": "Importieren & exportieren",
   "navigation_bar.lists": "Listen",
-  "navigation_bar.live_feed_local": "Live-Feed (lokal)",
-  "navigation_bar.live_feed_public": "Live-Feed (öffentlich)",
+  "navigation_bar.live_feed_local": "Live-Feed (Dieser Server)",
+  "navigation_bar.live_feed_public": "Live-Feed (Alle Server)",
   "navigation_bar.logout": "Abmelden",
   "navigation_bar.moderation": "Moderation",
   "navigation_bar.more": "Mehr",
   "navigation_bar.mutes": "Stummgeschaltete Profile",
   "navigation_bar.opened_in_classic_interface": "Beiträge, Konten und andere bestimmte Seiten werden standardmäßig im klassischen Webinterface geöffnet.",
   "navigation_bar.preferences": "Einstellungen",
-  "navigation_bar.privacy_and_reach": "Datenschutz und Reichweite",
+  "navigation_bar.privacy_and_reach": "Datenschutz & Reichweite",
   "navigation_bar.search": "Suche",
-  "navigation_bar.search_trends": "Suche / Angesagt",
-  "navigation_panel.collapse_followed_tags": "Menü für gefolgte Hashtags schließen",
+  "navigation_bar.search_trends": "Suche / Trends",
+  "navigation_panel.collapse_followed_tags": "Menü für abonnierte Hashtags schließen",
   "navigation_panel.collapse_lists": "Listen-Menü schließen",
-  "navigation_panel.expand_followed_tags": "Menü für gefolgte Hashtags öffnen",
+  "navigation_panel.expand_followed_tags": "Menü für abonnierte Hashtags öffnen",
   "navigation_panel.expand_lists": "Listen-Menü öffnen",
   "not_signed_in_indicator.not_signed_in": "Du musst dich anmelden, um auf diesen Inhalt zugreifen zu können.",
   "notification.admin.report": "{name} meldete {target}",
@@ -627,7 +627,7 @@
   "notification.moderation_warning": "Du wurdest von den Moderator*innen verwarnt",
   "notification.moderation_warning.action_delete_statuses": "Einige deiner Beiträge sind entfernt worden.",
   "notification.moderation_warning.action_disable": "Dein Konto wurde deaktiviert.",
-  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Einige deiner Beiträge wurden mit einer Inhaltswarnung versehen.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Einige deiner Beiträge haben eine Inhaltswarnung erhalten.",
   "notification.moderation_warning.action_none": "Dein Konto ist von den Moderator*innen verwarnt worden.",
   "notification.moderation_warning.action_sensitive": "Deine zukünftigen Beiträge werden mit einer Inhaltswarnung versehen.",
   "notification.moderation_warning.action_silence": "Dein Konto wurde eingeschränkt.",
@@ -642,7 +642,7 @@
   "notification.relationships_severance_event.domain_block": "Ein Admin von {from} hat {target} blockiert – darunter {followersCount} deiner Follower und {followingCount, plural, one {# Konto, dem} other {# Konten, denen}} du folgst.",
   "notification.relationships_severance_event.learn_more": "Mehr erfahren",
   "notification.relationships_severance_event.user_domain_block": "Du hast {target} blockiert – {followersCount} deiner Follower und {followingCount, plural, one {# Konto, dem} other {# Konten, denen}} du folgst, wurden entfernt.",
-  "notification.status": "{name} postete …",
+  "notification.status": "{name} veröffentlichte …",
   "notification.update": "{name} bearbeitete einen Beitrag",
   "notification_requests.accept": "Akzeptieren",
   "notification_requests.accept_multiple": "{count, plural, one {# Anfrage akzeptieren …} other {# Anfragen akzeptieren …}}",
@@ -678,9 +678,9 @@
   "notifications.column_settings.mention": "Erwähnungen:",
   "notifications.column_settings.poll": "Umfrageergebnisse:",
   "notifications.column_settings.push": "Push-Benachrichtigungen",
-  "notifications.column_settings.quote": "Zitate:",
+  "notifications.column_settings.quote": "Zitierte Beiträge:",
   "notifications.column_settings.reblog": "Geteilte Beiträge:",
-  "notifications.column_settings.show": "In dieser Spalte anzeigen",
+  "notifications.column_settings.show": "Im Feed „Benachrichtigungen“ anzeigen",
   "notifications.column_settings.sound": "Ton abspielen",
   "notifications.column_settings.status": "Neue Beiträge:",
   "notifications.column_settings.unread_notifications.category": "Ungelesene Benachrichtigungen",
@@ -689,10 +689,10 @@
   "notifications.filter.all": "Alles",
   "notifications.filter.boosts": "Geteilte Beiträge",
   "notifications.filter.favourites": "Favoriten",
-  "notifications.filter.follows": "Folgt",
+  "notifications.filter.follows": "Neue Follower",
   "notifications.filter.mentions": "Erwähnungen",
   "notifications.filter.polls": "Umfrageergebnisse",
-  "notifications.filter.statuses": "Neue Beiträge von Personen, denen du folgst",
+  "notifications.filter.statuses": "Neue Beiträge von abonnierten Profilen",
   "notifications.grant_permission": "Berechtigung erteilen.",
   "notifications.group": "{count} Benachrichtigungen",
   "notifications.mark_as_read": "Alle Benachrichtigungen als gelesen markieren",
@@ -702,18 +702,18 @@
   "notifications.policy.accept": "Akzeptieren",
   "notifications.policy.accept_hint": "In Benachrichtigungen anzeigen",
   "notifications.policy.drop": "Ignorieren",
-  "notifications.policy.drop_hint": "In die Leere senden und nie wieder sehen",
+  "notifications.policy.drop_hint": "Ins Nirwana befördern und auf Nimmerwiedersehen!",
   "notifications.policy.filter": "Filtern",
-  "notifications.policy.filter_hint": "An gefilterte Benachrichtigungen im Posteingang senden",
-  "notifications.policy.filter_limited_accounts_hint": "Durch Server-Moderator*innen eingeschränkt",
-  "notifications.policy.filter_limited_accounts_title": "moderierten Konten",
-  "notifications.policy.filter_new_accounts.hint": "Innerhalb {days, plural, one {des letzten Tages} other {der letzten # Tagen}} erstellt",
-  "notifications.policy.filter_new_accounts_title": "neuen Konten",
-  "notifications.policy.filter_not_followers_hint": "Einschließlich Profilen, die dir seit weniger als {days, plural, one {einem Tag} other {# Tagen}} folgen",
+  "notifications.policy.filter_hint": "Im separaten Feed „Gefilterte Benachrichtigungen“ anzeigen",
+  "notifications.policy.filter_limited_accounts_hint": "Durch Server-Moderator*innen eingeschränkte Profile",
+  "notifications.policy.filter_limited_accounts_title": "eingeschränkten Konten",
+  "notifications.policy.filter_new_accounts.hint": "Konto {days, plural, one {seit gestern} other {in den vergangenen # Tagen}} registriert",
+  "notifications.policy.filter_new_accounts_title": "neuen Profilen",
+  "notifications.policy.filter_not_followers_hint": "Einschließlich Profilen, die mir seit weniger als {days, plural, one {einem Tag} other {# Tagen}} folgen",
   "notifications.policy.filter_not_followers_title": "Profilen, die mir nicht folgen",
-  "notifications.policy.filter_not_following_hint": "Bis du sie manuell genehmigst",
+  "notifications.policy.filter_not_following_hint": "… bis ich sie manuell genehmige",
   "notifications.policy.filter_not_following_title": "Profilen, denen ich nicht folge",
-  "notifications.policy.filter_private_mentions_hint": "Solange sie keine Antwort auf deine Erwähnung ist oder du dem Profil nicht folgst",
+  "notifications.policy.filter_private_mentions_hint": "… solange sie keine Antwort auf meine Erwähnungen sind – oder ich den Profilen nicht folge",
   "notifications.policy.filter_private_mentions_title": "unerwünschten privaten Erwähnungen",
   "notifications.policy.title": "Benachrichtigungen verwalten von …",
   "notifications_permission_banner.enable": "Aktiviere Desktop-Benachrichtigungen",
@@ -755,17 +755,17 @@
   "privacy.public.long": "Alle innerhalb und außerhalb von Mastodon",
   "privacy.public.short": "Öffentlich",
   "privacy.quote.anyone": "{visibility} – alle dürfen zitieren",
-  "privacy.quote.disabled": "{visibility} – niemand darf zitieren",
-  "privacy.quote.limited": "{visibility} – eingeschränktes Zitieren",
+  "privacy.quote.disabled": "{visibility} – Zitieren deaktiviert",
+  "privacy.quote.limited": "{visibility} – nur Follower",
   "privacy.unlisted.additional": "Das Verhalten ist wie bei „Öffentlich“, jedoch gibt es einige Einschränkungen. Der Beitrag wird nicht in „Live-Feeds“, „Erkunden“, Hashtags oder über die Mastodon-Suchfunktion auffindbar sein – selbst wenn die zugehörige Einstellung aktiviert wurde.",
-  "privacy.unlisted.long": "Verborgen vor Suchergebnissen, Trends und öffentlichen Timelines auf Mastodon",
+  "privacy.unlisted.long": "Verborgen vor Suchen, Trends und öffentlichen Timelines",
   "privacy.unlisted.short": "Öffentlich (still)",
   "privacy_policy.last_updated": "Stand: {date}",
   "privacy_policy.title": "Datenschutzerklärung",
-  "quote_error.edit": "Beim Bearbeiten eines Beitrags können keine Zitate hinzugefügt werden.",
-  "quote_error.poll": "Zitieren ist bei Umfragen nicht gestattet.",
-  "quote_error.private_mentions": "Das Zitieren ist bei privaten Erwähnungen nicht erlaubt.",
-  "quote_error.quote": "Es ist jeweils nur ein Zitat zulässig.",
+  "quote_error.edit": "Beim Bearbeiten eines vorhandenen Beitrags können keine Zitate hinzugefügt werden.",
+  "quote_error.poll": "Zitieren ist bei Umfragen nicht erlaubt.",
+  "quote_error.private_mentions": "Zitieren ist bei privaten Erwähnungen nicht erlaubt.",
+  "quote_error.quote": "Es darf nur ein Beitrag zitiert werden.",
   "quote_error.unauthorized": "Du bist nicht berechtigt, diesen Beitrag zu zitieren.",
   "quote_error.upload": "Zitieren ist mit Medien-Anhängen nicht möglich.",
   "recommended": "Empfohlen",
@@ -775,7 +775,7 @@
   "relative_time.days": "{number} T.",
   "relative_time.full.days": "vor {number, plural, one {# Tag} other {# Tagen}}",
   "relative_time.full.hours": "vor {number, plural, one {# Stunde} other {# Stunden}}",
-  "relative_time.full.just_now": "gerade eben",
+  "relative_time.full.just_now": "soeben",
   "relative_time.full.minutes": "vor {number, plural, one {# Minute} other {# Minuten}}",
   "relative_time.full.seconds": "vor {number, plural, one {1 Sekunde} other {# Sekunden}}",
   "relative_time.hours": "{number} Std.",
@@ -785,13 +785,13 @@
   "relative_time.today": "heute",
   "remove_quote_hint.button_label": "Verstanden",
   "remove_quote_hint.message": "Klicke dafür im Beitrag auf „{icon} Mehr“.",
-  "remove_quote_hint.title": "Möchtest du aus dem zitierten Beitrag entfernt werden?",
+  "remove_quote_hint.title": "Deinen zitierten Beitrag aus diesem Beitrag entfernen?",
   "reply_indicator.attachments": "{count, plural, one {# Anhang} other {# Anhänge}}",
   "reply_indicator.cancel": "Abbrechen",
   "reply_indicator.poll": "Umfrage",
   "report.block": "Blockieren",
   "report.block_explanation": "Du wirst keine Beiträge mehr von diesem Konto sehen. Das blockierte Konto wird deine Beiträge nicht mehr sehen oder dir folgen können. Die Person könnte mitbekommen, dass du sie blockiert hast.",
-  "report.categories.legal": "Rechtlich",
+  "report.categories.legal": "Rechtliches",
   "report.categories.other": "Andere",
   "report.categories.spam": "Spam",
   "report.categories.violation": "Der Inhalt verletzt eine oder mehrere Serverregeln",
@@ -800,9 +800,9 @@
   "report.category.title_account": "Profil",
   "report.category.title_status": "Beitrag",
   "report.close": "Fertig",
-  "report.comment.title": "Gibt es etwas anderes, was wir wissen sollten?",
-  "report.forward": "Meldung zusätzlich an {target} weiterleiten",
-  "report.forward_hint": "Dieses Konto gehört zu einem anderen Server. Soll eine anonymisierte Kopie der Meldung auch dorthin gesendet werden?",
+  "report.comment.title": "Gibt es noch etwas, das wir wissen sollten?",
+  "report.forward": "Meldung auch an den externen Server {target} weiterleiten",
+  "report.forward_hint": "Das gemeldete Konto befindet sich auf einem anderen Server. Soll zusätzlich eine anonymisierte Kopie deiner Meldung an diesen Server geschickt werden?",
   "report.mute": "Stummschalten",
   "report.mute_explanation": "Du wirst keine Beiträge mehr von diesem Konto sehen. Das stummgeschaltete Konto wird dir weiterhin folgen und deine Beiträge sehen können. Die Person wird nicht mitbekommen, dass du sie stummgeschaltet hast.",
   "report.next": "Weiter",
@@ -818,9 +818,9 @@
   "report.reasons.violation": "Das verstößt gegen Serverregeln",
   "report.reasons.violation_description": "Du bist dir sicher, dass eine bestimmte Regel gebrochen wurde",
   "report.rules.subtitle": "Wähle alle zutreffenden Inhalte aus",
-  "report.rules.title": "Welche Regeln werden verletzt?",
+  "report.rules.title": "Gegen welche Regeln wurde verstoßen?",
   "report.statuses.subtitle": "Wähle alle zutreffenden Inhalte aus",
-  "report.statuses.title": "Gibt es Beiträge, die diese Meldung bekräftigen?",
+  "report.statuses.title": "Gibt es Beiträge, die diese Meldung stützen?",
   "report.submit": "Senden",
   "report.target": "{target} melden",
   "report.thanks.take_action": "Das sind deine Möglichkeiten zu bestimmen, was du auf Mastodon sehen möchtest:",
@@ -837,7 +837,7 @@
   "report_notification.categories.spam": "Spam",
   "report_notification.categories.spam_sentence": "Spam",
   "report_notification.categories.violation": "Regelverstoß",
-  "report_notification.categories.violation_sentence": "Regelverletzung",
+  "report_notification.categories.violation_sentence": "Verstoß gegen die Serverregeln",
   "report_notification.open": "Meldung öffnen",
   "search.clear": "Suchanfrage löschen",
   "search.no_recent_searches": "Keine früheren Suchanfragen",
@@ -847,7 +847,7 @@
   "search.quick_action.go_to_hashtag": "Hashtag {x} aufrufen",
   "search.quick_action.open_url": "URL in Mastodon öffnen",
   "search.quick_action.status_search": "Beiträge passend zu {x}",
-  "search.search_or_paste": "Suchen oder URL einfügen",
+  "search.search_or_paste": "Suche eingeben oder URL einfügen",
   "search_popout.full_text_search_disabled_message": "Auf {domain} nicht verfügbar.",
   "search_popout.full_text_search_logged_out_message": "Nur verfügbar, wenn angemeldet.",
   "search_popout.language_code": "ISO-Sprachcode",
@@ -877,13 +877,13 @@
   "status.admin_account": "@{name} moderieren",
   "status.admin_domain": "{domain} moderieren",
   "status.admin_status": "Beitrag moderieren",
-  "status.all_disabled": "Teilen und Zitieren von Beiträgen ist deaktiviert",
+  "status.all_disabled": "Teilen und Zitieren sind deaktiviert",
   "status.block": "@{name} blockieren",
   "status.bookmark": "Lesezeichen setzen",
   "status.cancel_reblog_private": "Beitrag nicht mehr teilen",
-  "status.cannot_quote": "Beitrag kann nicht zitiert werden",
+  "status.cannot_quote": "Diesen Beitrag darfst du nicht zitieren",
   "status.cannot_reblog": "Dieser Beitrag kann nicht geteilt werden",
-  "status.contains_quote": "Enthält Zitat",
+  "status.contains_quote": "Enthält zitierten Beitrag",
   "status.context.loading": "Weitere Antworten laden",
   "status.context.loading_error": "Weitere Antworten konnten nicht geladen werden",
   "status.context.loading_success": "Neue Antworten geladen",
@@ -899,7 +899,7 @@
   "status.direct_indicator": "Private Erwähnung",
   "status.edit": "Beitrag bearbeiten",
   "status.edited": "Zuletzt am {date} bearbeitet",
-  "status.edited_x_times": "{count, plural, one {{count}-mal} other {{count}-mal}} bearbeitet",
+  "status.edited_x_times": "{count, plural, one {{count} ×} other {{count} ×}} bearbeitet",
   "status.embed": "Code zum Einbetten",
   "status.favourite": "Favorisieren",
   "status.favourites": "{count, plural, one {× favorisiert} other {× favorisiert}}",
@@ -925,8 +925,8 @@
   "status.quote_error.limited_account_hint.title": "Dieses Profil wurde von den Moderator*innen von {domain} ausgeblendet.",
   "status.quote_error.muted_account_hint.title": "Dieser Beitrag wurde ausgeblendet, weil du @{name} stummgeschaltet hast.",
   "status.quote_error.not_available": "Beitrag nicht verfügbar",
-  "status.quote_error.pending_approval": "Beitragsveröffentlichung ausstehend",
-  "status.quote_error.pending_approval_popout.body": "Auf Mastodon kann festgelegt werden, ob man zitiert werden möchte. Wir warten auf die Genehmigung des ursprünglichen Profils. Bis dahin steht deine Beitragsveröffentlichung noch aus.",
+  "status.quote_error.pending_approval": "Veröffentlichung ausstehend",
+  "status.quote_error.pending_approval_popout.body": "Auf Mastodon kannst du selbst bestimmen, ob du von anderen zitiert werden darfst oder nicht – oder nur nach individueller Genehmigung. Wir warten in diesem Fall noch auf die Genehmigung des ursprünglichen Profils. Bis dahin steht die Veröffentlichung deines Beitrags mit dem zitierten Post noch aus.",
   "status.quote_error.revoked": "Beitrag durch Autor*in entfernt",
   "status.quote_followers_only": "Nur Follower können diesen Beitrag zitieren",
   "status.quote_manual_review": "Zitierte*r überprüft manuell",
@@ -1001,7 +1001,7 @@
   "upload_form.drag_and_drop.on_drag_start": "Der Medienanhang {item} wurde aufgenommen.",
   "upload_form.edit": "Bearbeiten",
   "upload_progress.label": "Wird hochgeladen …",
-  "upload_progress.processing": "Wird verarbeitet…",
+  "upload_progress.processing": "Wird verarbeitet …",
   "username.taken": "Dieser Profilname ist vergeben. Versuche einen anderen",
   "video.close": "Video schließen",
   "video.download": "Datei herunterladen",
@@ -1028,9 +1028,9 @@
   "visibility_modal.helper.unlisted_quoting": "Sollten dich andere zitieren, werden ihre zitierten Beiträge ebenfalls nicht in den Trends und öffentlichen Timelines angezeigt.",
   "visibility_modal.instructions": "Lege fest, wer mit diesem Beitrag interagieren darf. Du hast auch die Möglichkeit, diese Einstellung auf alle zukünftigen Beiträge anzuwenden. Gehe zu: <link>Einstellungen > Standardeinstellungen für Beiträge</link>",
   "visibility_modal.privacy_label": "Sichtbarkeit",
-  "visibility_modal.quote_followers": "Nur Follower",
+  "visibility_modal.quote_followers": "Nur meine Follower dürfen mich zitieren",
   "visibility_modal.quote_label": "Wer darf mich zitieren?",
-  "visibility_modal.quote_nobody": "Nur ich",
-  "visibility_modal.quote_public": "Alle",
+  "visibility_modal.quote_nobody": "Niemand darf mich zitieren",
+  "visibility_modal.quote_public": "Alle dürfen mich zitieren",
   "visibility_modal.save": "Speichern"
 }

app/javascript/mastodon/locales/el.json

@@ -729,7 +729,7 @@
   "onboarding.profile.display_name": "Εμφανιζόμενο όνομα",
   "onboarding.profile.display_name_hint": "Το πλήρες ή το διασκεδαστικό σου όνομα…",
   "onboarding.profile.note": "Βιογραφικό",
-  "onboarding.profile.note_hint": "Μπορείτε να @αναφέρετε άλλα άτομα ή #hashtags…",
+  "onboarding.profile.note_hint": "Μπορείς να @επισημάνεις άλλα άτομα ή #ετικέτες…",
   "onboarding.profile.save_and_continue": "Αποθήκευση και συνέχεια",
   "onboarding.profile.title": "Ρύθμιση προφίλ",
   "onboarding.profile.upload_avatar": "Μεταφόρτωση εικόνας προφίλ",
@@ -768,7 +768,7 @@
   "quote_error.quote": "Επιτρέπεται μόνο μία παράθεση τη φορά.",
   "quote_error.unauthorized": "Δεν είστε εξουσιοδοτημένοι να παραθέσετε αυτή την ανάρτηση.",
   "quote_error.upload": "Η παράθεση δεν επιτρέπεται με συνημμένα πολυμέσων.",
-  "recommended": "Προτεινόμενα",
+  "recommended": "Προτείνεται",
   "refresh": "Ανανέωση",
   "regeneration_indicator.please_stand_by": "Παρακαλούμε περίμενε.",
   "regeneration_indicator.preparing_your_home_feed": "Ετοιμάζουμε την αρχική σου ροή…",

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

@@ -766,6 +766,8 @@
   "quote_error.poll": "Quoting is not allowed with polls.",
   "quote_error.private_mentions": "Quoting is not allowed with direct mentions.",
   "quote_error.quote": "Only one quote at a time is allowed.",
+  "quote_error.unauthorized": "You are not authorised to quote this post.",
+  "quote_error.upload": "Quoting is not allowed with media attachments.",
   "recommended": "Recommended",
   "refresh": "Refresh",
   "regeneration_indicator.please_stand_by": "Please stand by.",
@@ -781,6 +783,9 @@
   "relative_time.minutes": "{number}m",
   "relative_time.seconds": "{number}s",
   "relative_time.today": "today",
+  "remove_quote_hint.button_label": "Got it",
+  "remove_quote_hint.message": "You can do so from the {icon} options menu.",
+  "remove_quote_hint.title": "Want to remove your quoted post?",
   "reply_indicator.attachments": "{count, plural, one {# attachment} other {# attachments}}",
   "reply_indicator.cancel": "Cancel",
   "reply_indicator.poll": "Poll",
@@ -872,13 +877,23 @@
   "status.admin_account": "Open moderation interface for @{name}",
   "status.admin_domain": "Open moderation interface for {domain}",
   "status.admin_status": "Open this post in the moderation interface",
+  "status.all_disabled": "Boosts and quotes are disabled",
   "status.block": "Block @{name}",
   "status.bookmark": "Bookmark",
   "status.cancel_reblog_private": "Unboost",
+  "status.cannot_quote": "You are not allowed to quote this post",
   "status.cannot_reblog": "This post cannot be boosted",
+  "status.contains_quote": "Contains quote",
+  "status.context.loading": "Loading more replies",
+  "status.context.loading_error": "Couldn't load new replies",
+  "status.context.loading_success": "New replies loaded",
+  "status.context.more_replies_found": "More replies found",
+  "status.context.retry": "Retry",
+  "status.context.show": "Show",
   "status.continued_thread": "Continued thread",
   "status.copy": "Copy link to status",
   "status.delete": "Delete",
+  "status.delete.success": "Post deleted",
   "status.detailed_status": "Detailed conversation view",
   "status.direct": "Privately mention @{name}",
   "status.direct_indicator": "Private mention",
@@ -901,20 +916,46 @@
   "status.mute_conversation": "Mute conversation",
   "status.open": "Expand this post",
   "status.pin": "Pin on profile",
+  "status.quote": "Quote",
+  "status.quote.cancel": "Cancel quote",
+  "status.quote_error.blocked_account_hint.title": "This post is hidden because you've blocked @{name}.",
+  "status.quote_error.blocked_domain_hint.title": "This post is hidden because you've blocked {domain}.",
   "status.quote_error.filtered": "Hidden due to one of your filters",
+  "status.quote_error.limited_account_hint.action": "Show anyway",
+  "status.quote_error.limited_account_hint.title": "This account has been hidden by the moderators of {domain}.",
+  "status.quote_error.muted_account_hint.title": "This post is hidden because you've muted @{name}.",
+  "status.quote_error.not_available": "Post unavailable",
+  "status.quote_error.pending_approval": "Post pending",
+  "status.quote_error.pending_approval_popout.body": "On Mastodon, you can control whether someone can quote you. This post is pending while we're getting the original author's approval.",
+  "status.quote_error.revoked": "Post removed by author",
+  "status.quote_followers_only": "Only followers can quote this post",
+  "status.quote_manual_review": "Author will manually review",
+  "status.quote_noun": "Quote",
+  "status.quote_policy_change": "Change who can quote",
+  "status.quote_post_author": "Quoted a post by @{name}",
+  "status.quote_private": "Private posts cannot be quoted",
+  "status.quotes": "{count, plural, one {quote} other {quotes}}",
+  "status.quotes.empty": "No one has quoted this post yet. When someone does, it will show up here.",
+  "status.quotes.local_other_disclaimer": "Quotes rejected by the author will not be shown.",
+  "status.quotes.remote_other_disclaimer": "Only quotes from {domain} are guaranteed to be shown here. Quotes rejected by the author will not be shown.",
   "status.read_more": "Read more",
   "status.reblog": "Boost",
+  "status.reblog_or_quote": "Boost or quote",
+  "status.reblog_private": "Share again with your followers",
   "status.reblogged_by": "{name} boosted",
   "status.reblogs": "{count, plural, one {boost} other {boosts}}",
   "status.reblogs.empty": "No one has boosted this post yet. When someone does, they will show up here.",
   "status.redraft": "Delete & re-draft",
   "status.remove_bookmark": "Remove bookmark",
   "status.remove_favourite": "Remove from favourites",
+  "status.remove_quote": "Remove",
   "status.replied_in_thread": "Replied in thread",
   "status.replied_to": "Replied to {name}",
   "status.reply": "Reply",
   "status.replyAll": "Reply to thread",
   "status.report": "Report @{name}",
+  "status.request_quote": "Request to quote",
+  "status.revoke_quote": "Remove my post from @{name}’s post",
   "status.sensitive_warning": "Sensitive content",
   "status.share": "Share",
   "status.show_less_all": "Show less for all",
@@ -952,6 +993,7 @@
   "upload_button.label": "Add images, a video or an audio file",
   "upload_error.limit": "File upload limit exceeded.",
   "upload_error.poll": "File upload not allowed with polls.",
+  "upload_error.quote": "File upload not allowed with quotes.",
   "upload_form.drag_and_drop.instructions": "To pick up a media attachment, press space or enter. While dragging, use the arrow keys to move the media attachment in any given direction. Press space or enter again to drop the media attachment in its new position, or press escape to cancel.",
   "upload_form.drag_and_drop.on_drag_cancel": "Dragging was cancelled. Media attachment {item} was dropped.",
   "upload_form.drag_and_drop.on_drag_end": "Media attachment {item} was dropped.",
@@ -975,6 +1017,14 @@
   "video.unmute": "Unmute",
   "video.volume_down": "Volume down",
   "video.volume_up": "Volume up",
+  "visibility_modal.button_title": "Set visibility",
+  "visibility_modal.direct_quote_warning.text": "If you save the current settings, the embedded quote will be converted to a link.",
+  "visibility_modal.direct_quote_warning.title": "Quotes can't be embedded in private mentions",
+  "visibility_modal.header": "Visibility and interaction",
+  "visibility_modal.helper.direct_quoting": "Private mentions authored on Mastodon can't be quoted by others.",
+  "visibility_modal.helper.privacy_editing": "Visibility can't be changed after a post is published.",
+  "visibility_modal.helper.privacy_private_self_quote": "Self-quotes of private posts cannot be made public.",
+  "visibility_modal.helper.private_quoting": "Follower-only posts authored on Mastodon can't be quoted by others.",
   "visibility_modal.helper.unlisted_quoting": "When people quote you, their post will also be hidden from trending timelines.",
   "visibility_modal.instructions": "Control who can interact with this post. You can also apply settings to all future posts by navigating to <link>Preferences > Posting defaults</link>.",
   "visibility_modal.privacy_label": "Visibility",

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

@@ -1028,7 +1028,7 @@
   "visibility_modal.helper.unlisted_quoting": "Cuando otras cuentas te citen, sus publicaciones también se ocultarán de las líneas temporales de tendencias.",
   "visibility_modal.instructions": "Controlá quién puede interactuar con este mensaje. También podés aplicar los ajustes para todos los mensajes futuros accediendo a <link>«Configuración» > «Configuración predeterminada de mensajes»</link>.",
   "visibility_modal.privacy_label": "Visibilidad",
-  "visibility_modal.quote_followers": "Solo para seguidores",
+  "visibility_modal.quote_followers": "Solo seguidores",
   "visibility_modal.quote_label": "Quién puede citar",
   "visibility_modal.quote_nobody": "Solo yo",
   "visibility_modal.quote_public": "Cualquier cuenta",

app/javascript/mastodon/locales/et.json

@@ -3,7 +3,7 @@
   "about.contact": "Kontakt:",
   "about.default_locale": "Vaikimisi",
   "about.disclaimer": "Mastodon on tasuta ja vaba tarkvara ning Mastodon gGmbH kaubamärk.",
-  "about.domain_blocks.no_reason_available": "Põhjus teadmata",
+  "about.domain_blocks.no_reason_available": "Põhjus on teadmata",
   "about.domain_blocks.preamble": "Mastodon lubab tavaliselt vaadata sisu ning suhelda kasutajatega ükskõik millisest teisest fediversumi serverist. Need on erandid, mis on paika pandud sellel kindlal serveril.",
   "about.domain_blocks.silenced.explanation": "Sa ei näe üldiselt profiile ja sisu sellelt serverilt, kui sa just tahtlikult seda ei otsi või jälgimise moel nõusolekut ei anna.",
   "about.domain_blocks.silenced.title": "Piiratud",
@@ -36,7 +36,7 @@
   "account.familiar_followers_two": "Jälgijateks {name1} ja {name2}",
   "account.featured": "Esiletõstetud",
   "account.featured.accounts": "Profiilid",
-  "account.featured.hashtags": "Sildid",
+  "account.featured.hashtags": "Teemaviited",
   "account.featured_tags.last_status_at": "Viimane postitus {date}",
   "account.featured_tags.last_status_never": "Postitusi pole",
   "account.follow": "Jälgi",
@@ -126,8 +126,8 @@
   "annual_report.summary.highlighted_post.by_replies": "kõige vastatum postitus",
   "annual_report.summary.highlighted_post.possessive": "omanik {name}",
   "annual_report.summary.most_used_app.most_used_app": "enim kasutatud äpp",
-  "annual_report.summary.most_used_hashtag.most_used_hashtag": "enim kasutatud silt",
-  "annual_report.summary.most_used_hashtag.none": "Pole",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "enim kasutatud teemaviide",
+  "annual_report.summary.most_used_hashtag.none": "Puudub",
   "annual_report.summary.new_posts.new_posts": "uus postitus",
   "annual_report.summary.percentile.text": "<topLabel>See paneb su top</topLabel><percentage></percentage><bottomLabel> {domain} kasutajate hulka.</bottomLabel>",
   "annual_report.summary.percentile.we_wont_tell_bernie": "Vägev.",
@@ -202,7 +202,7 @@
   "compose.saved.body": "Postitus salvestatud.",
   "compose_form.direct_message_warning_learn_more": "Vaata lisa",
   "compose_form.encryption_warning": "Postitused Mastodonis ei ole otsast-otsani krüpteeritud. Ära jaga mingeid delikaatseid andmeid Mastodoni kaudu.",
-  "compose_form.hashtag_warning": "See postitus ei ilmu ühegi märksõna all, kuna pole avalik. Vaid avalikud postitused on märksõnade kaudu leitavad.",
+  "compose_form.hashtag_warning": "See postitus ei ilmu ühegi teemaviite all, kuna pole avalik. Vaid avalikud postitused on teemaviidete kaudu leitavad.",
   "compose_form.lock_disclaimer": "Su konto ei ole {locked}. Igaüks saab sind jälgida, et näha su ainult-jälgijatele postitusi.",
   "compose_form.lock_disclaimer.lock": "lukus",
   "compose_form.placeholder": "Millest mõtled?",
@@ -330,8 +330,8 @@
   "emoji_button.search_results": "Otsitulemused",
   "emoji_button.symbols": "Sümbolid",
   "emoji_button.travel": "Reisimine & kohad",
-  "empty_column.account_featured.me": "Sa pole veel midagi esile tõstnud. Kas sa teadsid, et oma profiilis saad esile tõsta enamkasutatavaid silte või või sõbra kasutajakontot?",
-  "empty_column.account_featured.other": "{acct} pole veel midagi esile tõstnud. Kas sa teadsid, et oma profiilis saad esile tõsta enamkasutatavaid silte või või sõbra kasutajakontot?",
+  "empty_column.account_featured.me": "Sa pole veel midagi esile tõstnud. Kas sa teadsid, et oma profiilis saad esile tõsta enamkasutatavaid teemaviiteid või sõbra kasutajakontot?",
+  "empty_column.account_featured.other": "{acct} pole veel midagi esile tõstnud. Kas sa teadsid, et oma profiilis saad esile tõsta enamkasutatavaid teemaviiteid või sõbra kasutajakontot?",
   "empty_column.account_featured_other.unknown": "See kasutajakonto pole veel midagi esile tõstnud.",
   "empty_column.account_hides_collections": "See kasutaja otsustas mitte teha seda infot saadavaks",
   "empty_column.account_suspended": "Konto kustutatud",
@@ -347,8 +347,8 @@
   "empty_column.favourited_statuses": "Pole veel lemmikpostitusi. Kui märgid mõne, näed neid siin.",
   "empty_column.favourites": "Keegi pole veel seda postitust lemmikuks märkinud. Kui keegi seda teeb, siis on ta nähtav siin.",
   "empty_column.follow_requests": "Pole hetkel ühtegi jälgimistaotlust. Kui saad mõne, näed neid siin.",
-  "empty_column.followed_tags": "Sa ei jälgi veel ühtegi märksõna. Kui jälgid, ilmuvad need siia.",
-  "empty_column.hashtag": "Selle sildi all ei ole ühtegi postitust.",
+  "empty_column.followed_tags": "Sa ei jälgi veel ühtegi teemaviidet. Kui jälgid, ilmuvad need siia.",
+  "empty_column.hashtag": "Selle teemaviite all ei ole ühtegi postitust.",
   "empty_column.home": "Su koduajajoon on tühi. Jälgi rohkemaid inimesi, et seda täita {suggestions}",
   "empty_column.list": "Siin loetelus pole veel midagi. Kui loetelu liikmed teevad uusi postitusi, näed neid siin.",
   "empty_column.mutes": "Sa pole veel ühtegi kasutajat summutanud.",
@@ -365,7 +365,7 @@
   "explore.title": "Populaarsust koguv",
   "explore.trending_links": "Uudised",
   "explore.trending_statuses": "Postitused",
-  "explore.trending_tags": "Sildid",
+  "explore.trending_tags": "Teemaviited",
   "featured_carousel.header": "{count, plural, one {Esiletõstetud postitus} other {Esiletõstetud postitust}}",
   "featured_carousel.next": "Järgmine",
   "featured_carousel.post": "Postita",
@@ -411,7 +411,7 @@
   "follow_suggestions.similar_to_recently_followed_longer": "Sarnane profiilile, mida hiljuti jälgima hakkasid",
   "follow_suggestions.view_all": "Vaata kõiki",
   "follow_suggestions.who_to_follow": "Keda jälgida",
-  "followed_tags": "Jälgitavad märksõnad",
+  "followed_tags": "Jälgitavad teemaviited",
   "footer.about": "Teave",
   "footer.directory": "Profiilikataloog",
   "footer.get_app": "Laadi rakendus",
@@ -423,17 +423,17 @@
   "generic.saved": "Salvestatud",
   "getting_started.heading": "Alustamine",
   "hashtag.admin_moderation": "Ava modereerimisliides #{name} jaoks",
-  "hashtag.browse": "Sirvi #{hashtag} sildiga postitusi",
-  "hashtag.browse_from_account": "Sirvi @{name} kasutaja #{hashtag} sildiga postitusi",
+  "hashtag.browse": "Sirvi #{hashtag} teemaviitega postitusi",
+  "hashtag.browse_from_account": "Sirvi @{name} kasutaja #{hashtag} teemaviitega postitusi",
   "hashtag.column_header.tag_mode.all": "ja {additional}",
-  "hashtag.column_header.tag_mode.any": "või {additional}",
-  "hashtag.column_header.tag_mode.none": "ilma {additional}",
+  "hashtag.column_header.tag_mode.any": "või teemaviide {additional}",
+  "hashtag.column_header.tag_mode.none": "ilma teemaviiteta {additional}",
   "hashtag.column_settings.select.no_options_message": "Soovitusi ei leitud",
   "hashtag.column_settings.select.placeholder": "Sisesta sildid…",
   "hashtag.column_settings.tag_mode.all": "Kõik need",
   "hashtag.column_settings.tag_mode.any": "Mõni neist",
   "hashtag.column_settings.tag_mode.none": "Mitte ükski neist",
-  "hashtag.column_settings.tag_toggle": "Kaasa lisamärked selle tulba jaoks",
+  "hashtag.column_settings.tag_toggle": "Kaasa lisasildid selle veeru jaoks",
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} osalejaga} other {{counter} osalejaga}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} postitusega} other {{counter} postitusega}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} postitust} other {{counter} postitust}} täna",
@@ -579,7 +579,7 @@
   "navigation_bar.favourites": "Lemmikud",
   "navigation_bar.filters": "Summutatud sõnad",
   "navigation_bar.follow_requests": "Jälgimistaotlused",
-  "navigation_bar.followed_tags": "Jälgitavad märksõnad",
+  "navigation_bar.followed_tags": "Jälgitavad teemaviited",
   "navigation_bar.follows_and_followers": "Jälgitavad ja jälgijad",
   "navigation_bar.import_export": "Import ja eksport",
   "navigation_bar.lists": "Loetelud",
@@ -729,7 +729,7 @@
   "onboarding.profile.display_name": "Näidatav nimi",
   "onboarding.profile.display_name_hint": "Su täisnimi või naljanimi…",
   "onboarding.profile.note": "Elulugu",
-  "onboarding.profile.note_hint": "Saad @mainida teisi kasutajaid või #sildistada…",
+  "onboarding.profile.note_hint": "Saad @mainida teisi kasutajaid või lisada #teemaviidet…",
   "onboarding.profile.save_and_continue": "Salvesta ja jätka",
   "onboarding.profile.title": "Profiili seadistamine",
   "onboarding.profile.upload_avatar": "Laadi üles profiilipilt",
@@ -757,7 +757,7 @@
   "privacy.quote.anyone": "{visibility}, kõik võivad tsiteerida",
   "privacy.quote.disabled": "{visibility}, tsiteerimine pole lubatud",
   "privacy.quote.limited": "{visibility}, tsiteerimine on piiratud",
-  "privacy.unlisted.additional": "See on olemuselt küll avalik, aga postitus ei ilmu voogudes ega märksõnades, lehitsedes ega Mastodoni otsingus, isegi kui konto on seadistustes avalik.",
+  "privacy.unlisted.additional": "See on olemuselt küll avalik, aga postitus ei ilmu voogudes ega teemaviidetes, lehitsedes ega Mastodoni otsingus, isegi kui konto on seadistustes avalik.",
   "privacy.unlisted.long": "Peidetud Mastodoni otsingutulemustest, pupulaarsust koguva sisu voost ja avalikult ajajoonelt",
   "privacy.unlisted.short": "Vaikselt avalik",
   "privacy_policy.last_updated": "Viimati uuendatud {date}",
@@ -844,7 +844,7 @@
   "search.placeholder": "Otsi",
   "search.quick_action.account_search": "Sobivaid profiile {x}",
   "search.quick_action.go_to_account": "Mine profiili {x}",
-  "search.quick_action.go_to_hashtag": "Ava silt {x}",
+  "search.quick_action.go_to_hashtag": "Ava teemaviide {x}",
   "search.quick_action.open_url": "Ava URL Mastodonis",
   "search.quick_action.status_search": "Sobivad postitused {x}",
   "search.search_or_paste": "Otsi või kleebi URL",
@@ -860,7 +860,7 @@
   "search_results.all": "Kõik",
   "search_results.hashtags": "Sildid",
   "search_results.no_results": "Tulemusi pole.",
-  "search_results.no_search_yet": "Proovi otsida postitusi, profiile või silte.",
+  "search_results.no_search_yet": "Proovi otsida postitusi, profiile või teemaviiteid.",
   "search_results.see_all": "Vaata kõiki",
   "search_results.statuses": "Postitused",
   "search_results.title": "Otsi märksõna: {q}",

app/javascript/mastodon/locales/fa.json

@@ -4,7 +4,7 @@
   "about.default_locale": "پیش‌گزیده",
   "about.disclaimer": "ماستودون نرم‌افزار آزاد و نشان تجاری یک شرکت غیر انتفاعی با مسئولیت محدود آلمانی است.",
   "about.domain_blocks.no_reason_available": "دلیلی موجود نیست",
-  "about.domain_blocks.preamble": "ماستودون عموماً می‌گذارد محتوا را از از هر کارساز دیگری در دنیای شبکه‌های اجتماعی غیرمتمرکز دیده و با آنان برهم‌کنش داشته باشید. این‌ها استثناهایی هستند که روی این کارساز خاص وضع شده‌اند.",
+  "about.domain_blocks.preamble": "ماستودون عموماً می‌گذارد محتوا را از هر کارساز دیگری در دنیای شبکه‌های اجتماعی غیرمتمرکز دیده و با آنان برهم‌کنش داشته باشید. این‌ها استثناهایی هستند که روی این کارساز خاص وضع شده‌اند.",
   "about.domain_blocks.silenced.explanation": "عموماً نمایه‌ها و محتوا از این کارساز را نمی‌بینید، مگر این که به طور خاص دنبالشان گشته یا با پی گیری، داوطلب دیدنشان شوید.",
   "about.domain_blocks.silenced.title": "محدود",
   "about.domain_blocks.suspended.explanation": "هیچ داده‌ای از این کارساز پردازش، ذخیره یا مبادله نخواهد شد، که هرگونه برهم‌کنش یا ارتباط با کاربران این کارساز را غیرممکن خواهد کرد.",
@@ -117,7 +117,7 @@
   "annual_report.summary.archetype.lurker": "کم‌پیدا",
   "annual_report.summary.archetype.oracle": "غیب‌گو",
   "annual_report.summary.archetype.pollster": "نظرسنج",
-  "annual_report.summary.archetype.replier": "پاسخگو",
+  "annual_report.summary.archetype.replier": "پاسخ‌گو",
   "annual_report.summary.followers.followers": "دنبال کننده",
   "annual_report.summary.followers.total": "در مجموع {count}",
   "annual_report.summary.here_it_is": "بازبینی {year} تان:",
@@ -606,8 +606,8 @@
   "notification.admin.report_statuses_other": "{name}، {target} را گزارش داد",
   "notification.admin.sign_up": "{name} ثبت نام کرد",
   "notification.admin.sign_up.name_and_others": "{name} و {count, plural, one {# نفر دیگر} other {# نفر دیگر}} ثبت‌نام کردند",
-  "notification.annual_report.message": "آمار ‪#Wrapstodon‬ ‏{year} تان منتظر است! لحظه‌های به یاد ماندنی و نقاط پررنگ سال را روی ماستودون رونمایی کنید!",
-  "notification.annual_report.view": "دیدن ‪#Wrapstodon‬",
+  "notification.annual_report.message": "#خلاصه_ماستودون {year} منتظرتان است! رونمایی از لحظه‌های به یاد ماندنی و نقاط پررنگ سال روی ماستودون!",
+  "notification.annual_report.view": "دیدن #خلاصه_ماستودون",
   "notification.favourite": "{name} فرسته‌تان را برگزید",
   "notification.favourite.name_and_others_with_link": "{name} و <a>{count, plural, one {# نفر دیگر} other {# نفر دیگر}}</a> فرسته‌تان را برگزیدند",
   "notification.favourite_pm": "{name} اشارهٔ خصوصیتان را برگزید",

app/javascript/mastodon/locales/fi.json

@@ -80,7 +80,7 @@
   "account.requests_to_follow_you": "Pyynnöt seurata sinua",
   "account.share": "Jaa käyttäjän @{name} profiili",
   "account.show_reblogs": "Näytä käyttäjän @{name} tehostukset",
-  "account.statuses_counter": "{count, plural, one {{counter} julkaisu} other {{counter} julkaisua}}",
+  "account.statuses_counter": "{count, plural, one {{counter} julkaisu} other {{counter} julkaisua}}",
   "account.unblock": "Kumoa käyttäjän @{name} esto",
   "account.unblock_domain": "Kumoa verkkotunnuksen {domain} esto",
   "account.unblock_domain_short": "Kumoa esto",
@@ -100,7 +100,7 @@
   "admin.impact_report.instance_followers": "Seuraajat, jotka käyttäjämme menettäisivät",
   "admin.impact_report.instance_follows": "Seuraajat, jotka heidän käyttäjänsä menettäisivät",
   "admin.impact_report.title": "Vaikutusten yhteenveto",
-  "alert.rate_limited.message": "Yritä uudelleen {retry_time, time, medium} jälkeen.",
+  "alert.rate_limited.message": "Yritä uudelleen kello {retry_time, time, medium} jälkeen.",
   "alert.rate_limited.title": "Pyyntömäärää rajoitettu",
   "alert.unexpected.message": "Tapahtui odottamaton virhe.",
   "alert.unexpected.title": "Hups!",
@@ -200,7 +200,7 @@
   "compose.published.body": "Julkaisu lähetetty.",
   "compose.published.open": "Avaa",
   "compose.saved.body": "Julkaisu tallennettu.",
-  "compose_form.direct_message_warning_learn_more": "Lisätietoja",
+  "compose_form.direct_message_warning_learn_more": "Lue lisää",
   "compose_form.encryption_warning": "Mastodonin julkaisut eivät ole päästä päähän salattuja. Älä jaa arkaluonteisia tietoja Mastodonissa.",
   "compose_form.hashtag_warning": "Tätä julkaisua ei voi liittää aihetunnisteisiin, koska se ei ole julkinen. Vain näkyvyydeltään julkisiksi määritettyjä julkaisuja voidaan hakea aihetunnisteiden avulla.",
   "compose_form.lock_disclaimer": "Tilisi ei ole {locked}. Kuka tahansa voi seurata tiliäsi ja nähdä vain seuraajille rajaamasi julkaisut.",
@@ -231,7 +231,7 @@
   "confirmations.discard_draft.edit.cancel": "Palaa muokkaamaan",
   "confirmations.discard_draft.edit.message": "Jatkaminen tuhoaa kaikki muutokset, joita olet tehnyt julkaisuun, jota olet parhaillaan muokkaamassa.",
   "confirmations.discard_draft.edit.title": "Hylätäänkö luonnosjulkaisusi muutokset?",
-  "confirmations.discard_draft.post.cancel": "Palaa lunnokseen",
+  "confirmations.discard_draft.post.cancel": "Palaa luonnokseen",
   "confirmations.discard_draft.post.message": "Jatkaminen tuhoaa julkaisun, jota olet parhaillaan laatimassa.",
   "confirmations.discard_draft.post.title": "Hylätäänkö luonnosjulkaisusi?",
   "confirmations.discard_edit_media.confirm": "Hylkää",
@@ -296,7 +296,7 @@
   "domain_block_modal.they_cant_follow": "Kukaan tältä palvelimelta ei voi seurata sinua.",
   "domain_block_modal.they_wont_know": "Hän ei saa tietää tulleensa estetyksi.",
   "domain_block_modal.title": "Estetäänkö verkkotunnus?",
-  "domain_block_modal.you_will_lose_num_followers": "Menetät {followersCount, plural, one {{followersCountDisplay} seuraajasi} other {{followersCountDisplay} seuraajaasi}} ja {followingCount, plural, one {{followingCountDisplay} seurattavasi} other {{followingCountDisplay} seurattavaasi}}.",
+  "domain_block_modal.you_will_lose_num_followers": "Menetät {followersCount, plural, one {{followersCountDisplay}:n seuraajasi} other {{followersCountDisplay} seuraajaasi}} ja {followingCount, plural, one {{followingCountDisplay}:n seurattavasi} other {{followingCountDisplay} seurattavaasi}}.",
   "domain_block_modal.you_will_lose_relationships": "Menetät kaikki tämän palvelimen seuraajasi ja seurattavasi.",
   "domain_block_modal.you_wont_see_posts": "Et enää näe julkaisuja etkä ilmoituksia tämän palvelimen käyttäjiltä.",
   "domain_pill.activitypub_lets_connect": "Sen avulla voit muodostaa yhteyden ja olla vuorovaikutuksessa ihmisten kanssa, ei vain Mastodonissa vaan myös muissa sosiaalisissa sovelluksissa.",
@@ -336,7 +336,7 @@
   "empty_column.account_hides_collections": "Käyttäjä on päättänyt pitää nämä tiedot yksityisinä",
   "empty_column.account_suspended": "Tili jäädytetty",
   "empty_column.account_timeline": "Ei julkaisuja täällä!",
-  "empty_column.account_unavailable": "Profiilia ei ole saatavilla",
+  "empty_column.account_unavailable": "Profiili ei saatavilla",
   "empty_column.blocks": "Et ole vielä estänyt käyttäjiä.",
   "empty_column.bookmarked_statuses": "Et ole vielä lisännyt julkaisuja kirjanmerkkeihisi. Kun lisäät yhden, se näkyy tässä.",
   "empty_column.community": "Paikallinen aikajana on tyhjä. Kirjoita jotain julkista, niin homma lähtee käyntiin!",
@@ -357,7 +357,7 @@
   "empty_column.public": "Täällä ei ole mitään! Kirjoita jotain julkisesti tai seuraa muiden palvelinten käyttäjiä, niin saat sisältöä",
   "error.unexpected_crash.explanation": "Sivua ei voida näyttää oikein ohjelmointivirheen tai selaimen yhteensopivuusvajeen vuoksi.",
   "error.unexpected_crash.explanation_addons": "Sivua ei voitu näyttää oikein. Tämä virhe johtuu todennäköisesti selaimen lisäosasta tai automaattisista käännöstyökaluista.",
-  "error.unexpected_crash.next_steps": "Kokeile päivittää sivu. Jos se ei auta, voi Mastodonin käyttö ehkä onnistua eri selaimella tai natiivisovelluksella.",
+  "error.unexpected_crash.next_steps": "Kokeile päivittää sivu. Jos se ei auta, Mastodonin käyttö voi ehkä onnistua eri selaimella tai natiivisovelluksella.",
   "error.unexpected_crash.next_steps_addons": "Yritä poistaa ne käytöstä, ja virkistä sitten sivunlataus. Mikäli ongelma jatkuu, voit mahdollisesti käyttää Mastodonia eri selaimella tai natiivilla sovelluksella.",
   "errors.unexpected_crash.copy_stacktrace": "Kopioi pinon jäljitys leikepöydälle",
   "errors.unexpected_crash.report_issue": "Ilmoita ongelmasta",
@@ -434,15 +434,15 @@
   "hashtag.column_settings.tag_mode.any": "Mikä tahansa näistä",
   "hashtag.column_settings.tag_mode.none": "Ei mitään näistä",
   "hashtag.column_settings.tag_toggle": "Sisällytä lisätunnisteet tähän sarakkeeseen",
-  "hashtag.counter_by_accounts": "{count, plural, one {{counter} osallistuja} other {{counter} osallistujaa}}",
-  "hashtag.counter_by_uses": "{count, plural, one{{counter} julkaisu} other {{counter} julkaisua}}",
-  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} julkaisu} other {{counter} julkaisua}} tänään",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} osallistuja} other {{counter} osallistujaa}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} julkaisu} other {{counter} julkaisua}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} julkaisu} other {{counter} julkaisua}} tänään",
   "hashtag.feature": "Suosittele profiilissa",
   "hashtag.follow": "Seuraa aihetunnistetta",
   "hashtag.mute": "Mykistä #{hashtag}",
   "hashtag.unfeature": "Kumoa suosittelu profiilissa",
   "hashtag.unfollow": "Lopeta aihetunnisteen seuraaminen",
-  "hashtags.and_other": "…ja {count, plural, other {# lisää}}",
+  "hashtags.and_other": "…ja {count, plural, other {# lisää}}",
   "hints.profiles.followers_may_be_missing": "Tämän profiilin seuraajia saattaa puuttua.",
   "hints.profiles.follows_may_be_missing": "Tämän profiilin seurattavia saattaa puuttua.",
   "hints.profiles.posts_may_be_missing": "Tämän profiilin julkaisuja saattaa puuttua.",
@@ -477,9 +477,9 @@
   "interaction_modal.on_this_server": "Tällä palvelimella",
   "interaction_modal.title": "Jatka kirjautumalla sisään",
   "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}}",
+  "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}}",
   "keyboard_shortcuts.back": "Siirry takaisin",
   "keyboard_shortcuts.blocked": "Avaa estettyjen käyttäjien luettelo",
   "keyboard_shortcuts.boost": "Tehosta julkaisua",
@@ -496,7 +496,7 @@
   "keyboard_shortcuts.home": "Avaa kotiaikajana",
   "keyboard_shortcuts.hotkey": "Pikanäppäin",
   "keyboard_shortcuts.legend": "Näytä tämä ohje",
-  "keyboard_shortcuts.load_more": "Kohdista ”Lataa lisää” -painikkeeseen",
+  "keyboard_shortcuts.load_more": "Kohdista ”Lataa lisää” -⁠painikkeeseen",
   "keyboard_shortcuts.local": "Avaa paikallinen aikajana",
   "keyboard_shortcuts.mention": "Mainitse tekijä",
   "keyboard_shortcuts.muted": "Avaa mykistettyjen käyttäjien luettelo",
@@ -510,7 +510,7 @@
   "keyboard_shortcuts.requests": "Avaa seurantapyyntöjen luettelo",
   "keyboard_shortcuts.search": "Kohdista hakukenttään",
   "keyboard_shortcuts.spoilers": "Näytä tai piilota sisältövaroituskenttä",
-  "keyboard_shortcuts.start": "Avaa Näin pääset alkuun -sarake",
+  "keyboard_shortcuts.start": "Avaa ”Näin pääset alkuun” -⁠sarake",
   "keyboard_shortcuts.toggle_hidden": "Näytä tai piilota sisältövaroituksella merkitty teksti",
   "keyboard_shortcuts.toggle_sensitivity": "Näytä tai piilota media",
   "keyboard_shortcuts.toot": "Luo uusi julkaisu",
@@ -528,7 +528,7 @@
   "limited_account_hint.title": "Palvelimen {domain} moderaattorit ovat piilottaneet tämän profiilin.",
   "link_preview.author": "Tehnyt {name}",
   "link_preview.more_from_author": "Lisää tekijältä {name}",
-  "link_preview.shares": "{count, plural, one {{counter} julkaisu} other {{counter} julkaisua}}",
+  "link_preview.shares": "{count, plural, one {{counter} julkaisu} other {{counter} julkaisua}}",
   "lists.add_member": "Lisää",
   "lists.add_to_list": "Lisää listaan",
   "lists.add_to_lists": "Lisää {name} listaan",
@@ -541,7 +541,7 @@
   "lists.exclusive": "Piilota jäsenet kotisyötteestä",
   "lists.exclusive_hint": "Jos joku on tässä listassa, piilota hänet kotisyötteestäsi, jotta et näe hänen julkaisujaan kahteen kertaan.",
   "lists.find_users_to_add": "Etsi lisättäviä käyttäjiä",
-  "lists.list_members_count": "{count, plural, one {# jäsen} other {# jäsentä}}",
+  "lists.list_members_count": "{count, plural, one {# jäsen} other {# jäsentä}}",
   "lists.list_name": "Listan nimi",
   "lists.new_list_name": "Uuden listan nimi",
   "lists.no_lists_yet": "Ei vielä listoja.",
@@ -554,7 +554,7 @@
   "lists.save": "Tallenna",
   "lists.search": "Haku",
   "lists.show_replies_to": "Sisällytä listan jäsenten vastaukset kohteeseen",
-  "load_pending": "{count, plural, one {# uusi kohde} other {# uutta kohdetta}}",
+  "load_pending": "{count, plural, one {# uusi kohde} other {# uutta kohdetta}}",
   "loading_indicator.label": "Ladataan…",
   "media_gallery.hide": "Piilota",
   "moved_to_account_banner.text": "Tilisi {disabledAccount} on tällä hetkellä poissa käytöstä, koska teit siirron tiliin {movedToAccount}.",
@@ -613,7 +613,7 @@
   "notification.favourite_pm": "{name} lisäsi yksityismainintasi suosikkeihinsa",
   "notification.favourite_pm.name_and_others_with_link": "{name} ja <a>{count, plural, one {# muu} other {# muuta}}</a> lisäsivät yksityismainintasi suosikkeihinsa",
   "notification.follow": "{name} seurasi sinua",
-  "notification.follow.name_and_others": "{name} ja <a>{count, plural, one {# muu} other {# muuta}}</a> seurasivat sinua",
+  "notification.follow.name_and_others": "{name} ja <a>{count, plural, one {# muu} other {# muuta}}</a> seurasivat sinua",
   "notification.follow_request": "{name} on pyytänyt lupaa seurata sinua",
   "notification.follow_request.name_and_others": "{name} ja {count, plural, one {# muu} other {# muuta}} pyysivät saada seurata sinua",
   "notification.label.mention": "Maininta",
@@ -636,7 +636,7 @@
   "notification.poll": "Äänestys, johon osallistuit, on päättynyt",
   "notification.quoted_update": "{name} muokkasi lainaamaasi julkaisua",
   "notification.reblog": "{name} tehosti julkaisuasi",
-  "notification.reblog.name_and_others_with_link": "{name} ja <a>{count, plural, one {# muu} other {# muuta}}</a> tehostivat julkaisuasi",
+  "notification.reblog.name_and_others_with_link": "{name} ja <a>{count, plural, one {# muu} other {# muuta}}</a> tehostivat julkaisuasi",
   "notification.relationships_severance_event": "Menetettiin yhteydet palvelimeen {name}",
   "notification.relationships_severance_event.account_suspension": "Palvelimen {from} ylläpitäjä on jäädyttänyt palvelimen {target} vuorovaikutuksen. Enää et voi siis vastaanottaa päivityksiä heiltä tai olla yhteyksissä heidän kanssaan.",
   "notification.relationships_severance_event.domain_block": "Palvelimen {from} ylläpitäjä on estänyt palvelimen {target} vuorovaikutuksen – mukaan lukien {followersCount} seuraajistasi ja {followingCount, plural, one {# seurattavistasi} other {# seurattavistasi}}.",
@@ -645,7 +645,7 @@
   "notification.status": "{name} julkaisi juuri",
   "notification.update": "{name} muokkasi julkaisua",
   "notification_requests.accept": "Hyväksy",
-  "notification_requests.accept_multiple": "{count, plural, one {Hyväksy # pyyntö…} other {Hyväksy # pyyntöä…}}",
+  "notification_requests.accept_multiple": "{count, plural, one {Hyväksy # pyyntö…} other {Hyväksy # pyyntöä…}}",
   "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Hyväksy pyyntö} other {Hyväksy pyynnöt}}",
   "notification_requests.confirm_accept_multiple.message": "Olet aikeissa hyväksyä {count, plural, one {ilmoituspyynnön} other {# ilmoituspyyntöä}}. Haluatko varmasti jatkaa?",
   "notification_requests.confirm_accept_multiple.title": "Hyväksytäänkö ilmoituspyynnöt?",
@@ -709,7 +709,7 @@
   "notifications.policy.filter_limited_accounts_title": "Moderoidut tilit",
   "notifications.policy.filter_new_accounts.hint": "Luotu {days, plural, one {viime päivän} other {viimeisen # päivän}} aikana",
   "notifications.policy.filter_new_accounts_title": "Uudet tilit",
-  "notifications.policy.filter_not_followers_hint": "Mukaan lukien alle {days, plural, one {päivän} other {# päivää}} sinua seuranneet",
+  "notifications.policy.filter_not_followers_hint": "Mukaan lukien alle {days, plural, one {päivän} other {# päivää}} sinua seuranneet",
   "notifications.policy.filter_not_followers_title": "Käyttäjät, jotka eivät seuraa sinua",
   "notifications.policy.filter_not_following_hint": "Kunnes hyväksyt heidät manuaalisesti",
   "notifications.policy.filter_not_following_title": "Käyttäjät, joita et seuraa",
@@ -740,11 +740,11 @@
   "poll.closed": "Päättynyt",
   "poll.refresh": "Päivitä",
   "poll.reveal": "Näytä tulokset",
-  "poll.total_people": "{count, plural, one {# käyttäjä} other {# käyttäjää}}",
-  "poll.total_votes": "{count, plural, one {# ääni} other {# ääntä}}",
+  "poll.total_people": "{count, plural, one {# käyttäjä} other {# käyttäjää}}",
+  "poll.total_votes": "{count, plural, one {# ääni} other {# ääntä}}",
   "poll.vote": "Äänestä",
   "poll.voted": "Äänestit tätä vastausta",
-  "poll.votes": "{votes, plural, one {# ääni} other {# ääntä}}",
+  "poll.votes": "{votes, plural, one {# ääni} other {# ääntä}}",
   "poll_button.add_poll": "Lisää äänestys",
   "poll_button.remove_poll": "Poista äänestys",
   "privacy.change": "Muuta julkaisun näkyvyyttä",
@@ -754,7 +754,7 @@
   "privacy.private.short": "Seuraajat",
   "privacy.public.long": "Kuka tahansa Mastodonissa ja sen ulkopuolella",
   "privacy.public.short": "Julkinen",
-  "privacy.quote.anyone": "{visibility}, kuka vain voi lainata",
+  "privacy.quote.anyone": "{visibility}, kuka tahansa voi lainata",
   "privacy.quote.disabled": "{visibility}, lainaukset poissa käytöstä",
   "privacy.quote.limited": "{visibility}, lainauksia rajoitettu",
   "privacy.unlisted.additional": "Tämä toimii muuten kuin julkinen, mutta julkaisut eivät näy livesyöte-, aihetunniste- tai selausnäkymissä eivätkä Mastodonin hakutuloksissa, vaikka ne olisivat käyttäjätililläsi yleisesti sallittuina.",
@@ -763,7 +763,7 @@
   "privacy_policy.last_updated": "Päivitetty viimeksi {date}",
   "privacy_policy.title": "Tietosuojakäytäntö",
   "quote_error.edit": "Lainauksia ei voi lisätä julkaisua muokattaessa.",
-  "quote_error.poll": "Äänestysten lainaaminen ei ole sallittua.",
+  "quote_error.poll": "Lainaaminen äänestyksen ohessa ei ole sallittua.",
   "quote_error.private_mentions": "Lainaaminen ei ole sallittua yksityismaininnoissa.",
   "quote_error.quote": "Vain yksi lainaus kerrallaan on sallittu.",
   "quote_error.unauthorized": "Sinulla ei ole valtuuksia lainata tätä julkaisua.",
@@ -772,21 +772,21 @@
   "refresh": "Päivitä",
   "regeneration_indicator.please_stand_by": "Ole valmiina.",
   "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",
+  "relative_time.days": "{number} pv",
+  "relative_time.full.days": "{number, plural, one {# päivä} other {# päivää}} sitten",
+  "relative_time.full.hours": "{number, plural, one {# tunti} other {# tuntia}} sitten",
   "relative_time.full.just_now": "juuri nyt",
-  "relative_time.full.minutes": "{number, plural, one {# minuutti} other {# minuuttia}} sitten",
-  "relative_time.full.seconds": "{number, plural, one {# sekunti} other {# sekuntia}} sitten",
-  "relative_time.hours": "{number} t",
+  "relative_time.full.minutes": "{number, plural, one {# minuutti} other {# minuuttia}} sitten",
+  "relative_time.full.seconds": "{number, plural, one {# sekunti} other {# sekuntia}} sitten",
+  "relative_time.hours": "{number} t",
   "relative_time.just_now": "nyt",
-  "relative_time.minutes": "{number} min",
-  "relative_time.seconds": "{number} s",
+  "relative_time.minutes": "{number} min",
+  "relative_time.seconds": "{number} s",
   "relative_time.today": "tänään",
   "remove_quote_hint.button_label": "Selvä",
   "remove_quote_hint.message": "Voit tehdä sen {icon}-valikosta.",
   "remove_quote_hint.title": "Haluatko poistaa lainatun julkaisusi?",
-  "reply_indicator.attachments": "{count, plural, one {# liite} other {# liitettä}}",
+  "reply_indicator.attachments": "{count, plural, one {# liite} other {# liitettä}}",
   "reply_indicator.cancel": "Peruuta",
   "reply_indicator.poll": "Äänestys",
   "report.block": "Estä",
@@ -829,7 +829,7 @@
   "report.thanks.title_actionable": "Kiitos raportista – tutkimme asiaa.",
   "report.unfollow": "Lopeta käyttäjän @{name} seuraaminen",
   "report.unfollow_explanation": "Seuraat tätä tiliä. Jotta et enää näkisi sen julkaisuja kotisyötteessäsi, lopeta tilin seuraaminen.",
-  "report_notification.attached_statuses": "{count, plural, one {{count} julkaisu} other {{count} julkaisua}} liitteenä",
+  "report_notification.attached_statuses": "{count, plural, one {{count} julkaisu} other {{count} julkaisua}} liitteenä",
   "report_notification.categories.legal": "Lakiseikat",
   "report_notification.categories.legal_sentence": "laiton sisältö",
   "report_notification.categories.other": "Muu",
@@ -845,11 +845,11 @@
   "search.quick_action.account_search": "Profiilit haulla {x}",
   "search.quick_action.go_to_account": "Siirry profiiliin {x}",
   "search.quick_action.go_to_hashtag": "Siirry aihetunnisteeseen {x}",
-  "search.quick_action.open_url": "Avaa URL-osoite Mastodonissa",
+  "search.quick_action.open_url": "Avaa URL-⁠osoite Mastodonissa",
   "search.quick_action.status_search": "Julkaisut haulla {x}",
-  "search.search_or_paste": "Hae tai liitä URL-osoite",
+  "search.search_or_paste": "Hae tai liitä URL-⁠osoite",
   "search_popout.full_text_search_disabled_message": "Ei saatavilla palvelimella {domain}.",
-  "search_popout.full_text_search_logged_out_message": "Käytettävissä vain sisäänkirjautuneena.",
+  "search_popout.full_text_search_logged_out_message": "Saatavilla vain sisäänkirjautuneena.",
   "search_popout.language_code": "ISO-kielikoodi",
   "search_popout.options": "Hakuvalinnat",
   "search_popout.quick_actions": "Pikatoiminnot",
@@ -899,7 +899,7 @@
   "status.direct_indicator": "Yksityismaininta",
   "status.edit": "Muokkaa",
   "status.edited": "Viimeksi muokattu {date}",
-  "status.edited_x_times": "Muokattu {count, plural, one {{count} kerran} other {{count} kertaa}}",
+  "status.edited_x_times": "Muokattu {count, plural, one {{count} kerran} other {{count} kertaa}}",
   "status.embed": "Hanki upotuskoodi",
   "status.favourite": "Suosikki",
   "status.favourites": "{count, plural, one {suosikki} other {suosikkia}}",
@@ -961,10 +961,10 @@
   "status.show_less_all": "Näytä kaikista vähemmän",
   "status.show_more_all": "Näytä kaikista enemmän",
   "status.show_original": "Näytä alkuperäinen",
-  "status.title.with_attachments": "{user} liitti {attachmentCount, plural, one {{attachmentCount} tiedoston} other {{attachmentCount} tiedostoa}}",
+  "status.title.with_attachments": "{user} julkaisi {attachmentCount, plural, one {liitteen} other {{attachmentCount} liitettä}}",
   "status.translate": "Käännä",
-  "status.translated_from_with": "Käännetty kielestä {lang} käyttäen palvelua {provider}",
-  "status.uncached_media_warning": "Esikatselu ei ole käytettävissä",
+  "status.translated_from_with": "Käännetty kielestä {lang} palvelulla {provider}",
+  "status.uncached_media_warning": "Esikatselu ei saatavilla",
   "status.unmute_conversation": "Kumoa keskustelun mykistys",
   "status.unpin": "Irrota profiilista",
   "subscribed_languages.lead": "Vain valituilla kielillä kirjoitetut julkaisut näkyvät koti- ja lista-aikajanoillasi muutoksen jälkeen. Älä valitse mitään, jos haluat nähdä julkaisuja kaikilla kielillä.",
@@ -978,17 +978,17 @@
   "terms_of_service.effective_as_of": "Tulee voimaan {date}",
   "terms_of_service.title": "Käyttöehdot",
   "terms_of_service.upcoming_changes_on": "Tulevia muutoksia {date}",
-  "time_remaining.days": "{number, plural, one {# päivä} other {# päivää}} jäljellä",
-  "time_remaining.hours": "{number, plural, one {# tunti} other {# tuntia}} jäljellä",
-  "time_remaining.minutes": "{number, plural, one {# minuutti} other {# minuuttia}} jäljellä",
+  "time_remaining.days": "{number, plural, one {# päivä} other {# päivää}} jäljellä",
+  "time_remaining.hours": "{number, plural, one {# tunti} other {# tuntia}} jäljellä",
+  "time_remaining.minutes": "{number, plural, one {# minuutti} other {# minuuttia}} jäljellä",
   "time_remaining.moments": "Hetkiä jäljellä",
-  "time_remaining.seconds": "{number, plural, one {# sekunti} other {# sekuntia}} jäljellä",
+  "time_remaining.seconds": "{number, plural, one {# sekunti} other {# sekuntia}} jäljellä",
   "trends.counter_by_accounts": "{count, plural, one {{counter} käyttäjä} other {{counter} käyttäjää}} {days, plural, one {viime päivänä} other {viimeisenä {days} päivänä}}",
   "trends.trending_now": "Suosittua nyt",
   "ui.beforeunload": "Luonnos häviää, jos poistut Mastodonista.",
-  "units.short.billion": "{count} mrd.",
-  "units.short.million": "{count} milj.",
-  "units.short.thousand": "{count} t.",
+  "units.short.billion": "{count} mrd.",
+  "units.short.million": "{count} milj.",
+  "units.short.thousand": "{count} t.",
   "upload_area.title": "Lähetä raahaamalla ja pudottamalla tähän",
   "upload_button.label": "Lisää kuvia, video tai äänitiedosto",
   "upload_error.limit": "Tiedostolähetysten rajoitus ylitetty.",

app/javascript/mastodon/locales/fil.json

@@ -1,6 +1,7 @@
 {
   "about.blocks": "Mga pinatimping server",
   "about.contact": "Kontak:",
+  "about.default_locale": "Default",
   "about.disclaimer": "Ang Mastodon ay software na malaya at bukas-na-pinagmulan, at isang tatak-pangkalakal ng Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Hindi makuha ang dahilan",
   "about.domain_blocks.preamble": "Sa kadalasan, hinahayaan ka ng Mastodon na makita ang mga content sa, at makipag-interact sa users ng, ibang servers sa fediverse. Narito ang exceptions na ginawa sa partikular na server na ito.",
@@ -8,6 +9,7 @@
   "about.domain_blocks.silenced.title": "Limitado",
   "about.domain_blocks.suspended.explanation": "Walang data mula sa server na ito ang mapoproseso, maiimbak o maipagpapaplitan. Sa gayon. imposibleng magawa ang interaksiyon o komunikasyon sa ibang users sa server na ito.",
   "about.domain_blocks.suspended.title": "Suspendido",
+  "about.language_label": "Wika",
   "about.not_available": "Hindi available ang impormasyong ito.",
   "about.powered_by": "Decentralisadong social media na pinapagana ng {mastodon}",
   "about.rules": "Mga alituntunin ng server",
@@ -19,21 +21,31 @@
   "account.block_domain": "Hadlangan ang domain na {domain}",
   "account.block_short": "Hadlangan",
   "account.blocked": "Hinadlangan",
+  "account.blocking": "Pagharang",
   "account.cancel_follow_request": "I-kansela ang pagsunod",
   "account.copy": "I-sipi ang kawing sa profile",
   "account.direct": "Palihim banggitin si @{name}",
   "account.disable_notifications": "I-tigil ang pagpapaalam sa akin tuwing nagpopost si @{name}",
+  "account.domain_blocking": "Pag-block ng domain",
   "account.edit_profile": "Baguhin ang profile",
+  "account.edit_profile_short": "I-edit",
   "account.enable_notifications": "Ipaalam sa akin kapag nag-post si @{name}",
   "account.endorse": "I-tampok sa profile",
   "account.familiar_followers_many": "Sinusundan nina {name1}, {name2}, at {othersCount, plural, one {# iba pa na kilala mo} other {# na iba pa na kilala mo}}",
   "account.familiar_followers_one": "Sinusindan ni/ng {name1}",
   "account.familiar_followers_two": "Sinusindan nina {name1} at {name2}",
   "account.featured": "Itinatampok",
+  "account.featured.accounts": "Mga Profile",
+  "account.featured.hashtags": "Mga Hashtag",
   "account.featured_tags.last_status_at": "Huling post noong {date}",
   "account.featured_tags.last_status_never": "Walang mga post",
   "account.follow": "Sundan",
   "account.follow_back": "Sundan pabalik",
+  "account.follow_back_short": "I-follow back",
+  "account.follow_request": "Humiling na mag-follow",
+  "account.follow_request_cancel": "I-cancel ang request",
+  "account.follow_request_cancel_short": "Cancel",
+  "account.follow_request_short": "Request",
   "account.followers": "Mga tagasunod",
   "account.followers.empty": "Wala pang sumusunod sa tagagamit na ito.",
   "account.followers_counter": "{count, plural, one {{counter} tagasunod} other {{counter} tagasunod}}",
@@ -56,15 +68,29 @@
   "account.mute_notifications_short": "I-mute ang mga abiso",
   "account.mute_short": "I-mute",
   "account.muted": "Naka-mute",
+  "account.muting": "Pag-mute",
+  "account.mutual": "Pina-follow nyo ang isa't-isa",
   "account.no_bio": "Walang nakalaan na paglalarawan.",
   "account.open_original_page": "Buksan ang pinagmulang pahina",
   "account.posts": "Mga post",
+  "account.posts_with_replies": "Mga Post at Reply",
+  "account.remove_from_followers": "Alisin si {name} sa mga follower",
   "account.report": "I-ulat si/ang @{name}",
   "account.requested_follow": "Hinihiling ni {name} na sundan ka",
+  "account.requests_to_follow_you": "Mga Request para i-fillow ka",
   "account.share": "Ibahagi ang profile ni @{name}",
   "account.show_reblogs": "Ipakita ang mga pagpapalakas mula sa/kay {name}",
+  "account.statuses_counter": "{count,plural,one {{counter} i-post} other {{counter} mga post}}",
+  "account.unblock": "I-unblock si @{name}",
+  "account.unblock_domain": "I-unblock ang domain {domain}",
+  "account.unblock_domain_short": "I-unblock",
+  "account.unblock_short": "I-unblock",
   "account.unendorse": "Huwag itampok sa profile",
   "account.unfollow": "Huwag nang sundan",
+  "account.unmute": "I-unmute si @{name}",
+  "account.unmute_notifications_short": "I-unmute ang mga notification",
+  "account.unmute_short": "I-unmute",
+  "account_note.placeholder": "I-click para magdagdag ng note",
   "admin.dashboard.retention.cohort_size": "Mga bagong tagagamit",
   "alert.rate_limited.message": "Mangyaring subukan muli pagkatapos ng {retry_time, time, medium}.",
   "audio.hide": "Itago ang tunog",

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

@@ -23,7 +23,7 @@
   "account.blocked": "Bloqué·e",
   "account.blocking": "Bloqué",
   "account.cancel_follow_request": "Retirer cette demande d'abonnement",
-  "account.copy": "Copier le lien vers le profil",
+  "account.copy": "Copier le lien du profil",
   "account.direct": "Mention privée @{name}",
   "account.disable_notifications": "Ne plus me notifier quand @{name} publie",
   "account.domain_blocking": "Domaine bloqué",
@@ -45,7 +45,7 @@
   "account.follow_request": "Demande d’abonnement",
   "account.follow_request_cancel": "Annuler la demande",
   "account.follow_request_cancel_short": "Annuler",
-  "account.follow_request_short": "Requête",
+  "account.follow_request_short": "Demander à suivre",
   "account.followers": "abonné·e·s",
   "account.followers.empty": "Personne ne suit ce compte pour l'instant.",
   "account.followers_counter": "{count, plural, one {{counter} abonné·e} other {{counter} abonné·e·s}}",
@@ -527,7 +527,7 @@
   "limited_account_hint.action": "Afficher le profil quand même",
   "limited_account_hint.title": "Ce profil a été masqué par la modération de {domain}.",
   "link_preview.author": "Par {name}",
-  "link_preview.more_from_author": "Plus via {name}",
+  "link_preview.more_from_author": "Voir plus de {name}",
   "link_preview.shares": "{count, plural, one {{counter} message} other {{counter} messages}}",
   "lists.add_member": "Ajouter",
   "lists.add_to_list": "Ajouter à la liste",
@@ -565,7 +565,7 @@
   "mute_modal.they_can_mention_and_follow": "Ils peuvent vous mentionner et vous suivre, mais vous ne les verrez pas.",
   "mute_modal.they_wont_know": "Ils ne sauront pas qu'ils ont été rendus silencieux.",
   "mute_modal.title": "Rendre cet utilisateur silencieux ?",
-  "mute_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.",
+  "mute_modal.you_wont_see_mentions": "Vous ne verrez pas les messages qui le mentionne.",
   "mute_modal.you_wont_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.",
   "navigation_bar.about": "À propos",
   "navigation_bar.account_settings": "Mot de passe et sécurité",
@@ -618,7 +618,7 @@
   "notification.follow_request.name_and_others": "{name} et {count, plural, one {# autre} other {# autres}} ont demandé à vous suivre",
   "notification.label.mention": "Mention",
   "notification.label.private_mention": "Mention privée",
-  "notification.label.private_reply": "Répondre en privé",
+  "notification.label.private_reply": "Réponse privée",
   "notification.label.quote": "{name} a cité votre publication",
   "notification.label.reply": "Réponse",
   "notification.mention": "Mention",
@@ -758,7 +758,7 @@
   "privacy.quote.disabled": "{visibility}, citations désactivées",
   "privacy.quote.limited": "{visibility}, citations limitées",
   "privacy.unlisted.additional": "Se comporte exactement comme « public », sauf que le message n'apparaîtra pas dans les flux en direct, les hashtags, explorer ou la recherche Mastodon, même si vous les avez activé au niveau de votre compte.",
-  "privacy.unlisted.long": "Caché des résultats de recherche de Mastodon, aux tendances et aux échéanciers publics",
+  "privacy.unlisted.long": "Caché des résultats de recherche de Mastodon, des tendances et des fils publics",
   "privacy.unlisted.short": "Public discret",
   "privacy_policy.last_updated": "Dernière mise à jour {date}",
   "privacy_policy.title": "Politique de confidentialité",
@@ -886,7 +886,7 @@
   "status.contains_quote": "Contient la citation",
   "status.context.loading": "Chargement de réponses supplémentaires",
   "status.context.loading_error": "Impossible de charger les nouvelles réponses",
-  "status.context.loading_success": "Nouvelles réponses ont été chargées",
+  "status.context.loading_success": "De nouvelles réponses ont été chargées",
   "status.context.more_replies_found": "Plus de réponses trouvées",
   "status.context.retry": "Réessayer",
   "status.context.show": "Montrer",
@@ -1025,8 +1025,8 @@
   "visibility_modal.helper.privacy_editing": "La visibilité ne peut pas être modifiée après la publication d'un message.",
   "visibility_modal.helper.privacy_private_self_quote": "Les auto-citations de messages privés ne peuvent pas être rendues publiques.",
   "visibility_modal.helper.private_quoting": "Les posts accessible uniquement par les followers sur Mastodon ne peuvent être cités par d'autres personnes.",
-  "visibility_modal.helper.unlisted_quoting": "Lorsque les gens vous citent, leur message sera également caché dans les calendriers tendances.",
-  "visibility_modal.instructions": "Contrôlez qui peut interagir avec ce post. Vous pouvez également appliquer ces paramètres à tous les futurs messages en allant dans <link>Préférences > Valeurs par d'éfaut de publication</link>.",
+  "visibility_modal.helper.unlisted_quoting": "Lorsque les gens vous citent, leur message sera également caché des fils tendances.",
+  "visibility_modal.instructions": "Contrôlez qui peut interagir avec ce post. Vous pouvez également appliquer ces paramètres à tous les futurs messages en allant dans <link>Préférences > Valeurs par défaut de publication</link>.",
   "visibility_modal.privacy_label": "Visibilité",
   "visibility_modal.quote_followers": "Abonné·e·s seulement",
   "visibility_modal.quote_label": "Autoriser les citations pour",

app/javascript/mastodon/locales/fr.json

@@ -4,7 +4,7 @@
   "about.default_locale": "Défaut",
   "about.disclaimer": "Mastodon est un logiciel libre, open-source et une marque déposée de Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Raison non disponible",
-  "about.domain_blocks.preamble": "Mastodon vous permet généralement de visualiser le contenu et d'interagir avec les utilisateur⋅rices de n'importe quel autre serveur dans le fédivers. Voici les exceptions qui ont été faites sur ce serveur-là.",
+  "about.domain_blocks.preamble": "Mastodon vous permet généralement de visualiser le contenu et d'interagir avec les utilisateurs et utilisatrices de n'importe quel autre serveur dans le fédivers. Voici les exceptions qui ont été faites sur ce serveur.",
   "about.domain_blocks.silenced.explanation": "Vous ne verrez généralement pas les profils et le contenu de ce serveur, à moins que vous ne les recherchiez explicitement ou que vous ne choisissiez de les suivre.",
   "about.domain_blocks.silenced.title": "Limité",
   "about.domain_blocks.suspended.explanation": "Aucune donnée de ce serveur ne sera traitée, enregistrée ou échangée, rendant impossible toute interaction ou communication avec les comptes de ce serveur.",
@@ -23,7 +23,7 @@
   "account.blocked": "Bloqué·e",
   "account.blocking": "Bloqué",
   "account.cancel_follow_request": "Annuler l'abonnement",
-  "account.copy": "Copier le lien vers le profil",
+  "account.copy": "Copier le lien du profil",
   "account.direct": "Mention privée @{name}",
   "account.disable_notifications": "Ne plus me notifier quand @{name} publie quelque chose",
   "account.domain_blocking": "Domaine bloqué",
@@ -45,7 +45,7 @@
   "account.follow_request": "Demande d’abonnement",
   "account.follow_request_cancel": "Annuler la demande",
   "account.follow_request_cancel_short": "Annuler",
-  "account.follow_request_short": "Requête",
+  "account.follow_request_short": "Demander à suivre",
   "account.followers": "Abonné·e·s",
   "account.followers.empty": "Personne ne suit cet·te utilisateur·rice pour l’instant.",
   "account.followers_counter": "{count, plural, one {{counter} abonné·e} other {{counter} abonné·e·s}}",
@@ -363,7 +363,7 @@
   "errors.unexpected_crash.report_issue": "Signaler le problème",
   "explore.suggested_follows": "Personnes",
   "explore.title": "Tendances",
-  "explore.trending_links": "Nouvelles",
+  "explore.trending_links": "Actualités",
   "explore.trending_statuses": "Messages",
   "explore.trending_tags": "Hashtags",
   "featured_carousel.header": "{count, plural, one {Pinned Post} other {Pinned Posts}}",
@@ -527,7 +527,7 @@
   "limited_account_hint.action": "Afficher le profil quand même",
   "limited_account_hint.title": "Ce profil a été masqué par la modération de {domain}.",
   "link_preview.author": "Par {name}",
-  "link_preview.more_from_author": "Plus via {name}",
+  "link_preview.more_from_author": "Voir plus de {name}",
   "link_preview.shares": "{count, plural, one {{counter} message} other {{counter} messages}}",
   "lists.add_member": "Ajouter",
   "lists.add_to_list": "Ajouter à la liste",
@@ -565,7 +565,7 @@
   "mute_modal.they_can_mention_and_follow": "Ils peuvent vous mentionner et vous suivre, mais vous ne les verrez pas.",
   "mute_modal.they_wont_know": "Ils ne sauront pas qu'ils ont été rendus silencieux.",
   "mute_modal.title": "Rendre cet utilisateur silencieux ?",
-  "mute_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.",
+  "mute_modal.you_wont_see_mentions": "Vous ne verrez pas les messages qui le mentionne.",
   "mute_modal.you_wont_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.",
   "navigation_bar.about": "À propos",
   "navigation_bar.account_settings": "Mot de passe et sécurité",
@@ -618,7 +618,7 @@
   "notification.follow_request.name_and_others": "{name} et {count, plural, one {# autre} other {# autres}} ont demandé à vous suivre",
   "notification.label.mention": "Mention",
   "notification.label.private_mention": "Mention privée",
-  "notification.label.private_reply": "Répondre en privé",
+  "notification.label.private_reply": "Réponse privée",
   "notification.label.quote": "{name} a cité votre publication",
   "notification.label.reply": "Réponse",
   "notification.mention": "Mention",
@@ -758,7 +758,7 @@
   "privacy.quote.disabled": "{visibility}, citations désactivées",
   "privacy.quote.limited": "{visibility}, citations limitées",
   "privacy.unlisted.additional": "Se comporte exactement comme « public », sauf que le message n'apparaîtra pas dans les flux en direct, les hashtags, explorer ou la recherche Mastodon, même si vous les avez activé au niveau de votre compte.",
-  "privacy.unlisted.long": "Caché des résultats de recherche de Mastodon, aux tendances et aux échéanciers publics",
+  "privacy.unlisted.long": "Caché des résultats de recherche de Mastodon, des tendances et des fils publics",
   "privacy.unlisted.short": "Public discret",
   "privacy_policy.last_updated": "Dernière mise à jour {date}",
   "privacy_policy.title": "Politique de confidentialité",
@@ -810,7 +810,7 @@
   "report.reasons.dislike": "Cela ne me plaît pas",
   "report.reasons.dislike_description": "Ce n'est pas quelque chose que vous voulez voir",
   "report.reasons.legal": "C'est illégal",
-  "report.reasons.legal_description": "Vous pensez que cela viole la loi de votre pays ou celui du serveur",
+  "report.reasons.legal_description": "Vous pensez que cela viole la loi de votre pays ou de celui du serveur",
   "report.reasons.other": "Pour une autre raison",
   "report.reasons.other_description": "Le problème ne correspond pas aux autres catégories",
   "report.reasons.spam": "C'est du spam",
@@ -886,7 +886,7 @@
   "status.contains_quote": "Contient la citation",
   "status.context.loading": "Chargement de réponses supplémentaires",
   "status.context.loading_error": "Impossible de charger les nouvelles réponses",
-  "status.context.loading_success": "Nouvelles réponses ont été chargées",
+  "status.context.loading_success": "De nouvelles réponses ont été chargées",
   "status.context.more_replies_found": "Plus de réponses trouvées",
   "status.context.retry": "Réessayer",
   "status.context.show": "Montrer",
@@ -1025,8 +1025,8 @@
   "visibility_modal.helper.privacy_editing": "La visibilité ne peut pas être modifiée après la publication d'un message.",
   "visibility_modal.helper.privacy_private_self_quote": "Les auto-citations de messages privés ne peuvent pas être rendues publiques.",
   "visibility_modal.helper.private_quoting": "Les posts accessible uniquement par les followers sur Mastodon ne peuvent être cités par d'autres personnes.",
-  "visibility_modal.helper.unlisted_quoting": "Lorsque les gens vous citent, leur message sera également caché dans les calendriers tendances.",
-  "visibility_modal.instructions": "Contrôlez qui peut interagir avec ce post. Vous pouvez également appliquer ces paramètres à tous les futurs messages en allant dans <link>Préférences > Valeurs par d'éfaut de publication</link>.",
+  "visibility_modal.helper.unlisted_quoting": "Lorsque les gens vous citent, leur message sera également caché des fils tendances.",
+  "visibility_modal.instructions": "Contrôlez qui peut interagir avec ce post. Vous pouvez également appliquer ces paramètres à tous les futurs messages en allant dans <link>Préférences > Valeurs par défaut de publication</link>.",
   "visibility_modal.privacy_label": "Visibilité",
   "visibility_modal.quote_followers": "Abonné·e·s seulement",
   "visibility_modal.quote_label": "Autoriser les citations pour",

app/javascript/mastodon/locales/ga.json

@@ -1,10 +1,10 @@
 {
-  "about.blocks": "Freastalaithe faoi stiúir",
+  "about.blocks": "Freastalaithe modhnaithe",
   "about.contact": "Teagmháil:",
   "about.default_locale": "Réamhshocrú",
   "about.disclaimer": "Bogearra foinse oscailte saor in aisce is ea Mastodon, agus is le Mastodon gGmbH an trádmharc.",
-  "about.domain_blocks.no_reason_available": "Níl an fáth ar fáil",
-  "about.domain_blocks.preamble": "Go hiondúil, tugann Mastadán cead duit a bheith ag plé le húsáideoirí as freastalaí ar bith eile sa chomhchruinne agus a gcuid inneachair a fheiceáil. Seo iad na heisceachtaí a rinneadh ar an bhfreastalaí áirithe seo.",
+  "about.domain_blocks.no_reason_available": "Cúis nach bhfuil ar fáil",
+  "about.domain_blocks.preamble": "Go ginearálta, tugann Mastodon deis duit ábhar a fheiceáil ó aon fhreastalaí eile sa fediverse agus idirghníomhú leo. Seo iad na heisceachtaí atá déanta ar an bhfreastalaí seo.",
   "about.domain_blocks.silenced.explanation": "Go hiondúil ní fheicfidh tú próifílí ná inneachar ón bhfreastalaí seo, ach amháin má bhíonn tú á lorg nó má ghlacann tú lena leanúint d'aon ghnó.",
   "about.domain_blocks.silenced.title": "Teoranta",
   "about.domain_blocks.suspended.explanation": "Ní dhéanfar aon sonra ón fhreastalaí seo a phróiseáil, a stóráil ná a mhalartú, rud a fhágann nach féidir aon teagmháil ná aon chumarsáid a dhéanamh le húsáideoirí ón fhreastalaí seo.",
@@ -15,17 +15,17 @@
   "about.rules": "Rialacha an fhreastalaí",
   "account.account_note_header": "Nóta pearsanta",
   "account.add_or_remove_from_list": "Cuir Le nó Bain De na liostaí",
-  "account.badges.bot": "Bota",
+  "account.badges.bot": "Uathoibrithe",
   "account.badges.group": "Grúpa",
-  "account.block": "Déan cosc ar @{name}",
+  "account.block": "Bac @{name}",
   "account.block_domain": "Bac ainm fearainn {domain}",
-  "account.block_short": "Bloc",
+  "account.block_short": "Bac",
   "account.blocked": "Bactha",
   "account.blocking": "Ag Blocáil",
-  "account.cancel_follow_request": "Éirigh as iarratas leanta",
+  "account.cancel_follow_request": "Cealaigh leanúint",
   "account.copy": "Cóipeáil nasc chuig an bpróifíl",
   "account.direct": "Luaigh @{name} go príobháideach",
-  "account.disable_notifications": "Éirigh as ag cuir mé in eol nuair bpostálann @{name}",
+  "account.disable_notifications": "Stop ag cur in iúl dom nuair a dhéanann @{name} postáil",
   "account.domain_blocking": "Fearann a bhlocáil",
   "account.edit_profile": "Cuir an phróifíl in eagar",
   "account.edit_profile_short": "Cuir in Eagar",
@@ -40,7 +40,7 @@
   "account.featured_tags.last_status_at": "Postáil is déanaí ar {date}",
   "account.featured_tags.last_status_never": "Gan aon phoist",
   "account.follow": "Lean",
-  "account.follow_back": "Leanúint ar ais",
+  "account.follow_back": "Lean ar ais",
   "account.follow_back_short": "Lean ar ais",
   "account.follow_request": "Iarratas chun leanúint",
   "account.follow_request_cancel": "Cealaigh an t-iarratas",
@@ -56,7 +56,7 @@
   "account.follows_you": "Leanann tú",
   "account.go_to_profile": "Téigh go dtí próifíl",
   "account.hide_reblogs": "Folaigh moltaí ó @{name}",
-  "account.in_memoriam": "Cuimhneachán.",
+  "account.in_memoriam": "Ón tseanaimsir.",
   "account.joined_short": "Cláraithe",
   "account.languages": "Athraigh teangacha foscríofa",
   "account.link_verified_on": "Seiceáladh úinéireacht an naisc seo ar {date}",

app/javascript/mastodon/locales/gl.json

@@ -750,7 +750,7 @@
   "privacy.change": "Axustar privacidade",
   "privacy.direct.long": "Todas as mencionadas na publicación",
   "privacy.direct.short": "Mención privada",
-  "privacy.private.long": "Só para seguidoras",
+  "privacy.private.long": "Só quen te segue",
   "privacy.private.short": "Seguidoras",
   "privacy.public.long": "Para todas dentro e fóra de Mastodon",
   "privacy.public.short": "Público",
@@ -1030,7 +1030,7 @@
   "visibility_modal.privacy_label": "Visibilidade",
   "visibility_modal.quote_followers": "Só para seguidoras",
   "visibility_modal.quote_label": "Quen pode citar",
-  "visibility_modal.quote_nobody": "Só para min",
+  "visibility_modal.quote_nobody": "Só eu",
   "visibility_modal.quote_public": "Calquera",
   "visibility_modal.save": "Gardar"
 }

app/javascript/mastodon/locales/hi.json

@@ -9,9 +9,11 @@
   "about.domain_blocks.silenced.title": "सीमित",
   "about.domain_blocks.suspended.explanation": "इस सर्वर से कोई डेटा संसाधित, संग्रहीत या आदान-प्रदान नहीं किया जाएगा, जिससे इस सर्वर से उपयोगकर्ताओं के साथ कोई भी बातचीत या संचार असंभव हो जाएगा",
   "about.domain_blocks.suspended.title": "सस्पेंड किआ गया है!",
+  "about.language_label": "भाषा",
   "about.not_available": "यह जानकारी इस सर्वर पर उपलब्ध नहीं कराई गई है।",
   "about.powered_by": "{mastodon} द्वारा संचालित डेसेंट्रलीसेड सोशल मीडिया प्लैटफ़ॉर्म!",
   "about.rules": "सर्वर के नियम",
+  "account.account_note_header": "व्यक्तिगत नोंध",
   "account.add_or_remove_from_list": "सूची में जोड़ें या हटाए",
   "account.badges.bot": "बॉट",
   "account.badges.group": "समूह",
@@ -19,17 +21,31 @@
   "account.block_domain": "{domain} के सारी चीज़े छुपाएं",
   "account.block_short": "ब्लॉक किया गया",
   "account.blocked": "ब्लॉक",
+  "account.blocking": "प्रतिबंधित करना",
   "account.cancel_follow_request": "फॉलो रिक्वेस्ट वापस लें",
   "account.copy": "प्रोफाइल पर लिंक कॉपी करें",
   "account.direct": "निजि तरीके से उल्लेख करे @{name}",
   "account.disable_notifications": "@{name} पोस्ट के लिए मुझे सूचित मत करो",
+  "account.domain_blocking": "डोमेन ब्लॉक करें",
   "account.edit_profile": "प्रोफ़ाइल संपादित करें",
+  "account.edit_profile_short": "संपादित करें",
   "account.enable_notifications": "जब @{name} पोस्ट मौजूद हो सूचित करें",
   "account.endorse": "प्रोफ़ाइल पर दिखाए",
+  "account.familiar_followers_many": "{name1}{name2} और {othersCount, plural, one {एक और जिन्हे आप जानते है} other {# और जिन्हे आप जानते है}}",
+  "account.familiar_followers_one": "{name1} ने अनुसरण किया है",
+  "account.familiar_followers_two": "{name1} और {name2} ने अनुसरण किया है",
+  "account.featured": "प्रचलित",
+  "account.featured.accounts": "प्रोफ़ाइल",
+  "account.featured.hashtags": "हैशटैग्स",
   "account.featured_tags.last_status_at": "{date} का अंतिम पोस्ट",
   "account.featured_tags.last_status_never": "कोई पोस्ट नहीं है",
   "account.follow": "फॉलो करें",
   "account.follow_back": "फॉलो करें",
+  "account.follow_back_short": "वापस अनुसरण करें",
+  "account.follow_request": "अनुसरण करने की बिनती करें",
+  "account.follow_request_cancel": "अनुरोध रद्द करें",
+  "account.follow_request_cancel_short": "रद्द करें",
+  "account.follow_request_short": "अनुरोध करें",
   "account.followers": "फॉलोवर",
   "account.followers.empty": "कोई भी इस यूज़र् को फ़ॉलो नहीं करता है",
   "account.following": "फॉलोइंग",

app/javascript/mastodon/locales/hu.json

@@ -607,7 +607,7 @@
   "notification.admin.sign_up": "{name} regisztrált",
   "notification.admin.sign_up.name_and_others": "{name} és {count, plural, one {# másik} other {# másik}} regisztrált",
   "notification.annual_report.message": "Vár a {year}. év #Wrapstodon jelentése! Fedd fel az éved jelentős eseményeit és emlékezetes pillanatait a Mastodonon!",
-  "notification.annual_report.view": "#Wrapstodon Megtekintése",
+  "notification.annual_report.view": "#Wrapstodon megtekintése",
   "notification.favourite": "{name} kedvencnek jelölte a bejegyzésedet",
   "notification.favourite.name_and_others_with_link": "{name} és <a>{count, plural, one {# másik} other {# másik}}</a> kedvencnek jelölte a bejegyzésedet",
   "notification.favourite_pm": "{name} kedvelte a privát említésedet",

app/javascript/mastodon/locales/ia.json

@@ -918,9 +918,12 @@
   "status.pin": "Fixar sur profilo",
   "status.quote": "Citar",
   "status.quote.cancel": "Cancellar le citation",
+  "status.quote_error.blocked_account_hint.title": "Iste message es celate perque tu ha blocate @{name}.",
+  "status.quote_error.blocked_domain_hint.title": "Iste message es celate perque tu ha blocate {domain}.",
   "status.quote_error.filtered": "Celate a causa de un de tu filtros",
   "status.quote_error.limited_account_hint.action": "Monstrar in omne caso",
   "status.quote_error.limited_account_hint.title": "Iste conto ha essite celate per le moderatores de {domain}.",
+  "status.quote_error.muted_account_hint.title": "Iste message es celate perque tu ha silentiate @{name}.",
   "status.quote_error.not_available": "Message indisponibile",
   "status.quote_error.pending_approval": "Message pendente",
   "status.quote_error.pending_approval_popout.body": "Sur Mastodon, tu pote controlar si on pote citar te. Iste message attende ora le approbation del autor original.",
@@ -1015,6 +1018,7 @@
   "video.volume_down": "Abassar le volumine",
   "video.volume_up": "Augmentar le volumine",
   "visibility_modal.button_title": "Definir visibilitate",
+  "visibility_modal.direct_quote_warning.text": "Si tu salva le parametros actual, le citation incorporate se convertera in un ligamine.",
   "visibility_modal.header": "Visibilitate e interaction",
   "visibility_modal.helper.direct_quoting": "Le mentiones private scribite sur Mastodon non pote esser citate per alteres.",
   "visibility_modal.helper.privacy_editing": "Le visibilitate de un message non pote esser cambiate post su publication.",

app/javascript/mastodon/locales/ja.json

@@ -28,6 +28,7 @@
   "account.disable_notifications": "@{name}さんの投稿時の通知を停止",
   "account.domain_blocking": "ブロックしているドメイン",
   "account.edit_profile": "プロフィール編集",
+  "account.edit_profile_short": "編集",
   "account.enable_notifications": "@{name}さんの投稿時に通知",
   "account.endorse": "プロフィールで紹介する",
   "account.familiar_followers_many": "{name1}、{name2}、他{othersCount, plural, one {one other you know} other {# others you know}}人のユーザーにフォローされています",
@@ -172,6 +173,8 @@
   "column.edit_list": "リストを編集",
   "column.favourites": "お気に入り",
   "column.firehose": "リアルタイムフィード",
+  "column.firehose_local": "このサーバーのリアルタイムフィード",
+  "column.firehose_singular": "リアルタイムフィード",
   "column.follow_requests": "フォローリクエスト",
   "column.home": "ホーム",
   "column.list_members": "リストのメンバーを管理",
@@ -251,6 +254,7 @@
   "confirmations.remove_from_followers.message": "{name}さんはあなたをフォローしなくなります。本当によろしいですか？",
   "confirmations.remove_from_followers.title": "フォロワーを削除しますか？",
   "confirmations.revoke_quote.confirm": "投稿を削除",
+  "confirmations.revoke_quote.message": "この操作は元に戻せません。",
   "confirmations.revoke_quote.title": "投稿を削除しますか?",
   "confirmations.unblock.confirm": "ブロック解除",
   "confirmations.unblock.title": "@{name}さんのブロックを解除しますか？",
@@ -480,6 +484,7 @@
   "keyboard_shortcuts.home": "ホームタイムラインを開く",
   "keyboard_shortcuts.hotkey": "ホットキー",
   "keyboard_shortcuts.legend": "この一覧を表示",
+  "keyboard_shortcuts.load_more": "「もっと見る」ボタンに移動",
   "keyboard_shortcuts.local": "ローカルタイムラインを開く",
   "keyboard_shortcuts.mention": "メンション",
   "keyboard_shortcuts.muted": "ミュートしたユーザーのリストを開く",
@@ -500,6 +505,7 @@
   "keyboard_shortcuts.translate": "投稿を翻訳する",
   "keyboard_shortcuts.unfocus": "投稿の入力欄・検索欄から離れる",
   "keyboard_shortcuts.up": "カラム内一つ上に移動",
+  "learn_more_link.got_it": "了解",
   "learn_more_link.learn_more": "もっと見る",
   "lightbox.close": "閉じる",
   "lightbox.next": "次",
@@ -614,6 +620,7 @@
   "notification.moderation_warning.action_suspend": "あなたのアカウントは停止されました。",
   "notification.own_poll": "アンケートが終了しました",
   "notification.poll": "投票したアンケートが終了しました",
+  "notification.quoted_update": "あなたが引用した投稿を {name} が編集しました",
   "notification.reblog": "{name}さんがあなたの投稿をブーストしました",
   "notification.reblog.name_and_others_with_link": "{name}さんと<a>ほか{count, plural, other {#人}}</a>がブーストしました",
   "notification.relationships_severance_event": "{name} との関係が失われました",
@@ -756,6 +763,7 @@
   "relative_time.minutes": "{number}分前",
   "relative_time.seconds": "{number}秒前",
   "relative_time.today": "今日",
+  "remove_quote_hint.button_label": "了解",
   "reply_indicator.attachments": "{count, plural, other {#件のメディア}}",
   "reply_indicator.cancel": "キャンセル",
   "reply_indicator.poll": "アンケート",
@@ -884,6 +892,7 @@
   "status.quote_error.filtered": "あなたのフィルター設定によって非表示になっています",
   "status.quote_error.pending_approval": "承認待ちの投稿",
   "status.quote_noun": "引用",
+  "status.quote_policy_change": "引用できるユーザーの変更",
   "status.quote_post_author": "{name} の投稿を引用",
   "status.quote_private": "非公開の投稿は引用できません",
   "status.quotes": "{count, plural, other {引用}}",

app/javascript/mastodon/locales/la.json

@@ -189,7 +189,7 @@
   "notification.update": "{name} nuntium correxit",
   "notification_requests.accept": "Accipe",
   "notification_requests.confirm_accept_multiple.message": "Tu es accepturus {count, plural, one {una notitia petitionem} other {# notitia petitiones}}. Certus esne procedere vis?",
-  "notification_requests.confirm_dismiss_multiple.message": "Tu {count, plural, one {unam petitionem notificationis} other {# petitiones notificationum}} abrogāre prōximum es. {count, plural, one {Illa} other {Eae}} facile accessū nōn erit. Certus es tē procedere velle?",
+  "notification_requests.confirm_dismiss_multiple.message": "Tu {count, plural, one {unam petitionem notificationis} other {# petitiones notificationum}} abrogāre prōximum es. {count, plural, one {it} other {Eae}} facile accessū nōn erit. Certus es tē procedere velle?",
   "notifications.filter.all": "Omnia",
   "notifications.filter.polls": "Eventus electionis",
   "notifications.group": "{count} Notificātiōnēs",
@@ -247,20 +247,101 @@
   "status.history.created": "{name} creatum {date}",
   "status.history.edited": "{name} correxit {date}",
   "status.open": "Expand this status",
+  "status.quotes.empty": "Nemo hanc commentationem adhuc citavit. Cum quis citaverit, hic apparebit.",
+  "status.quotes.local_other_disclaimer": "Citationes ab auctore reiec­tæ non monstrabuntur.",
+  "status.quotes.remote_other_disclaimer": "Tantum citae ex {domain} hic exhiberi praestantur. Citae ab auctore reiectae non exhibebuntur.",
+  "status.read_more": "Plura lege",
+  "status.reblog": "Promovere",
+  "status.reblog_or_quote": "Promovere aut cita",
+  "status.reblog_private": "Iterum cum sectatoribus tuis communica",
   "status.reblogged_by": "{name} adiuvavit",
   "status.reblogs": "{count, plural, one {auctus} other {auctūs}}",
+  "status.reblogs.empty": "Nemo hanc publicationem adhuc promovit. Cum quis eam promoveat, hic apparebunt.",
+  "status.redraft": "Dele et redig",
+  "status.remove_bookmark": "Tolle signum",
+  "status.remove_favourite": "Tolle ad delectis",
+  "status.remove_quote": "Tolle",
+  "status.replied_in_thread": "In filo responsum",
+  "status.replied_to": "{name} respondit",
+  "status.reply": "Respondere",
+  "status.replyAll": "Responde ad filum",
+  "status.report": "Referre @{name}",
+  "status.request_quote": "Pretium petere",
+  "status.revoke_quote": "Tolle nuntium meum ex nuntio @{name}",
+  "status.sensitive_warning": "Materia delicata",
+  "status.share": "Communica",
+  "status.show_less_all": "Omnibus minus monstra",
+  "status.show_more_all": "Omnibus plura monstra",
+  "status.show_original": "Monstra originalem",
   "status.title.with_attachments": "{user} publicavit {attachmentCount, plural, one {unum annexum} other {{attachmentCount} annexa}}",
+  "status.translate": "Converte",
+  "status.translated_from_with": "Translatum ex {lang} per {provider}",
+  "status.uncached_media_warning": "Praevisum non praesto est",
+  "status.unmute_conversation": "Conversationem reserare",
+  "subscribed_languages.lead": "Tantum epistolae in linguis selectis in domo tua apparebunt et indices temporum post mutationem. Neminem eligatis qui epistolas in omnibus linguis recipiat.",
+  "subscribed_languages.save": "Servare mutationes",
+  "subscribed_languages.target": "Muta linguas subscriptas pro {target}",
   "tabs_bar.home": "Domi",
+  "tabs_bar.menu": "Elenchus",
+  "tabs_bar.notifications": "Acta Vicimediorum",
+  "tabs_bar.publish": "Nova publicatio",
+  "tabs_bar.search": "Quaere",
+  "terms_of_service.effective_as_of": "Valet ex {date}",
+  "terms_of_service.title": "Termini servitii",
+  "terms_of_service.upcoming_changes_on": "Mutationes venturae die {date}",
   "time_remaining.days": "{number, plural, one {# die} other {# dies}} restant",
   "time_remaining.hours": "{number, plural, one {# hora} other {# horae}} restant",
   "time_remaining.minutes": "{number, plural, one {# minutum} other {# minuta}} restant",
+  "time_remaining.moments": "Momenta reliqua",
   "time_remaining.seconds": "{number, plural, one {# secundum} other {# secunda}} restant",
-  "trends.counter_by_accounts": "{count, plural, one {{counter} persōna} other {{counter} persōnae}} in {days, plural, one {diē prīdiē} other {diēbus praeteritīs {days}}}",
+  "trends.counter_by_accounts": "{count, plural, one {{counter} persōna} other {{counter} persōnae}} in {days, plural, one {days} other {diēbus praeteritīs {days}}}",
+  "trends.trending_now": "Nunc in usu",
   "ui.beforeunload": "Si Mastodon discesseris, tua epitome peribit.",
   "units.short.billion": "{count} millia milionum",
   "units.short.million": "{count} milionum",
   "units.short.thousand": "{count} millia",
-  "upload_button.label": "Imaginēs, vīdeō aut fīle audītūs adde",
+  "upload_area.title": "Trahe et depone ad imponendum",
+  "upload_button.label": "Adde imagines, pelliculam, aut fasciculum sonorum.",
+  "upload_error.limit": "Limes onerationis superatus est.",
+  "upload_error.poll": "Nullis suffragiis licet fascicula imponere.",
+  "upload_error.quote": "Nullum oneramentum fasciculi cum citationibus permittitur.",
+  "upload_form.drag_and_drop.instructions": "Ad annexum mediorum tollendum, preme clavem \"Space\" aut \"Enter\". Dum traheis, utere clavibus sagittariis ad annexum mediorum in quamlibet partem movendum. Preme iterum \"Space\" aut \"Enter\" ad annexum mediorum in novo loco deponendum, aut preme \"Escape\" ad desinendum.",
+  "upload_form.drag_and_drop.on_drag_cancel": "Tractatio revocata est. Adiunctum medium {item} demissum est.",
+  "upload_form.drag_and_drop.on_drag_end": "Adhaesum medium {item} demissum est.",
+  "upload_form.drag_and_drop.on_drag_over": "Adhaesum medium {item} motum est.",
+  "upload_form.drag_and_drop.on_drag_start": "Adhaesum medium {item} sublatum est.",
   "upload_form.edit": "Recolere",
-  "upload_progress.label": "Uploading…"
+  "upload_progress.label": "Oneratur...",
+  "upload_progress.processing": "Processus…",
+  "username.taken": "Illud nomen usoris occupatum est. Aliud tenta.",
+  "video.close": "Pelliculam claude",
+  "video.download": "Prehendere fasciculus",
+  "video.exit_fullscreen": "Exitus ex plenum monitorium",
+  "video.expand": "Expande pelliculam",
+  "video.fullscreen": "Plenum monitorium",
+  "video.hide": "celare pellicula",
+  "video.mute": "Mutus",
+  "video.pause": "intermittere",
+  "video.play": "gignere",
+  "video.skip_backward": "Redire",
+  "video.skip_forward": "Progredi",
+  "video.unmute": "Sordes tollere",
+  "video.volume_down": "Volumen deminui",
+  "video.volume_up": "Volumen augete",
+  "visibility_modal.button_title": "Visibilitatem statuere",
+  "visibility_modal.direct_quote_warning.text": "Si praesentia configuramenta servaveris, sententia inserta in nexum convertetur.",
+  "visibility_modal.direct_quote_warning.title": "Citatio in mentitionibus privatis inseriri non possunt.",
+  "visibility_modal.header": "Visibilitas et interactio",
+  "visibility_modal.helper.direct_quoting": "Mentiones privatae in Mastodon scriptae ab aliis citari non possunt.",
+  "visibility_modal.helper.privacy_editing": "Visibilitas mutari non potest postquam nuntius publicatus est.",
+  "visibility_modal.helper.privacy_private_self_quote": "Citationes propriae nuntiorum privatorum publicari non possunt.",
+  "visibility_modal.helper.private_quoting": "Nuntii in Mastodon a sequacibus tantum scriptī ab aliis citari non possunt.",
+  "visibility_modal.helper.unlisted_quoting": "Cum te citant, eorum scriptum etiam ex indicibus popularibus celabitur.",
+  "visibility_modal.instructions": "Régula quis cum hoc scripto agere possit. Potes etiam ordinationes omnibus scriptis futuris adhibere, navigando ad <link>Praeferentias > Regulas scriptionis praedefinitas</link>.",
+  "visibility_modal.privacy_label": "Visibilitas",
+  "visibility_modal.quote_followers": "Sectatores tantum",
+  "visibility_modal.quote_label": "Quis citare potest",
+  "visibility_modal.quote_nobody": "Sicut me",
+  "visibility_modal.quote_public": "quisquis",
+  "visibility_modal.save": "Servare"
 }

app/javascript/mastodon/locales/lad.json

@@ -31,6 +31,8 @@
   "account.edit_profile_short": "Edita",
   "account.enable_notifications": "Avizame kuando @{name} publike",
   "account.endorse": "Avalia en profil",
+  "account.familiar_followers_one": "Segido por {name1}",
+  "account.familiar_followers_two": "Segido por {name1} i {name2}",
   "account.featured": "Avaliado",
   "account.featured.accounts": "Profiles",
   "account.featured.hashtags": "Etiketas",
@@ -46,6 +48,7 @@
   "account.followers": "Suivantes",
   "account.followers.empty": "Por agora dingun no sige a este utilizador.",
   "account.followers_counter": "{count, plural, one {{counter} suivante} other {{counter} suivantes}}",
+  "account.followers_you_know_counter": "{counter} ke koneses",
   "account.following": "Sigiendo",
   "account.following_counter": "{count, plural, other {Sigiendo a {counter}}}",
   "account.follows.empty": "Este utilizador ainda no sige a dingun.",
@@ -157,6 +160,7 @@
   "column.edit_list": "Edita lista",
   "column.favourites": "Te plazen",
   "column.firehose": "Linyas en bivo",
+  "column.firehose_singular": "Linya en bivo",
   "column.follow_requests": "Solisitudes de segimiento",
   "column.home": "Linya prinsipala",
   "column.lists": "Listas",
@@ -314,6 +318,7 @@
   "featured_carousel.next": "Sigiente",
   "featured_carousel.post": "Puvlikasyon",
   "featured_carousel.previous": "Anterior",
+  "featured_carousel.slide": "{index} de {total}",
   "filter_modal.added.context_mismatch_explanation": "Esta kategoria del filtro no se aplika al konteksto en ke tienes aksesido esta publikasyon. Si keres ke la publikasyon sea filtrada en este konteksto tamyen, kale editar el filtro.",
   "filter_modal.added.context_mismatch_title": "El konteksto no koensida!",
   "filter_modal.added.expired_explanation": "Esta kategoria de filtros tiene kadukado. Kale ke trokar la data de kadukasion para aplikarla.",
@@ -525,6 +530,7 @@
   "notification.label.mention": "Enmenta",
   "notification.label.private_mention": "Enmentadura privada",
   "notification.label.private_reply": "Repuesta privada",
+  "notification.label.quote": "{name} sito tu publikasyon",
   "notification.label.reply": "Arisponde",
   "notification.mention": "Enmenta",
   "notification.mentioned_you": "{name} te enmento",
@@ -763,6 +769,7 @@
   "status.edited_x_times": "Editado {count, plural, one {{count} vez} other {{count} vezes}}",
   "status.embed": "Obtiene kodiche para enkrustar",
   "status.favourite": "Te plaze",
+  "status.favourites": "{count, plural, one {# favorito} other {# favoritos}}",
   "status.filter": "Filtra esta publikasyon",
   "status.history.created": "{name} kriyo {date}",
   "status.history.edited": "{name} edito {date}",
@@ -793,6 +800,7 @@
   "status.reblog": "Repartaja",
   "status.reblog_or_quote": "Repartaja o partaja",
   "status.reblogged_by": "{name} repartajo",
+  "status.reblogs": "{count, plural, one {repartajamyento} other {repartajamyentos}}",
   "status.reblogs.empty": "Ainda nadie tiene repartajado esta publikasyon. Kuando algien lo aga, se amostrara aki.",
   "status.redraft": "Efasa i eskrive de muevo",
   "status.remove_bookmark": "Kita markador",

app/javascript/mastodon/locales/lt.json

@@ -1,6 +1,7 @@
 {
   "about.blocks": "Prižiūrimi serveriai",
   "about.contact": "Kontaktai:",
+  "about.default_locale": "Numatyta",
   "about.disclaimer": "„Mastodon“ – tai nemokama atvirojo kodo programinė įranga ir „Mastodon gGmbH“ prekės ženklas.",
   "about.domain_blocks.no_reason_available": "Priežastis nepateikta",
   "about.domain_blocks.preamble": "„Mastodon“ paprastai leidžia peržiūrėti turinį ir bendrauti su naudotojais iš bet kurio kito fediverse esančio serverio. Šios yra išimtys, kurios buvo padarytos šiame konkrečiame serveryje.",
@@ -8,11 +9,12 @@
   "about.domain_blocks.silenced.title": "Apribota",
   "about.domain_blocks.suspended.explanation": "Jokie duomenys iš šio serverio nebus apdorojami, saugomi ar keičiami, todėl bet kokia sąveika ar bendravimas su šio serverio naudotojais bus neįmanomas.",
   "about.domain_blocks.suspended.title": "Pristabdyta",
+  "about.language_label": "Kalba",
   "about.not_available": "Ši informacija nebuvo pateikta šiame serveryje.",
   "about.powered_by": "Decentralizuota socialinė medija, veikianti pagal „{mastodon}“",
   "about.rules": "Serverio taisyklės",
   "account.account_note_header": "Asmeninė pastaba",
-  "account.add_or_remove_from_list": "Pridėti arba pašalinti iš sąrašų",
+  "account.add_or_remove_from_list": "Įtraukti arba šalinti iš sąrašų",
   "account.badges.bot": "Automatizuotas",
   "account.badges.group": "Grupė",
   "account.block": "Blokuoti @{name}",
@@ -26,20 +28,30 @@
   "account.disable_notifications": "Nustoti man pranešti, kai @{name} paskelbia",
   "account.domain_blocking": "Blokuoti domeną",
   "account.edit_profile": "Redaguoti profilį",
+  "account.edit_profile_short": "Redaguoti",
   "account.enable_notifications": "Pranešti man, kai @{name} paskelbia",
   "account.endorse": "Rodyti profilyje",
+  "account.familiar_followers_many": "Sekama {name1}, {name2}, ir {othersCount, plural, one {dar vieno} few {# dar keleto} many {# dar kelių} other {# kitų pažystąmų}}",
+  "account.familiar_followers_one": "Seka {name1}",
+  "account.familiar_followers_two": "{name1} ir {name2} seka",
   "account.featured": "Rodomi",
   "account.featured.accounts": "Profiliai",
-  "account.featured.hashtags": "Saitažodžiai",
+  "account.featured.hashtags": "Grotažymės",
   "account.featured_tags.last_status_at": "Paskutinis įrašas {date}",
   "account.featured_tags.last_status_never": "Nėra įrašų",
   "account.follow": "Sekti",
   "account.follow_back": "Sekti atgal",
+  "account.follow_back_short": "Sekti atgal",
+  "account.follow_request": "Prašyti sekti",
+  "account.follow_request_cancel": "Atšaukti prašymą",
+  "account.follow_request_cancel_short": "Atšaukti",
+  "account.follow_request_short": "Prašymas",
   "account.followers": "Sekėjai",
   "account.followers.empty": "Šio naudotojo dar niekas neseka.",
   "account.followers_counter": "{count, plural, one {{counter} sekėjas} few {{counter} sekėjai} many {{counter} sekėjo} other {{counter} sekėjų}}",
+  "account.followers_you_know_counter": "{counter} žinomas",
   "account.following": "Sekama",
-  "account.following_counter": "{count, plural, one {{counter} sekimas} few {{counter} sekimai} many {{counter} sekimo} other {{counter} sekimų}}",
+  "account.following_counter": "{count, plural, one {{counter} seka} few {{counter} seka} many {{counter} seka} other {{counter} seka}}",
   "account.follows.empty": "Šis naudotojas dar nieko neseka.",
   "account.follows_you": "Seka tave",
   "account.go_to_profile": "Eiti į profilį",
@@ -114,7 +126,7 @@
   "annual_report.summary.highlighted_post.by_replies": "įrašas su daugiausiai atsakymų",
   "annual_report.summary.highlighted_post.possessive": "{name}",
   "annual_report.summary.most_used_app.most_used_app": "labiausiai naudota programa",
-  "annual_report.summary.most_used_hashtag.most_used_hashtag": "labiausiai naudotas saitažodis",
+  "annual_report.summary.most_used_hashtag.most_used_hashtag": "labiausiai naudota grotažymė",
   "annual_report.summary.most_used_hashtag.none": "Nieko",
   "annual_report.summary.new_posts.new_posts": "nauji įrašai",
   "annual_report.summary.percentile.text": "<topLabel>Tai reiškia, kad esate tarp</topLabel><percentage></percentage><bottomLabel>populiariausių {domain} naudotojų.</bottomLabel>",
@@ -161,6 +173,8 @@
   "column.edit_list": "Redaguoti sąrašą",
   "column.favourites": "Mėgstami",
   "column.firehose": "Tiesioginiai srautai",
+  "column.firehose_local": "Tiesioginis srautas iš šio serverio",
+  "column.firehose_singular": "Tiesioginis srautas",
   "column.follow_requests": "Sekimo prašymai",
   "column.home": "Pagrindinis",
   "column.list_members": "Tvarkyti sąrašo narius",
@@ -180,6 +194,7 @@
   "community.column_settings.local_only": "Tik vietinis",
   "community.column_settings.media_only": "Tik medija",
   "community.column_settings.remote_only": "Tik nuotolinis",
+  "compose.error.blank_post": "Įrašas negali būti tuščias.",
   "compose.language.change": "Keisti kalbą",
   "compose.language.search": "Ieškoti kalbų...",
   "compose.published.body": "Įrašas paskelbtas.",
@@ -187,7 +202,7 @@
   "compose.saved.body": "Įrašas išsaugotas.",
   "compose_form.direct_message_warning_learn_more": "Sužinoti daugiau",
   "compose_form.encryption_warning": "„Mastodon“ įrašai nėra visapusiškai šifruojami. Per „Mastodon“ nesidalyk jokia slapta informacija.",
-  "compose_form.hashtag_warning": "Šis įrašas nebus įtrauktas į jokį saitažodį, nes ji nėra vieša. Tik viešų įrašų galima ieškoti pagal saitažodį.",
+  "compose_form.hashtag_warning": "Šis įrašas nebus įtrauktas į jokį grotažodį, nes jis nėra viešas. Tik vieši įrašai gali būti ieškomi pagal grotažymę.",
   "compose_form.lock_disclaimer": "Tavo paskyra nėra {locked}. Bet kas gali sekti tave ir peržiūrėti tik sekėjams skirtus įrašus.",
   "compose_form.lock_disclaimer.lock": "užrakinta",
   "compose_form.placeholder": "Kas tavo mintyse?",
@@ -212,6 +227,13 @@
   "confirmations.delete_list.confirm": "Ištrinti",
   "confirmations.delete_list.message": "Ar tikrai nori negrįžtamai ištrinti šį sąrašą?",
   "confirmations.delete_list.title": "Ištrinti sąrašą?",
+  "confirmations.discard_draft.confirm": "Išsaugoti ir tęsti",
+  "confirmations.discard_draft.edit.cancel": "Tęsti redagavimą",
+  "confirmations.discard_draft.edit.message": "Tęsdami, jūs prarasite visus pakeitimus, kuriuos padarėte šiuo metu redaguojamame įraše.",
+  "confirmations.discard_draft.edit.title": "Atmesti pakeitimus savo įraše?",
+  "confirmations.discard_draft.post.cancel": "Tęsti juodraščio redagavimą",
+  "confirmations.discard_draft.post.message": "Tęsdami ištrinsite šiuo metu kuriamą įrašą.",
+  "confirmations.discard_draft.post.title": "Atmesti savo įrašo juodraštį?",
   "confirmations.discard_edit_media.confirm": "Atmesti",
   "confirmations.discard_edit_media.message": "Turi neišsaugotų medijos aprašymo ar peržiūros pakeitimų. Vis tiek juos atmesti?",
   "confirmations.follow_to_list.confirm": "Sekti ir pridėti prie sąrašo",
@@ -225,13 +247,30 @@
   "confirmations.missing_alt_text.secondary": "Siųsti vis tiek",
   "confirmations.missing_alt_text.title": "Pridėti alternatyvųjį tekstą?",
   "confirmations.mute.confirm": "Nutildyti",
+  "confirmations.private_quote_notify.cancel": "Grįžti prie redagavimo",
+  "confirmations.private_quote_notify.confirm": "Paskelbti įrašą",
+  "confirmations.private_quote_notify.do_not_show_again": "Neberodyti šio pranešimo dar kartą",
+  "confirmations.private_quote_notify.message": "Asmuo, kurį paminite, ir kiti paminėti asmenys bus informuoti ir galės peržiūrėti jūsų įrašą, net jei jie neseka jūsų.",
+  "confirmations.private_quote_notify.title": "Dalytis su sekėjais ir paminėtais vartotojais?",
+  "confirmations.quiet_post_quote_info.dismiss": "Daugiau man nepriminti",
+  "confirmations.quiet_post_quote_info.got_it": "Supratau",
+  "confirmations.quiet_post_quote_info.message": "Kai norite paminėti tylų viešą įrašą, jūsų įrašas bus paslėptas Tendencijų sąrašuose.",
+  "confirmations.quiet_post_quote_info.title": "Kai paminite tylius viešus įrašus",
   "confirmations.redraft.confirm": "Ištrinti ir iš naujo parengti",
   "confirmations.redraft.message": "Ar tikrai nori ištrinti šį įrašą ir parengti jį iš naujo? Bus prarasti mėgstami ir pasidalinimai, o atsakymai į originalų įrašą bus panaikinti.",
   "confirmations.redraft.title": "Ištrinti ir iš naujo parengti įrašą?",
   "confirmations.remove_from_followers.confirm": "Šalinti sekėją",
   "confirmations.remove_from_followers.message": "{name} nustos jus sekti. Ar tikrai norite tęsti?",
   "confirmations.remove_from_followers.title": "Šalinti sekėją?",
+  "confirmations.revoke_quote.confirm": "Pašalinti įrašą",
+  "confirmations.revoke_quote.message": "Šio veiksmo negalima anuliuoti.",
+  "confirmations.revoke_quote.title": "Pašalinti įrašą?",
+  "confirmations.unblock.confirm": "Atblokuoti",
+  "confirmations.unblock.title": "Atblokuoti {name}?",
   "confirmations.unfollow.confirm": "Nebesekti",
+  "confirmations.unfollow.title": "Nebesekti {name}?",
+  "confirmations.withdraw_request.confirm": "Atšaukti prašymą",
+  "confirmations.withdraw_request.title": "Atšaukti prašymą sekti {name}?",
   "content_warning.hide": "Slėpti įrašą",
   "content_warning.show": "Rodyti vis tiek",
   "content_warning.show_more": "Rodyti daugiau",
@@ -250,6 +289,7 @@
   "disabled_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu išjungta.",
   "dismissable_banner.community_timeline": "Tai – naujausi vieši įrašai iš žmonių, kurių paskyros talpinamos {domain}.",
   "dismissable_banner.dismiss": "Atmesti",
+  "dismissable_banner.public_timeline": "Tai yra naujausi vieši įrašai iš fediverse, kuriuos seka {domain} vartotojai.",
   "domain_block_modal.block": "Blokuoti serverį",
   "domain_block_modal.block_account_instead": "Blokuoti @{name} vietoj to",
   "domain_block_modal.they_can_interact_with_old_posts": "Žmonės iš šio serverio gali bendrauti su tavo senomis įrašomis.",
@@ -272,6 +312,7 @@
   "domain_pill.your_handle": "Tavo socialinis medijos vardas:",
   "domain_pill.your_server": "Tavo skaitmeniniai namai, kuriuose saugomi visi tavo įrašai. Nepatinka šis? Bet kada perkelk serverius ir atsivesk ir savo sekėjus.",
   "domain_pill.your_username": "Tavo unikalus identifikatorius šiame serveryje. Skirtinguose serveriuose galima rasti naudotojų su tuo pačiu naudotojo vardu.",
+  "dropdown.empty": "Pasirinkite variantą",
   "embed.instructions": "Įterpk šį įrašą į savo svetainę nukopijuojant toliau pateiktą kodą.",
   "embed.preview": "Štai kaip tai atrodys:",
   "emoji_button.activity": "Veikla",
@@ -289,24 +330,27 @@
   "emoji_button.search_results": "Paieškos rezultatai",
   "emoji_button.symbols": "Simboliai",
   "emoji_button.travel": "Kelionės ir vietos",
+  "empty_column.account_featured.me": "Jūs dar nieko neparyškinote. Ar žinojote, kad savo profilyje galite parodyti dažniausiai naudojamas grotažymes ir netgi savo draugų paskyras?",
+  "empty_column.account_featured.other": "{acct} dar nieko neparyškino. Ar žinojote, kad savo profilyje galite pateikti dažniausiai naudojamus grotžymes ir netgi savo draugų paskyras?",
   "empty_column.account_featured_other.unknown": "Ši paskyra dar nieko neparodė.",
   "empty_column.account_hides_collections": "Šis (-i) naudotojas (-a) pasirinko nepadaryti šią informaciją prieinamą.",
   "empty_column.account_suspended": "Paskyra pristabdyta.",
   "empty_column.account_timeline": "Nėra čia įrašų.",
   "empty_column.account_unavailable": "Profilis neprieinamas.",
   "empty_column.blocks": "Dar neužblokavai nė vieno naudotojo.",
-  "empty_column.bookmarked_statuses": "Dar neturi nė vienos įrašo pridėtos žymės. Kai vieną iš jų pridėsi į žymes, jis bus rodomas čia.",
+  "empty_column.bookmarked_statuses": "Dar neturi nė vienos įrašo su žyma. Kai vieną žymų pridėsi prie įrašo, jis bus rodomas čia.",
   "empty_column.community": "Vietinė laiko skalė yra tuščia. Parašyk ką nors viešai, kad pradėtum sąveikauti.",
   "empty_column.direct": "Dar neturi jokių privačių paminėjimų. Kai išsiųsi arba gausi vieną iš jų, jis bus rodomas čia.",
+  "empty_column.disabled_feed": "Šis srautas buvo išjungtas jūsų serverio administratorių.",
   "empty_column.domain_blocks": "Kol kas nėra užblokuotų serverių.",
   "empty_column.explore_statuses": "Šiuo metu niekas nėra tendencinga. Patikrinkite vėliau!",
   "empty_column.favourited_statuses": "Dar neturi mėgstamų įrašų. Kai vieną iš jų pamėgsi, jis bus rodomas čia.",
   "empty_column.favourites": "Šio įrašo dar niekas nepamėgo. Kai kas nors tai padarys, jie bus rodomi čia.",
   "empty_column.follow_requests": "Dar neturi jokių sekimo prašymų. Kai gausi tokį prašymą, jis bus rodomas čia.",
-  "empty_column.followed_tags": "Dar neseki jokių saitažodžių. Kai tai padarysi, jie bus rodomi čia.",
-  "empty_column.hashtag": "Nėra nieko šiame saitažodyje kol kas.",
+  "empty_column.followed_tags": "Dar neseki jokių grotažymių. Kai tai padarysi, jos bus rodomos čia.",
+  "empty_column.hashtag": "Šioje gratažymėje kol kas nieko nėra.",
   "empty_column.home": "Tavo pagrindinio laiko skalė tuščia. Sek daugiau žmonių, kad ją užpildytum.",
-  "empty_column.list": "Nėra nieko šiame sąraše kol kas. Kai šio sąrašo nariai paskelbs naujų įrašų, jie bus rodomi čia.",
+  "empty_column.list": "Šiame sąraše dar nieko nėra. Kai šio sąrašo nariai paskelbs naujus įrašus, jie bus rodomi čia.",
   "empty_column.mutes": "Dar nesi nutildęs (-usi) nė vieno naudotojo.",
   "empty_column.notification_requests": "Viskas švaru! Čia nieko nėra. Kai gausi naujų pranešimų, jie bus rodomi čia pagal tavo nustatymus.",
   "empty_column.notifications": "Dar neturi jokių pranešimų. Kai kiti žmonės su tavimi sąveikaus, matysi tai čia.",
@@ -318,9 +362,11 @@
   "errors.unexpected_crash.copy_stacktrace": "Kopijuoti dėklo eigą į iškarpinę",
   "errors.unexpected_crash.report_issue": "Pranešti apie problemą",
   "explore.suggested_follows": "Žmonės",
+  "explore.title": "Populiaru",
   "explore.trending_links": "Naujienos",
   "explore.trending_statuses": "Įrašai",
-  "explore.trending_tags": "Saitažodžiai",
+  "explore.trending_tags": "Grotažymės",
+  "featured_carousel.header": "{count, plural, one {Iškeltas įrašas} few {Iškelti įrašai} many {Iškeltų įrašų} other {Iškelti įrašai}}",
   "filter_modal.added.context_mismatch_explanation": "Ši filtro kategorija netaikoma kontekstui, kuriame peržiūrėjai šį įrašą. Jei nori, kad įrašas būtų filtruojamas ir šiame kontekste, turėsi redaguoti filtrą.",
   "filter_modal.added.context_mismatch_title": "Konteksto neatitikimas.",
   "filter_modal.added.expired_explanation": "Ši filtro kategorija nustojo galioti. Kad ji būtų taikoma, turėsi pakeisti galiojimo datą.",
@@ -361,7 +407,7 @@
   "follow_suggestions.similar_to_recently_followed_longer": "Panašūs į profilius, kuriuos neseniai seki",
   "follow_suggestions.view_all": "Peržiūrėti viską",
   "follow_suggestions.who_to_follow": "Ką sekti",
-  "followed_tags": "Sekami saitažodžiai",
+  "followed_tags": "Sekamos grotažymės",
   "footer.about": "Apie",
   "footer.directory": "Profilių katalogas",
   "footer.get_app": "Gauti programėlę",
@@ -372,21 +418,26 @@
   "footer.terms_of_service": "Paslaugų sąlygos",
   "generic.saved": "Išsaugota",
   "getting_started.heading": "Kaip pradėti",
-  "hashtag.admin_moderation": "Atverti prižiūrėjimo sąsają saitažodžiui #{name}",
+  "hashtag.admin_moderation": "Atverti moderavimo langą #{name}",
+  "hashtag.browse": "Naršyti įrašus su #{hashtag}",
+  "hashtag.browse_from_account": "Naršyti @{name} įrašus su grotažyme #{hashtag}",
   "hashtag.column_header.tag_mode.all": "ir {additional}",
   "hashtag.column_header.tag_mode.any": "ar {additional}",
   "hashtag.column_header.tag_mode.none": "be {additional}",
   "hashtag.column_settings.select.no_options_message": "Pasiūlymų nerasta.",
-  "hashtag.column_settings.select.placeholder": "Įvesti saitažodžius…",
+  "hashtag.column_settings.select.placeholder": "Įvesk grotažymes…",
   "hashtag.column_settings.tag_mode.all": "Visi šie",
-  "hashtag.column_settings.tag_mode.any": "Bet kuris iš šių",
-  "hashtag.column_settings.tag_mode.none": "Nė vienas iš šių",
-  "hashtag.column_settings.tag_toggle": "Įtraukti papildomas šio stulpelio žymes",
-  "hashtag.counter_by_accounts": "{count, plural, one {{counter} dalyvis} few {{counter} dalyviai} many {{counter} dalyvio} other {{counter} dalyvių}}",
+  "hashtag.column_settings.tag_mode.any": "Bet kuris šių",
+  "hashtag.column_settings.tag_mode.none": "Nei vienas šių",
+  "hashtag.column_settings.tag_toggle": "Įtraukti papildomas žymas į šį stulpelį",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} dalyvis} few {{counter} dalyviai} many {{counter} dalyvių} other {{counter} dalyviai}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} įrašas} few {{counter} įrašai} many {{counter} įrašo} other {{counter} įrašų}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} įrašas} few {{counter} įrašai} many {{counter} įrašo} other {{counter} įrašų}} šiandien",
-  "hashtag.follow": "Sekti saitažodį",
-  "hashtag.unfollow": "Nebesekti saitažodį",
+  "hashtag.feature": "Rodyti profilyje",
+  "hashtag.follow": "Sekti grotažymę",
+  "hashtag.mute": "Nutildyti žymą #{hashtag}",
+  "hashtag.unfeature": "Neberodyti profilyje",
+  "hashtag.unfollow": "Nebesekti grotažymės",
   "hashtags.and_other": "…ir {count, plural, one {# daugiau} few {# daugiau} many {# daugiau}other {# daugiau}}",
   "hints.profiles.followers_may_be_missing": "Sekėjai šiai profiliui gali būti nepateikti.",
   "hints.profiles.follows_may_be_missing": "Sekimai šiai profiliui gali būti nepateikti.",
@@ -394,6 +445,7 @@
   "hints.profiles.see_more_followers": "Žiūrėti daugiau sekėjų serveryje {domain}",
   "hints.profiles.see_more_follows": "Žiūrėti daugiau sekimų serveryje {domain}",
   "hints.profiles.see_more_posts": "Žiūrėti daugiau įrašų serveryje {domain}",
+  "home.column_settings.show_quotes": "Rodyti paminėjimus",
   "home.column_settings.show_reblogs": "Rodyti pakėlimus",
   "home.column_settings.show_replies": "Rodyti atsakymus",
   "home.hide_announcements": "Slėpti skelbimus",
@@ -414,17 +466,19 @@
   "ignore_notifications_modal.private_mentions_title": "Ignoruoti pranešimus iš neprašytų privačių paminėjimų?",
   "info_button.label": "Žinynas",
   "info_button.what_is_alt_text": "<h1>Kas yra alternatyvusis tekstas?</h1> <p>Alternatyvusis tekstas pateikia vaizdų aprašymus asmenims su regos sutrikimais, turintiems mažo pralaidumo ryšį arba ieškantiems papildomo konteksto.</p> <p>Galite pagerinti prieinamumą ir suprantamumą visiems, jei parašysite aiškų, glaustą ir objektyvų alternatyvųjį tekstą.</p> <ul> <li>Užfiksuokite svarbiausius elementus.</li> <li>Apibendrinkite tekstą vaizduose.</li> <li>Naudokite įprasta sakinio struktūrą.</li> <li>Venkite nereikalingos informacijos.</li> <li>Sutelkite dėmesį į tendencijas ir pagrindines išvadas sudėtinguose vaizdiniuose (tokiuose kaip diagramos ar žemėlapiai).</li> </ul>",
+  "interaction_modal.action": "Norėdami bendrauti su {name} įrašu, turite prisijungti prie savo paskyros bet kuriame Mastodon serveryje, kurį naudojate.",
   "interaction_modal.go": "Eiti",
   "interaction_modal.no_account_yet": "Dar neturite paskyros?",
   "interaction_modal.on_another_server": "Kitame serveryje",
   "interaction_modal.on_this_server": "Šiame serveryje",
+  "interaction_modal.title": "Jei norite tęsti, prisijunkite",
   "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ų}}",
   "keyboard_shortcuts.back": "Naršyti atgal",
   "keyboard_shortcuts.blocked": "Atidaryti užblokuotų naudotojų sąrašą",
-  "keyboard_shortcuts.boost": "Pakelti įrašą",
+  "keyboard_shortcuts.boost": "Dalintis įrašu",
   "keyboard_shortcuts.column": "Fokusuoti stulpelį",
   "keyboard_shortcuts.compose": "Fokusuoti rengykles teksto sritį",
   "keyboard_shortcuts.description": "Aprašymas",
@@ -438,6 +492,7 @@
   "keyboard_shortcuts.home": "Atidaryti pagrindinį laiko skalę",
   "keyboard_shortcuts.hotkey": "Spartusis klavišas",
   "keyboard_shortcuts.legend": "Rodyti šią legendą",
+  "keyboard_shortcuts.load_more": "Fokusuoti „Įkelti daugiau“ mygtuką",
   "keyboard_shortcuts.local": "Atidaryti vietinę laiko skalę",
   "keyboard_shortcuts.mention": "Paminėti autorių (-ę)",
   "keyboard_shortcuts.muted": "Atidaryti nutildytų naudotojų sąrašą",
@@ -446,6 +501,7 @@
   "keyboard_shortcuts.open_media": "Atidaryti mediją",
   "keyboard_shortcuts.pinned": "Atverti prisegtų įrašų sąrašą",
   "keyboard_shortcuts.profile": "Atidaryti autoriaus (-ės) profilį",
+  "keyboard_shortcuts.quote": "Paminėti įrašą",
   "keyboard_shortcuts.reply": "Atsakyti į įrašą",
   "keyboard_shortcuts.requests": "Atidaryti sekimo prašymų sąrašą",
   "keyboard_shortcuts.search": "Fokusuoti paieškos juostą",
@@ -457,6 +513,8 @@
   "keyboard_shortcuts.translate": "išversti įrašą",
   "keyboard_shortcuts.unfocus": "Nebefokusuoti rengykles teksto sritį / paiešką",
   "keyboard_shortcuts.up": "Perkelti į viršų sąraše",
+  "learn_more_link.got_it": "Supratau",
+  "learn_more_link.learn_more": "Sužinoti daugiau",
   "lightbox.close": "Uždaryti",
   "lightbox.next": "Kitas",
   "lightbox.previous": "Ankstesnis",
@@ -506,8 +564,10 @@
   "mute_modal.you_wont_see_mentions": "Nematysi įrašus, kuriuose jie paminimi.",
   "mute_modal.you_wont_see_posts": "Jie vis tiek gali matyti tavo įrašus, bet tu nematysi jų.",
   "navigation_bar.about": "Apie",
+  "navigation_bar.account_settings": "Slaptažodis ir saugumas",
   "navigation_bar.administration": "Administravimas",
   "navigation_bar.advanced_interface": "Atidaryti išplėstinę žiniatinklio sąsają",
+  "navigation_bar.automated_deletion": "Automatinis įrašų ištrynimas",
   "navigation_bar.blocks": "Užblokuoti naudotojai",
   "navigation_bar.bookmarks": "Žymės",
   "navigation_bar.direct": "Privatūs paminėjimai",
@@ -515,15 +575,25 @@
   "navigation_bar.favourites": "Mėgstami",
   "navigation_bar.filters": "Nutildyti žodžiai",
   "navigation_bar.follow_requests": "Sekimo prašymai",
-  "navigation_bar.followed_tags": "Sekami saitažodžiai",
+  "navigation_bar.followed_tags": "Sekamos grotažymės",
   "navigation_bar.follows_and_followers": "Sekimai ir sekėjai",
+  "navigation_bar.import_export": "Importas ir eksportas",
   "navigation_bar.lists": "Sąrašai",
+  "navigation_bar.live_feed_local": "Tiesioginis srautas (vietinis)",
+  "navigation_bar.live_feed_public": "Tiesioginis srautas (viešas)",
   "navigation_bar.logout": "Atsijungti",
   "navigation_bar.moderation": "Prižiūrėjimas",
+  "navigation_bar.more": "Daugiau",
   "navigation_bar.mutes": "Nutildyti naudotojai",
   "navigation_bar.opened_in_classic_interface": "Įrašai, paskyros ir kiti konkretūs puslapiai pagal numatytuosius nustatymus atidaromi klasikinėje žiniatinklio sąsajoje.",
   "navigation_bar.preferences": "Nuostatos",
+  "navigation_bar.privacy_and_reach": "Privatumas ir pasiekiamumas",
   "navigation_bar.search": "Ieškoti",
+  "navigation_bar.search_trends": "Paieška / Populiaru",
+  "navigation_panel.collapse_followed_tags": "Sutraukti sekamų žymių meniu",
+  "navigation_panel.collapse_lists": "Sutraukti sąrašo meniu",
+  "navigation_panel.expand_followed_tags": "Išskleisti sekamų grotažymių meniu",
+  "navigation_panel.expand_lists": "Išskleisti sąrašo meniu",
   "not_signed_in_indicator.not_signed_in": "Norint pasiekti šį išteklį, reikia prisijungti.",
   "notification.admin.report": "{name} pranešė {target}",
   "notification.admin.report_account": "{name} pranešė {count, plural, one {# įrašą} few {# įrašus} many {# įrašo} other {# įrašų}} iš {target} kategorijai {category}",
@@ -535,13 +605,17 @@
   "notification.annual_report.message": "Jūsų laukia {year} #Wrapstodon! Atskleiskite savo metų svarbiausius įvykius ir įsimintinas akimirkas platformoje „Mastodon“.",
   "notification.annual_report.view": "Peržiūrėti #Wrapstodon",
   "notification.favourite": "{name} pamėgo tavo įrašą",
+  "notification.favourite.name_and_others_with_link": "{name} ir <a>{count, plural,one {dar kažkas} few {# kiti} other {# kitų}}</a> pamėgo tavo įrašą",
   "notification.favourite_pm": "{name} pamėgo jūsų privatų paminėjimą",
+  "notification.favourite_pm.name_and_others_with_link": "{name} ir <a>{count, plural,one {dar kažkas} few {# kiti} other {# kitų}}</a> pamėgo tavo privatų paminėjimą",
   "notification.follow": "{name} seka tave",
   "notification.follow.name_and_others": "{name} ir <a>{count, plural, one {# kitas} few {# kiti} many {# kito} other {# kitų}}</a> seka tave",
   "notification.follow_request": "{name} paprašė tave sekti",
+  "notification.follow_request.name_and_others": "{name} ir {count, plural,one {dar kažkas} few {# kiti} other {# kitų}} pradėjo tave sekti",
   "notification.label.mention": "Paminėjimas",
   "notification.label.private_mention": "Privatus paminėjimas",
   "notification.label.private_reply": "Privatus atsakymas",
+  "notification.label.quote": "{name} paminėjo jūsų įrašą",
   "notification.label.reply": "Atsakymas",
   "notification.mention": "Paminėjimas",
   "notification.mentioned_you": "{name} paminėjo jus",
@@ -549,15 +623,19 @@
   "notification.moderation_warning": "Gavai prižiūrėjimo įspėjimą",
   "notification.moderation_warning.action_delete_statuses": "Kai kurie tavo įrašai buvo pašalintos.",
   "notification.moderation_warning.action_disable": "Tavo paskyra buvo išjungta.",
-  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Kai kurie tavo įrašai buvo pažymėtos kaip jautrios.",
+  "notification.moderation_warning.action_mark_statuses_as_sensitive": "Kai kurie tavo įrašai buvo pažymėti kaip turintys jautrią informaciją.",
   "notification.moderation_warning.action_none": "Tavo paskyra gavo prižiūrėjimo įspėjimą.",
-  "notification.moderation_warning.action_sensitive": "Nuo šiol tavo įrašai bus pažymėti kaip jautrūs.",
+  "notification.moderation_warning.action_sensitive": "Nuo šiol tavo įrašai bus pažymėti kaip su jautria informacija.",
   "notification.moderation_warning.action_silence": "Tavo paskyra buvo apribota.",
   "notification.moderation_warning.action_suspend": "Tavo paskyra buvo sustabdyta.",
   "notification.own_poll": "Tavo apklausa baigėsi",
   "notification.poll": "Baigėsi apklausa, kurioje balsavai",
-  "notification.reblog": "{name} pakėlė tavo įrašą",
+  "notification.quoted_update": "{name} redagavo jūsų cituotą įrašą",
+  "notification.reblog": "{name} dalinosi tavo įrašu",
+  "notification.reblog.name_and_others_with_link": "{name} ir <a>{count, plural,one {dar kažkas} few {# kiti} other {# kitų}}</a> pasidalino tavo įrašu",
   "notification.relationships_severance_event": "Prarasti sąryšiai su {name}",
+  "notification.relationships_severance_event.account_suspension": "Administratorius iš {from} sustabdė {target}, todėl jūs nebegalėsite gauti jų naujienų ar bendrauti su jais.",
+  "notification.relationships_severance_event.domain_block": "Administratorius iš {from} užblokavo {target}, įskaitant {followersCount} iš tavo sekėjų ir {followingCount, plural,one {# žmogų, kurį} few {# žmones, kuriuos} other {# žmonių, kuriuos}} seki.",
   "notification.relationships_severance_event.learn_more": "Sužinoti daugiau",
   "notification.relationships_severance_event.user_domain_block": "Tu užblokavai {target}. Pašalinama {followersCount} savo sekėjų ir {followingCount, plural, one {# paskyrą} few {# paskyrai} many {# paskyros} other {# paskyrų}}, kurios seki.",
   "notification.status": "{name} ką tik paskelbė",
@@ -596,7 +674,8 @@
   "notifications.column_settings.mention": "Paminėjimai:",
   "notifications.column_settings.poll": "Balsavimo rezultatai:",
   "notifications.column_settings.push": "Tiesioginiai pranešimai",
-  "notifications.column_settings.reblog": "Pakėlimai:",
+  "notifications.column_settings.quote": "Paminėjimai:",
+  "notifications.column_settings.reblog": "Pasidalinimai:",
   "notifications.column_settings.show": "Rodyti stulpelyje",
   "notifications.column_settings.sound": "Paleisti garsą",
   "notifications.column_settings.status": "Nauji įrašai:",
@@ -604,7 +683,7 @@
   "notifications.column_settings.unread_notifications.highlight": "Paryškinti neperskaitytus pranešimus",
   "notifications.column_settings.update": "Redagavimai:",
   "notifications.filter.all": "Visi",
-  "notifications.filter.boosts": "Pakėlimai",
+  "notifications.filter.boosts": "Pasidalinimai",
   "notifications.filter.favourites": "Mėgstami",
   "notifications.filter.follows": "Sekimai",
   "notifications.filter.mentions": "Paminėjimai",
@@ -623,11 +702,14 @@
   "notifications.policy.filter": "Filtruoti",
   "notifications.policy.filter_hint": "Siųsti į filtruotų pranešimų gautiejus",
   "notifications.policy.filter_limited_accounts_hint": "Apribota serverio prižiūrėtojų",
-  "notifications.policy.filter_limited_accounts_title": "Prižiūrėmi paskyrai",
+  "notifications.policy.filter_limited_accounts_title": "Moderuojamos paskyros",
   "notifications.policy.filter_new_accounts.hint": "Sukurta per {days, plural, one {vieną dieną} few {# dienas} many {# dienos} other {# dienų}}",
   "notifications.policy.filter_new_accounts_title": "Naujos paskyros",
+  "notifications.policy.filter_not_followers_hint": "Įskaitant žmones, kurie seka jus mažiau nei {days, plural, one {vieną dieną} few {# dienas} many {# dienų} other {# dienų}}",
+  "notifications.policy.filter_not_followers_title": "Žmonės, kurie neseka tavęs",
   "notifications.policy.filter_not_following_hint": "Kol jų nepatvirtinsi rankiniu būdu",
   "notifications.policy.filter_not_following_title": "Žmonių, kuriuos neseki",
+  "notifications.policy.filter_private_mentions_hint": "Filtruojama, išskyrus atsakymus į tavo paties paminėjimą arba jei seki siuntėją",
   "notifications.policy.filter_private_mentions_title": "Nepageidaujami privatūs paminėjimai",
   "notifications.policy.title": "Tvarkyti pranešimus iš…",
   "notifications_permission_banner.enable": "Įjungti darbalaukio pranešimus",
@@ -668,10 +750,20 @@
   "privacy.private.short": "Sekėjai",
   "privacy.public.long": "Bet kas iš Mastodon ir ne Mastodon",
   "privacy.public.short": "Vieša",
-  "privacy.unlisted.additional": "Tai veikia lygiai taip pat, kaip ir vieša, tik įrašas nebus rodomas tiesioginiuose srautuose, saitažodžiose, naršyme ar Mastodon paieškoje, net jei esi įtraukęs (-usi) visą paskyrą.",
+  "privacy.quote.anyone": "{visibility}, kiekvienas gali cituoti",
+  "privacy.quote.disabled": "{visibility}, paminėjimai išjungti",
+  "privacy.quote.limited": "{visibility}, paminėjimai apriboti",
+  "privacy.unlisted.additional": "Tai veikia lygiai taip pat, kaip ir vieša, tik įrašas nebus rodomas tiesioginiuose srautuose, grotažymėse, naršyme ar Mastodon paieškoje, net jei esi įtraukęs (-usi) visą paskyrą.",
+  "privacy.unlisted.long": "Paslėptas nuo „Mastodon“ paieškos rezultatų, tendencijų ir viešų įrašų sienų",
   "privacy.unlisted.short": "Tyliai vieša",
   "privacy_policy.last_updated": "Paskutinį kartą atnaujinta {date}",
   "privacy_policy.title": "Privatumo politika",
+  "quote_error.edit": "Paminėjimai negali būti pridedami, kai keičiamas įrašas.",
+  "quote_error.poll": "Cituoti apklausose negalima.",
+  "quote_error.private_mentions": "Cituoti privačius paminėjus nėra leidžiama.",
+  "quote_error.quote": "Leidžiama pateikti tik vieną citatą vienu metu.",
+  "quote_error.unauthorized": "Jums neleidžiama cituoti šio įrašo.",
+  "quote_error.upload": "Cituoti ir pridėti papildomas bylas negalima.",
   "recommended": "Rekomenduojama",
   "refresh": "Atnaujinti",
   "regeneration_indicator.please_stand_by": "Laukite.",
@@ -687,6 +779,9 @@
   "relative_time.minutes": "{number} min.",
   "relative_time.seconds": "{number} sek.",
   "relative_time.today": "šiandien",
+  "remove_quote_hint.button_label": "Supratau",
+  "remove_quote_hint.message": "Tai galite padaryti iš {icon} parinkčių meniu.",
+  "remove_quote_hint.title": "Norite pašalinti savo citatą?",
   "reply_indicator.attachments": "{count, plural, one {# priedas} few {# priedai} many {# priedo} other {# priedų}}",
   "reply_indicator.cancel": "Atšaukti",
   "reply_indicator.poll": "Apklausa",
@@ -740,6 +835,7 @@
   "report_notification.categories.violation": "Taisyklės pažeidimas",
   "report_notification.categories.violation_sentence": "taisyklės pažeidimas",
   "report_notification.open": "Atidaryti ataskaitą",
+  "search.clear": "Išvalyti paiešką",
   "search.no_recent_searches": "Nėra naujausių paieškų.",
   "search.placeholder": "Paieška",
   "search.quick_action.account_search": "Profiliai, atitinkantys {x}",
@@ -748,7 +844,7 @@
   "search.quick_action.open_url": "Atidaryti URL adresą Mastodon",
   "search.quick_action.status_search": "Pranešimai, atitinkantys {x}",
   "search.search_or_paste": "Ieškoti arba įklijuoti URL",
-  "search_popout.full_text_search_disabled_message": "Nepasiekima {domain}.",
+  "search_popout.full_text_search_disabled_message": "Paieška {domain} įrašuose išjungta.",
   "search_popout.full_text_search_logged_out_message": "Pasiekiama tik prisijungus.",
   "search_popout.language_code": "ISO kalbos kodas",
   "search_popout.options": "Paieškos nustatymai",
@@ -758,9 +854,9 @@
   "search_popout.user": "naudotojas",
   "search_results.accounts": "Profiliai",
   "search_results.all": "Visi",
-  "search_results.hashtags": "Saitažodžiai",
+  "search_results.hashtags": "Grotažymės",
   "search_results.no_results": "Nėra rezultatų.",
-  "search_results.no_search_yet": "Pabandykite ieškoti įrašų, profilių arba saitažodžių.",
+  "search_results.no_search_yet": "Pabandykite ieškoti įrašų, profilių arba grotažymių.",
   "search_results.see_all": "Žiūrėti viską",
   "search_results.statuses": "Įrašai",
   "search_results.title": "Paieška užklausai „{q}“",
@@ -777,21 +873,32 @@
   "status.admin_account": "Atidaryti prižiūrėjimo sąsają @{name}",
   "status.admin_domain": "Atidaryti prižiūrėjimo sąsają {domain}",
   "status.admin_status": "Atidaryti šį įrašą prižiūrėjimo sąsajoje",
+  "status.all_disabled": "Įrašo dalinimaisi ir paminėjimai išjungti",
   "status.block": "Blokuoti @{name}",
-  "status.bookmark": "Pridėti į žymės",
-  "status.cancel_reblog_private": "Nebepasidalinti",
+  "status.bookmark": "Žymė",
+  "status.cancel_reblog_private": "Nesidalinti",
+  "status.cannot_quote": "Jums neleidžiama paminėti šio įrašo",
   "status.cannot_reblog": "Šis įrašas negali būti pakeltas.",
+  "status.contains_quote": "Turi citatą",
+  "status.context.loading": "Įkeliama daugiau atsakymų",
+  "status.context.loading_error": "Nepavyko įkelti naujų atsakymų",
+  "status.context.loading_success": "Įkelti nauji atsakymai",
+  "status.context.more_replies_found": "Rasta daugiau atsakymų",
+  "status.context.retry": "Kartoti",
+  "status.context.show": "Rodyti",
   "status.continued_thread": "Tęsiama gijoje",
   "status.copy": "Kopijuoti nuorodą į įrašą",
   "status.delete": "Ištrinti",
+  "status.delete.success": "Įrašas ištrintas",
   "status.detailed_status": "Išsami pokalbio peržiūra",
   "status.direct": "Privačiai paminėti @{name}",
   "status.direct_indicator": "Privatus paminėjimas",
   "status.edit": "Redaguoti",
   "status.edited": "Paskutinį kartą redaguota {date}",
   "status.edited_x_times": "Redaguota {count, plural, one {{count} kartą} few {{count} kartus} many {{count} karto} other {{count} kartų}}",
+  "status.embed": "Gaukite įterpimo kodą",
   "status.favourite": "Pamėgti",
-  "status.favourites": "{count, plural, one {mėgstamas} few {mėgstamai} many {mėgstamų} other {mėgstamų}}",
+  "status.favourites": "{count, plural, one {mėgsta} few {mėgsta} many {mėgsta} other {mėgsta}}",
   "status.filter": "Filtruoti šį įrašą",
   "status.history.created": "{name} sukurta {date}",
   "status.history.edited": "{name} redaguota {date}",
@@ -803,20 +910,48 @@
   "status.more": "Daugiau",
   "status.mute": "Nutildyti @{name}",
   "status.mute_conversation": "Nutildyti pokalbį",
-  "status.open": "Išplėsti šį įrašą",
+  "status.open": "Išskleisti šį įrašą",
   "status.pin": "Prisegti prie profilio",
+  "status.quote": "Paminėjimai",
+  "status.quote.cancel": "Atšaukti paminėjimą",
+  "status.quote_error.blocked_account_hint.title": "Šis įrašas yra paslėptas, nes jūs esate užblokavę @{name}.",
+  "status.quote_error.blocked_domain_hint.title": "Šis įrašas yra paslėptas, nes jūs užblokavote {domain}.",
+  "status.quote_error.filtered": "Paslėpta dėl vieno iš jūsų filtrų",
+  "status.quote_error.limited_account_hint.action": "Vis tiek rodyti",
+  "status.quote_error.limited_account_hint.title": "Šis paskyra buvo paslėpta {domain} moderatorių.",
+  "status.quote_error.muted_account_hint.title": "Šis įrašas yra paslėptas, nes jūs esate užtildę @{name}.",
+  "status.quote_error.not_available": "Įrašas nepasiekiamas",
+  "status.quote_error.pending_approval": "Įrašas peržiūrimas",
+  "status.quote_error.pending_approval_popout.body": "„Mastodon“ galite kontroliuoti, ar kas nors gali jus cituoti (paminėti). Šis įrašas bus laukimo būsenoje, kol gausite originalaus įrašo autoriaus sutikimą.",
+  "status.quote_error.revoked": "Autorius pašalino įrašą",
+  "status.quote_followers_only": "Tik sekėjai gali cituoti šį įrašą",
+  "status.quote_manual_review": "Autorius atskirai įvertins paskelbimą",
+  "status.quote_noun": "Paminėjimas",
+  "status.quote_policy_change": "Keisti, kas gali cituoti",
+  "status.quote_post_author": "Paminėjo įrašą iš @{name}",
+  "status.quote_private": "Privačių įrašų negalima cituoti",
+  "status.quotes": "{count, plural, one {citata} few {citatos} many {citatų} other {citatos}}",
+  "status.quotes.empty": "Šio įrašo dar niekas nepaminėjo. Kai kas nors tai padarys, jie bus rodomi čia.",
+  "status.quotes.local_other_disclaimer": "Autoriaus atmesti įrašo paminėjimai nebus rodomi.",
+  "status.quotes.remote_other_disclaimer": "Čia bus rodoma tik paminėjimai iš {domain}. Autoriaus atmesti įrašo paminėjimai nebus rodomi.",
   "status.read_more": "Skaityti daugiau",
-  "status.reblog": "Pakelti",
-  "status.reblogged_by": "{name} pakėlė",
-  "status.reblogs.empty": "Šio įrašo dar niekas nepakėlė. Kai kas nors tai padarys, jie bus rodomi čia.",
+  "status.reblog": "Dalintis",
+  "status.reblog_or_quote": "Dalintis arba cituoti",
+  "status.reblog_private": "Vėl pasidalinkite su savo sekėjais",
+  "status.reblogged_by": "{name} pasidalino",
+  "status.reblogs": "{count, plural, one {pasidalinimas} few {pasidalinimai} many {pasidalinimų} other {pasidalinimai}}",
+  "status.reblogs.empty": "Šiuo įrašu dar niekas nesidalino. Kai kas nors tai padarys, jie bus rodomi čia.",
   "status.redraft": "Ištrinti ir parengti iš naujo",
   "status.remove_bookmark": "Pašalinti žymę",
   "status.remove_favourite": "Šalinti iš mėgstamų",
+  "status.remove_quote": "Pašalinti",
   "status.replied_in_thread": "Atsakyta gijoje",
   "status.replied_to": "Atsakyta į {name}",
   "status.reply": "Atsakyti",
   "status.replyAll": "Atsakyti į giją",
   "status.report": "Pranešti apie @{name}",
+  "status.request_quote": "Citavimo sutikimas",
+  "status.revoke_quote": "Pašalinti mano įrašo citavimą iš @{name}’s įrašo",
   "status.sensitive_warning": "Jautrus turinys",
   "status.share": "Bendrinti",
   "status.show_less_all": "Rodyti mažiau visiems",
@@ -832,7 +967,10 @@
   "subscribed_languages.save": "Išsaugoti pakeitimus",
   "subscribed_languages.target": "Keisti prenumeruojamas kalbas {target}",
   "tabs_bar.home": "Pagrindinis",
+  "tabs_bar.menu": "Meniu",
   "tabs_bar.notifications": "Pranešimai",
+  "tabs_bar.publish": "Naujas įrašas",
+  "tabs_bar.search": "Paieška",
   "terms_of_service.effective_as_of": "Įsigaliojo nuo {date}.",
   "terms_of_service.title": "Paslaugų sąlygos",
   "terms_of_service.upcoming_changes_on": "Numatomi pakeitimai {date}.",
@@ -851,6 +989,7 @@
   "upload_button.label": "Pridėti vaizdų, vaizdo įrašą arba garso failą",
   "upload_error.limit": "Viršyta failo įkėlimo riba.",
   "upload_error.poll": "Failų įkėlimas neleidžiamas su apklausomis.",
+  "upload_error.quote": "Paminint įrašą bylos įkėlimas negalimas.",
   "upload_form.drag_and_drop.instructions": "Kad paimtum medijos priedą, paspausk tarpo arba įvedimo klavišą. Tempant naudok rodyklių klavišus, kad perkeltum medijos priedą bet kuria kryptimi. Dar kartą paspausk tarpo arba įvedimo klavišą, kad nuleistum medijos priedą naujoje vietoje, arba paspausk grįžimo klavišą, kad atšauktum.",
   "upload_form.drag_and_drop.on_drag_cancel": "Nutempimas buvo atšauktas. Medijos priedas {item} buvo nuleistas.",
   "upload_form.drag_and_drop.on_drag_end": "Medijos priedas {item} buvo nuleistas.",
@@ -869,5 +1008,25 @@
   "video.mute": "Išjungti garsą",
   "video.pause": "Pristabdyti",
   "video.play": "Leisti",
-  "video.skip_backward": "Praleisti atgal"
+  "video.skip_backward": "Praleisti atgal",
+  "video.skip_forward": "Praleisti į priekį",
+  "video.unmute": "Atšaukti nutildymą",
+  "video.volume_down": "Patildyti",
+  "video.volume_up": "Pagarsinti",
+  "visibility_modal.button_title": "Nustatyti matomumą",
+  "visibility_modal.direct_quote_warning.text": "Jei išsaugosite dabartinius nustatymus, įterpta citata bus konvertuota į nuorodą.",
+  "visibility_modal.direct_quote_warning.title": "Cituojami įrašai negali būti įterpiami į privačius paminėjimus",
+  "visibility_modal.header": "Matomumas ir sąveika",
+  "visibility_modal.helper.direct_quoting": "Privatūs paminėjimai, parašyti platformoje „Mastodon“, negali būti cituojami kitų.",
+  "visibility_modal.helper.privacy_editing": "Matomumo nustatymai negali būti keičiami po to, kai įrašas yra paskelbtas.",
+  "visibility_modal.helper.privacy_private_self_quote": "Privačių įrašų paminėjimai negali būti skelbiami viešai.",
+  "visibility_modal.helper.private_quoting": "Tik sekėjams skirti įrašai, parašyti platformoje „Mastodon“, negali būti cituojami kitų.",
+  "visibility_modal.helper.unlisted_quoting": "Kai žmonės jus cituos, jų įrašai taip pat bus paslėpti iš populiariausių naujienų srauto.",
+  "visibility_modal.instructions": "Kontroliuokite, kas gali bendrauti su šiuo įrašu. Taip pat galite taikyti nustatymus visiems būsimiems įrašams, pereidami į <link>Preferences > Posting defaults</link>.",
+  "visibility_modal.privacy_label": "Matomumas",
+  "visibility_modal.quote_followers": "Tik sekėjai",
+  "visibility_modal.quote_label": "Kas gali cituoti",
+  "visibility_modal.quote_nobody": "Tik aš",
+  "visibility_modal.quote_public": "Visi",
+  "visibility_modal.save": "Išsaugoti"
 }

app/javascript/mastodon/locales/lv.json

@@ -641,12 +641,14 @@
   "privacy.direct.long": "Visi ierakstā pieminētie",
   "privacy.private.long": "Tikai Tavi sekotāji",
   "privacy.private.short": "Sekotāji",
-  "privacy.public.long": "Jebkurš Mastodon un ārpus tā",
-  "privacy.public.short": "Redzams visiem",
+  "privacy.public.long": "Jebkurš Mastodon platformā un ārpus tās",
+  "privacy.public.short": "Publisks",
   "privacy.quote.anyone": "{visibility}, jebkurš var citēt",
   "privacy.quote.disabled": "{visibility}, aizliegta citēšana",
   "privacy.quote.limited": "{visibility}, ierobežota citēšana",
   "privacy.unlisted.additional": "Šis uzvedas tieši kā publisks, izņemot to, ka ieraksts neparādīsies tiešraides barotnēs vai tēmturos, izpētē vai Mastodon meklēšanā, pat ja esi to norādījis visa konta ietvaros.",
+  "privacy.unlisted.long": "Netiks rādīts Mastodon meklēšanas rezultātos, populārākajos, un publiskajās laikjoslās",
+  "privacy.unlisted.short": "Klusi publisks",
   "privacy_policy.last_updated": "Pēdējo reizi atjaunināta {date}",
   "privacy_policy.title": "Privātuma politika",
   "recommended": "Ieteicams",
@@ -842,7 +844,7 @@
   "video.volume_down": "Pagriezt klusāk",
   "video.volume_up": "Pagriezt skaļāk",
   "visibility_modal.button_title": "Iestatīt redzamību",
-  "visibility_modal.header": "Redzamība un mijjiedarbība",
+  "visibility_modal.header": "Redzamība un mijiedarbība",
   "visibility_modal.quote_followers": "Tikai sekotāji",
   "visibility_modal.quote_label": "Kurš var citēt",
   "visibility_modal.quote_nobody": "Tikai es",

app/javascript/mastodon/locales/nan.json

@@ -18,7 +18,7 @@
   "account.badges.bot": "機器lâng",
   "account.badges.group": "群組",
   "account.block": "封鎖 @{name}",
-  "account.block_domain": "封鎖網域 {domain}",
+  "account.block_domain": "封鎖域名 {domain}",
   "account.block_short": "封鎖",
   "account.blocked": "Hőng封鎖",
   "account.blocking": "Teh封鎖",
@@ -26,7 +26,7 @@
   "account.copy": "Khóo-pih個人資料ê連結",
   "account.direct": "私人提起 @{name}",
   "account.disable_notifications": "停止佇 {name} PO文ê時通知我",
-  "account.domain_blocking": "Teh封鎖ê網域",
+  "account.domain_blocking": "Teh封鎖ê域名",
   "account.edit_profile": "編輯個人資料",
   "account.edit_profile_short": "編輯",
   "account.enable_notifications": "佇 {name} PO文ê時通知我",
@@ -342,7 +342,7 @@
   "empty_column.community": "本站時間線是空ê。緊來公開PO文oh！",
   "empty_column.direct": "Lí iáu無任何ê私人訊息。Nā是lí送á是收著私人訊息，ē佇tsia顯示。.",
   "empty_column.disabled_feed": "Tsit ê feed已經hōo lí ê服侍器ê管理員停用。",
-  "empty_column.domain_blocks": "Iáu無封鎖任何網域。",
+  "empty_column.domain_blocks": "Iáu無封鎖任何域名。",
   "empty_column.explore_statuses": "目前iáu無有流行ê趨勢，請sió等tsi̍t-ē，koh確認。",
   "empty_column.favourited_statuses": "Lí iáu無加添任何收藏 ê PO文。Nā是lí加收藏，伊ē佇tsia顯示。",
   "empty_column.favourites": "Iáu無lâng收藏tsit篇PO文。Nā是有lâng收藏，ē佇tsia顯示。",
@@ -1016,6 +1016,8 @@
   "video.volume_down": "變khah細聲",
   "video.volume_up": "變khah大聲",
   "visibility_modal.button_title": "設定通看ê程度",
+  "visibility_modal.direct_quote_warning.text": "Nā是lí儲存目前ê設定，引用êPO文ē轉做連結。",
+  "visibility_modal.direct_quote_warning.title": "引用bē當tàu入去私人ê提起",
   "visibility_modal.header": "通看ê程度kap互動",
   "visibility_modal.helper.direct_quoting": "Mastodon頂發布ê私人提起bē當hōo別lâng引用。",
   "visibility_modal.helper.privacy_editing": "Po文發布了後，bē當改通看ê程度。",

app/javascript/mastodon/locales/nn.json

@@ -330,8 +330,8 @@
   "emoji_button.search_results": "Søkeresultat",
   "emoji_button.symbols": "Symbol",
   "emoji_button.travel": "Reise & stader",
-  "empty_column.account_featured.me": "Du har ikkje valt ut noko enno. Visste du at du kan velja ut merkelappar du bruker mykje, og til og med venekontoar på profilen din?",
-  "empty_column.account_featured.other": "{acct} har ikkje valt ut noko enno. Visste du at du kan velja ut merkelappar du bruker mykje, og til og med venekontoar på profilen din?",
+  "empty_column.account_featured.me": "Du har ikkje valt ut noko enno. Visste du at du kan velja ut emneknaggar du bruker mykje, og til og med venekontoar på profilen din?",
+  "empty_column.account_featured.other": "{acct} har ikkje valt ut noko enno. Visste du at du kan velja ut emneknaggar du bruker mykje, og til og med venekontoar på profilen din?",
   "empty_column.account_featured_other.unknown": "Denne kontoen har ikkje valt ut noko enno.",
   "empty_column.account_hides_collections": "Denne brukaren har valt å ikkje gjere denne informasjonen tilgjengeleg",
   "empty_column.account_suspended": "Kontoen er utestengd",
@@ -594,9 +594,9 @@
   "navigation_bar.privacy_and_reach": "Personvern og rekkjevidd",
   "navigation_bar.search": "Søk",
   "navigation_bar.search_trends": "Søk / Populært",
-  "navigation_panel.collapse_followed_tags": "Gøym menyen over merkelappar du fylgjer",
+  "navigation_panel.collapse_followed_tags": "Gøym menyen over emneknaggar du fylgjer",
   "navigation_panel.collapse_lists": "Gøym listemenyen",
-  "navigation_panel.expand_followed_tags": "Utvid menyen over merkelappar du fylgjer",
+  "navigation_panel.expand_followed_tags": "Utvid menyen over emneknaggar du fylgjer",
   "navigation_panel.expand_lists": "Utvid listemenyen",
   "not_signed_in_indicator.not_signed_in": "Du må logga inn for å få tilgang til denne ressursen.",
   "notification.admin.report": "{name} rapporterte {target}",
@@ -757,7 +757,7 @@
   "privacy.quote.anyone": "{visibility}, alle kan sitera",
   "privacy.quote.disabled": "{visibility}, ingen kan sitera",
   "privacy.quote.limited": "{visibility}, avgrensa sitat",
-  "privacy.unlisted.additional": "Dette er akkurat som offentleg, bortsett frå at innlegga ikkje dukkar opp i direktestraumar eller merkelappar, i oppdagingar eller Mastodon-søk, sjølv om du har sagt ja til at kontoen skal vera synleg.",
+  "privacy.unlisted.additional": "Dette er akkurat som offentleg, bortsett frå at innlegga ikkje dukkar opp i direktestraumar eller emneknaggar, i oppdagingar eller Mastodon-søk, sjølv om du har sagt ja til at kontoen skal vera synleg.",
   "privacy.unlisted.long": "Gøymt frå søkjeresultata på Mastodon, og frå populære og offentlege tidsliner",
   "privacy.unlisted.short": "Stille offentleg",
   "privacy_policy.last_updated": "Sist oppdatert {date}",
@@ -860,7 +860,7 @@
   "search_results.all": "Alt",
   "search_results.hashtags": "Emneknaggar",
   "search_results.no_results": "Ingen resultat.",
-  "search_results.no_search_yet": "Prøv å søkja etter innlegg, profilar eller merkelappar.",
+  "search_results.no_search_yet": "Prøv å søkja etter innlegg, profilar eller emneknaggar.",
   "search_results.see_all": "Sjå alle",
   "search_results.statuses": "Tut",
   "search_results.title": "Søk etter \"{q}\"",

app/javascript/mastodon/locales/pa.json

@@ -81,7 +81,7 @@
   "admin.dashboard.retention.cohort_size": "ਨਵੇਂ ਵਰਤੋਂਕਾਰ",
   "alert.unexpected.title": "ਓਹੋ!",
   "alt_text_badge.title": "ਬਦਲੀ ਲਿਖਤ",
-  "alt_text_modal.add_alt_text": "ਬਦਲਵੀ ਲਿਖਤ ਜੋੜੋ",
+  "alt_text_modal.add_alt_text": "ਬਦਲਵੀ ਲਿਖਤ ਨੂੰ ਜੋੜੋ",
   "alt_text_modal.cancel": "ਰੱਦ ਕਰੋ",
   "alt_text_modal.done": "ਮੁਕੰਮਲ",
   "announcement.announcement": "ਹੋਕਾ",
@@ -108,6 +108,7 @@
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "ਬੰਦ ਕਰੋ",
   "bundle_modal_error.retry": "ਮੁੜ-ਕੋਸ਼ਿਸ਼ ਕਰੋ",
+  "closed_registrations_modal.find_another_server": "ਹੋਰ ਸਰਵਰ ਲੱਭੋ",
   "closed_registrations_modal.title": "Mastodon ਲਈ ਸਾਈਨ ਅੱਪ ਕਰੋ",
   "column.about": "ਸਾਡੇ ਬਾਰੇ",
   "column.blocks": "ਪਾਬੰਦੀ ਲਾਏ ਵਰਤੋਂਕਾਰ",
@@ -170,14 +171,20 @@
   "confirmations.delete_list.confirm": "ਹਟਾਓ",
   "confirmations.delete_list.message": "ਕੀ ਤੁਸੀਂ ਇਸ ਸੂਚੀ ਨੂੰ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?",
   "confirmations.delete_list.title": "ਸੂਚੀ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?",
+  "confirmations.discard_draft.confirm": "ਖ਼ਾਰਜ ਕਰਕੇ ਜਾਰੀ ਰੱਖੋ",
+  "confirmations.discard_draft.edit.cancel": "ਸੋਧਣਾ ਜਾਰੀ ਰੱਖੋ",
+  "confirmations.discard_draft.post.cancel": "ਖਰੜੇ ਉੱਤੇ ਕੰਮ ਜਾਰੀ ਰੱਖੋ",
   "confirmations.discard_edit_media.confirm": "ਰੱਦ ਕਰੋ",
   "confirmations.follow_to_list.confirm": "ਫ਼ਾਲੋ ਕਰੋ ਅਤੇ ਲਿਸਟ 'ਚ ਜੋੜੋ",
   "confirmations.follow_to_list.title": "ਵਰਤੋਂਕਾਰ ਨੂੰ ਫ਼ਾਲੋ ਕਰਨਾ ਹੈ?",
   "confirmations.logout.confirm": "ਬਾਹਰ ਹੋਵੋ",
   "confirmations.logout.message": "ਕੀ ਤੁਸੀਂ ਲਾਗ ਆਉਟ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?",
   "confirmations.logout.title": "ਲਾਗ ਆਉਟ ਕਰਨਾ ਹੈ?",
+  "confirmations.missing_alt_text.confirm": "ਬਦਲਵੀ ਲਿਖਤ ਨੂੰ ਜੋੜੋ",
   "confirmations.missing_alt_text.secondary": "ਕਿਵੇਂ ਵੀ ਪੋਸਟ ਕਰੋ",
+  "confirmations.missing_alt_text.title": "ਬਦਲਵੀ ਲਿਖਤ ਜੋੜਨੀ ਹੈ?",
   "confirmations.mute.confirm": "ਮੌਨ ਕਰੋ",
+  "confirmations.private_quote_notify.cancel": "ਸੋਧ ਕਰਨ ਉੱਤੇ ਵਾਪਸ ਜਾਓ",
   "confirmations.private_quote_notify.do_not_show_again": "ਮੈਨੂੰ ਇਹ ਸੁਨੇਹਾ ਫੇਰ ਨਾ ਦਿਖਾਓ",
   "confirmations.quiet_post_quote_info.dismiss": "ਮੈਨੂੰ ਮੁੜ ਕੇ ਯਾਦ ਨਾ ਕਰਵਾਓ",
   "confirmations.quiet_post_quote_info.got_it": "ਸਮਝ ਗਏ",
@@ -262,6 +269,7 @@
   "filter_modal.select_filter.search": "ਖੋਜੋ ਜਾਂ ਬਣਾਓ",
   "filter_modal.select_filter.title": "ਇਸ ਪੋਸਟ ਨੂੰ ਫਿਲਟਰ ਕਰੋ",
   "filter_modal.title.status": "ਇੱਕ ਪੋਸਟ ਨੂੰ ਫਿਲਟਰ ਕਰੋ",
+  "filtered_notifications_banner.title": "ਫਿਲਟਰ ਕੀਤੇ ਨੋਟੀਫਿਕੇਸ਼ਨ",
   "firehose.all": "ਸਭ",
   "firehose.local": "ਇਹ ਸਰਵਰ",
   "firehose.remote": "ਹੋਰ ਸਰਵਰ",
@@ -295,6 +303,7 @@
   "hashtag.column_settings.tag_mode.none": "ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ ਨਹੀਂ",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "ਹੈਸ਼ਟੈਗ ਨੂੰ ਫ਼ਾਲੋ ਕਰੋ",
+  "hashtag.mute": "#{hashtag} ਨੂੰ ਮੌਨ ਕਰੋ",
   "hashtag.unfollow": "ਹੈਸ਼ਟੈਗ ਨੂੰ ਅਣ-ਫ਼ਾਲੋ ਕਰੋ",
   "hints.profiles.see_more_followers": "{domain} ਉੱਤੇ ਹੋਰ ਫ਼ਾਲੋਅਰ ਵੇਖੋ",
   "hints.profiles.see_more_follows": "{domain} ਉੱਤੇ ਹੋਰ ਫ਼ਾਲੋ ਨੂੰ ਵੇਖੋ",
@@ -311,6 +320,7 @@
   "interaction_modal.no_account_yet": "ਹਾਲੇ ਖਾਤਾ ਨਹੀਂ ਹੈ?",
   "interaction_modal.on_another_server": "ਵੱਖਰੇ ਸਰਵਰ ਉੱਤੇ",
   "interaction_modal.on_this_server": "ਇਸ ਸਰਵਰ ਉੱਤੇ",
+  "interaction_modal.title": "ਜਾਰੀ ਰੱਖਣ ਲਈ ਸਾਈਨ ਇਨ ਕਰੋ",
   "interaction_modal.username_prompt": "ਜਿਵੇਂ {example}",
   "intervals.full.days": "{number, plural, one {# ਦਿਨ} other {# ਦਿਨ}}",
   "intervals.full.hours": "{number, plural, one {# ਘੰਟਾ} other {# ਘੰਟੇ}}",
@@ -381,6 +391,7 @@
   "loading_indicator.label": "ਲੋਡ ਹੋ ਰਿਹਾ ਹੈ…",
   "media_gallery.hide": "ਲੁਕਾਓ",
   "mute_modal.hide_from_notifications": "ਨੋਟੀਫਿਕੇਸ਼ਨਾਂ ਵਿੱਚੋਂ ਲੁਕਾਓ",
+  "mute_modal.hide_options": "ਚੋਣਾਂ ਨੂੰ ਲੁਕਾਓ",
   "mute_modal.show_options": "ਚੋਣਾਂ ਨੂੰ ਵੇਖਾਓ",
   "mute_modal.title": "ਵਰਤੋਂਕਾਰ ਨੂੰ ਮੌਨ ਕਰਨਾ ਹੈ?",
   "navigation_bar.about": "ਇਸ ਬਾਰੇ",
@@ -398,6 +409,8 @@
   "navigation_bar.followed_tags": "ਫ਼ਾਲੋ ਕੀਤੇ ਹੈਸ਼ਟੈਗ",
   "navigation_bar.follows_and_followers": "ਫ਼ਾਲੋ ਅਤੇ ਫ਼ਾਲੋ ਕਰਨ ਵਾਲੇ",
   "navigation_bar.lists": "ਸੂਚੀਆਂ",
+  "navigation_bar.live_feed_local": "ਲਾਈਵ ਫੀਡ (ਲੋਕਲ)",
+  "navigation_bar.live_feed_public": "ਲਾਈਵ ਫੀਡ (ਪਬਲਿਕ)",
   "navigation_bar.logout": "ਲਾਗ ਆਉਟ",
   "navigation_bar.more": "ਹੋਰ",
   "navigation_bar.mutes": "ਮੌਨ ਕੀਤੇ ਵਰਤੋਂਕਾਰ",
@@ -434,16 +447,21 @@
   "notification_requests.edit_selection": "ਸੋਧੋ",
   "notification_requests.exit_selection": "ਮੁਕੰਮਲ",
   "notification_requests.notifications_from": "{name} ਵਲੋਂ ਨੋਟੀਫਿਕੇਸ਼ਨ",
+  "notification_requests.title": "ਫਿਲਟਰ ਕੀਤੇ ਨੋਟੀਫਿਕੇਸ਼ਨ",
+  "notifications.clear": "ਸੂਚਨਾਵਾਂ ਨੂੰ ਮਿਟਾਓ",
+  "notifications.clear_confirmation": "ਕੀ ਤੁਸੀਂ ਆਪਣੇ ਸਾਰੇ ਨੋਟੀਫਿਕੇਸ਼ਨਾਂ ਨੂੰ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?",
   "notifications.clear_title": "ਨੋਟਫਿਕੇਸ਼ਨਾਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?",
   "notifications.column_settings.admin.report": "ਨਵੀਆਂ ਰਿਪੋਰਟਾਂ:",
   "notifications.column_settings.alert": "ਡੈਸਕਟਾਪ ਸੂਚਨਾਵਾਂ",
   "notifications.column_settings.favourite": "ਮਨਪਸੰਦ:",
+  "notifications.column_settings.filter_bar.advanced": "ਸਭ ਵਰਗਾਂ ਨੂੰ ਵੇਖਾਓ",
   "notifications.column_settings.filter_bar.category": "ਫੌਰੀ ਫਿਲਟਰ ਪੱਟੀ",
   "notifications.column_settings.follow": "ਨਵੇਂ ਫ਼ਾਲੋਅਰ:",
   "notifications.column_settings.follow_request": "ਨਵੀਆਂ ਫ਼ਾਲੋ ਬੇਨਤੀਆਂ:",
   "notifications.column_settings.group": "ਗਰੁੱਪ",
   "notifications.column_settings.mention": "ਜ਼ਿਕਰ:",
   "notifications.column_settings.poll": "ਪੋਲ ਦੇ ਨਤੀਜੇ:",
+  "notifications.column_settings.push": "ਪੁਸ਼ ਨੋਟੀਫਿਕੇਸ਼ਨ",
   "notifications.column_settings.quote": "ਹਵਾਲੇ:",
   "notifications.column_settings.reblog": "ਬੂਸਟ:",
   "notifications.column_settings.show": "ਕਾਲਮ ਵਿੱਚ ਵੇਖਾਓ",
@@ -458,8 +476,10 @@
   "notifications.filter.follows": "ਫ਼ਾਲੋ",
   "notifications.filter.mentions": "ਜ਼ਿਕਰ",
   "notifications.filter.polls": "ਪੋਲ ਦੇ ਨਤੀਜੇ",
+  "notifications.filter.statuses": "ਤੁਹਾਡੇ ਵਲੋਂ ਫ਼ਾਲੋ ਕੀਤੇ ਲੋਕਾਂ ਤੋਂ ਅੱਪਡੇਟ",
   "notifications.grant_permission": "ਇਜਾਜ਼ਤ ਦਿਓ।",
   "notifications.group": "{count} ਨੋਟੀਫਿਕੇਸ਼ਨ",
+  "notifications.mark_as_read": "ਹਰ ਨੋਟੀਫਿਕੇਸ਼ਨ ਨੂੰ ਪੜ੍ਹੇ ਵਜੋਂ ਨਿਸ਼ਾਨੀ ਲਾਓ",
   "notifications.policy.accept": "ਮਨਜ਼ੂਰ",
   "notifications.policy.accept_hint": "ਨੋਟੀਫਿਕੇਸ਼ਨਾਂ ਵਿੱਚ ਵੇਖਾਓ",
   "notifications.policy.drop": "ਅਣਡਿੱਠਾ",
@@ -482,6 +502,7 @@
   "poll.voted": "ਤੁਸੀਂ ਇਸ ਜਵਾਬ ਲਈ ਵੋਟ ਕੀਤਾ",
   "privacy.change": "ਪੋਸਟ ਦੀ ਪਰਦੇਦਾਰੀ ਨੂੰ ਬਦਲੋ",
   "privacy.direct.long": "ਪੋਸਟ ਵਿੱਚ ਜ਼ਿਕਰ ਕੀਤੇ ਹਰ ਕੋਈ",
+  "privacy.direct.short": "ਨਿੱਜੀ ਜ਼ਿਕਰ",
   "privacy.private.long": "ਸਿਰਫ਼ ਤੁਹਾਡੇ ਫ਼ਾਲੋਅਰ ਹੀ",
   "privacy.private.short": "ਫ਼ਾਲੋਅਰ",
   "privacy.public.short": "ਜਨਤਕ",
@@ -511,6 +532,7 @@
   "report.category.title_account": "ਪਰੋਫਾਈਲ",
   "report.category.title_status": "ਪੋਸਟ",
   "report.close": "ਮੁਕੰਮਲ",
+  "report.forward": "{target} ਨੂੰ ਅੱਗੇ ਭੇਜੋ",
   "report.mute": "ਮੌਨ ਕਰੋ",
   "report.next": "ਅਗਲੀ",
   "report.placeholder": "ਵਧੀਕ ਟਿੱਪਣੀਆਂ",
@@ -528,6 +550,7 @@
   "report.unfollow": "@{name} ਨੂੰ ਅਣ-ਫ਼ਾਲੋ ਕਰੋ",
   "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
   "report_notification.categories.legal": "ਕਨੂੰਨੀ",
+  "report_notification.categories.legal_sentence": "ਗ਼ੈਰ-ਕਨੂੰਨੀ ਸਮੱਗਰੀ",
   "report_notification.categories.other": "ਬਾਕੀ",
   "report_notification.categories.other_sentence": "ਹੋਰ",
   "report_notification.categories.spam": "ਸਪੈਮ",
@@ -535,6 +558,7 @@
   "report_notification.categories.violation": "ਨਿਯਮ ਦੀ ਉਲੰਘਣਾ",
   "report_notification.categories.violation_sentence": "ਨਿਯਮ ਦੀ ਉਲੰਘਣਾ",
   "report_notification.open": "ਰਿਪੋਰਟ ਨੂੰ ਖੋਲ੍ਹੋ",
+  "search.clear": "ਖੋਜ ਨੂੰ ਸਾਫ਼ ਕਰੋ",
   "search.no_recent_searches": "ਕੋਈ ਸੱਜਰੀ ਖੋਜ ਨਹੀਂ ਹੈ",
   "search.placeholder": "ਖੋਜੋ",
   "search.quick_action.go_to_account": "ਪਰੋਫਾਈਲ {x} ਉੱਤੇ ਜਾਓ",
@@ -551,6 +575,7 @@
   "search_results.no_results": "ਕੋਈ ਨਤੀਜੇ ਨਹੀਂ ਹਨ।",
   "search_results.see_all": "ਸਭ ਵੇਖੋ",
   "search_results.statuses": "ਪੋਸਟਾਂ",
+  "search_results.title": "\"{q}\" ਨੂੰ ਖੋਜੋ",
   "server_banner.active_users": "ਸਰਗਰਮ ਵਰਤੋਂਕਾਰ",
   "sign_in_banner.create_account": "ਖਾਤਾ ਬਣਾਓ",
   "sign_in_banner.sign_in": "ਲਾਗਇਨ",
@@ -584,7 +609,8 @@
   "status.quote": "ਹਵਾਲਾ",
   "status.quote.cancel": "ਹਵਾਲੇ ਨੂੰ ਰੱਦ ਕਰੋ",
   "status.read_more": "ਹੋਰ ਪੜ੍ਹੋ",
-  "status.reblog": "ਵਧਾਓ",
+  "status.reblog": "ਬੂਸਟ",
+  "status.reblog_or_quote": "ਬੂਸਟ ਜਾਂ ਹਵਾਲਾ",
   "status.reblogged_by": "{name} ਨੇ ਬੂਸਟ ਕੀਤਾ",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.redraft": "ਹਟਾਓ ਤੇ ਮੁੜ-ਡਰਾਫਟ",

app/javascript/mastodon/locales/pl.json

@@ -173,6 +173,7 @@
   "column.edit_list": "Edytuj listę",
   "column.favourites": "Ulubione",
   "column.firehose": "Aktualności",
+  "column.firehose_singular": "Na żywo",
   "column.follow_requests": "Prośby o obserwację",
   "column.home": "Strona główna",
   "column.list_members": "Zarządzaj osobami na liście",

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

@@ -4,7 +4,7 @@
   "about.default_locale": "Padrão",
   "about.disclaimer": "Mastodon é um software de código aberto e livre, e uma marca registrada de Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Razão não disponível",
-  "about.domain_blocks.preamble": "O Mastodon geralmente permite que você veja o conteúdo e interaja com usuários de qualquer outro servidor no fediverso. Estas são as exceções deste servidor em específico.",
+  "about.domain_blocks.preamble": "O \"Mastodon\" geralmente permite que você veja o conteúdo e interaja com usuários de qualquer outro servidor no \"fediverso\". Estas são as exceções deste servidor em específico.",
   "about.domain_blocks.silenced.explanation": "Você geralmente não verá perfis e conteúdo deste servidor, a menos que você o procure explicitamente ou opte por seguir.",
   "about.domain_blocks.silenced.title": "Limitado",
   "about.domain_blocks.suspended.explanation": "Nenhum dado desse servidor será processado, armazenado ou trocado, impossibilitando qualquer interação ou comunicação com os usuários deste servidor.",
@@ -45,21 +45,21 @@
   "account.follow_request": "Pedir para seguir",
   "account.follow_request_cancel": "Cancelar solicitação",
   "account.follow_request_cancel_short": "Cancelar",
-  "account.follow_request_short": "Solicitação",
+  "account.follow_request_short": "Solicitar",
   "account.followers": "Seguidores",
   "account.followers.empty": "Nada aqui.",
   "account.followers_counter": "{count, plural, one {{counter} seguidor} other {{counter} seguidores}}",
-  "account.followers_you_know_counter": "{counter} que você sabe",
+  "account.followers_you_know_counter": "{counter} que você conhece",
   "account.following": "Seguindo",
   "account.following_counter": "{count, plural, one {{counter} seguindo} other {{counter} seguindo}}",
   "account.follows.empty": "Nada aqui.",
   "account.follows_you": "Segue você",
   "account.go_to_profile": "Ir ao perfil",
-  "account.hide_reblogs": "Ocultar boosts de @{name}",
+  "account.hide_reblogs": "Ocultar impulsionamentos de @{name}",
   "account.in_memoriam": "Em memória.",
   "account.joined_short": "Entrou",
   "account.languages": "Mudar idiomas inscritos",
-  "account.link_verified_on": "link verificado em {date}",
+  "account.link_verified_on": "A propriedade deste link foi verificada em {date}",
   "account.locked_info": "Trancado. Seguir requer aprovação manual do perfil.",
   "account.media": "Mídia",
   "account.mention": "Mencionar @{name}",
@@ -79,7 +79,7 @@
   "account.requested_follow": "{name} quer te seguir",
   "account.requests_to_follow_you": "Pediu para seguir você",
   "account.share": "Compartilhar perfil de @{name}",
-  "account.show_reblogs": "Mostrar boosts de @{name}",
+  "account.show_reblogs": "Mostrar impulsionamentos de @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} publicação} other {{counter} publicações}}",
   "account.unblock": "Desbloquear @{name}",
   "account.unblock_domain": "Desbloquear domínio {domain}",
@@ -98,7 +98,7 @@
   "admin.dashboard.retention.cohort_size": "Novos usuários",
   "admin.impact_report.instance_accounts": "Perfis de contas que isso apagaria",
   "admin.impact_report.instance_followers": "Seguidores que os nossos usuários perderiam",
-  "admin.impact_report.instance_follows": "Seguidores que os seus usuários perderiam",
+  "admin.impact_report.instance_follows": "Seguidores que os usuários deles perderiam",
   "admin.impact_report.title": "Resumo do impacto",
   "alert.rate_limited.message": "Tente novamente após {retry_time, time, medium}.",
   "alert.rate_limited.title": "Tentativas limitadas",
@@ -109,8 +109,8 @@
   "alt_text_modal.add_text_from_image": "Adicione texto da imagem",
   "alt_text_modal.cancel": "Cancelar",
   "alt_text_modal.change_thumbnail": "Alterar miniatura",
-  "alt_text_modal.describe_for_people_with_hearing_impairments": "Descreva isso para pessoas com deficiências auditivas...",
-  "alt_text_modal.describe_for_people_with_visual_impairments": "Descreva isso para pessoas com deficiências visuais…",
+  "alt_text_modal.describe_for_people_with_hearing_impairments": "Descreva isso para pessoas com deficiências auditivas…",
+  "alt_text_modal.describe_for_people_with_visual_impairments": "Descreva isto para pessoas com deficiências visuais…",
   "alt_text_modal.done": "Feito",
   "announcement.announcement": "Comunicados",
   "annual_report.summary.archetype.booster": "Caçador legal",
@@ -120,7 +120,7 @@
   "annual_report.summary.archetype.replier": "A borboleta social",
   "annual_report.summary.followers.followers": "seguidores",
   "annual_report.summary.followers.total": "{count} total",
-  "annual_report.summary.here_it_is": "Aqui está seu {year} em revisão:",
+  "annual_report.summary.here_it_is": "Aqui está seu {year} em retrospectiva:",
   "annual_report.summary.highlighted_post.by_favourites": "publicação mais favoritada",
   "annual_report.summary.highlighted_post.by_reblogs": "publicação mais impulsionada",
   "annual_report.summary.highlighted_post.by_replies": "publicação com mais respostas",
@@ -130,21 +130,21 @@
   "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.percentile.we_wont_tell_bernie": "Não contaremos ao Bernie.",
   "annual_report.summary.thanks": "Obrigada por fazer parte do Mastodon!",
   "attachments_list.unprocessed": "(não processado)",
   "audio.hide": "Ocultar áudio",
-  "block_modal.remote_users_caveat": "Pediremos ao servidor {domain} que respeite sua decisão. No entanto, a conformidade não é garantida, já que alguns servidores podem lidar com bloqueios de maneira diferente. As postagens públicas ainda podem estar visíveis para usuários não logados.",
+  "block_modal.remote_users_caveat": "Pediremos ao servidor {domain} que respeite sua decisão. No entanto, a conformidade não é garantida, já que alguns servidores podem lidar com bloqueios de maneira diferente. As publicações públicas ainda podem estar visíveis para usuários não logados.",
   "block_modal.show_less": "Mostrar menos",
   "block_modal.show_more": "Mostrar mais",
-  "block_modal.they_cant_mention": "Eles não podem mencionar ou seguir você.",
-  "block_modal.they_cant_see_posts": "Eles não podem ver suas postagens e você não verá as deles.",
-  "block_modal.they_will_know": "Eles podem ver que estão bloqueados.",
+  "block_modal.they_cant_mention": "Não poderá mencionar ou seguir você.",
+  "block_modal.they_cant_see_posts": "Não poderá ver suas publicações e você não verá as dele/a.",
+  "block_modal.they_will_know": "Poderá ver que você bloqueou.",
   "block_modal.title": "Bloquear usuário?",
-  "block_modal.you_wont_see_mentions": "Você não verá publicações que os mencionem.",
-  "boost_modal.combo": "Pressione {combo} para pular isso na próxima vez",
+  "block_modal.you_wont_see_mentions": "Você não verá publicações que mencionem o usuário.",
+  "boost_modal.combo": "Pressione {combo} para pular isto na próxima vez",
   "boost_modal.reblog": "Impulsionar a publicação?",
-  "boost_modal.undo_reblog": "Retirar o impulsionamento do post?",
+  "boost_modal.undo_reblog": "Retirar o impulso do post?",
   "bundle_column_error.copy_stacktrace": "Copiar relatório do erro",
   "bundle_column_error.error.body": "A página solicitada não pôde ser renderizada. Pode ser devido a um erro no nosso código, ou um problema de compatibilidade do seu navegador.",
   "bundle_column_error.error.title": "Ah, não!",
@@ -194,12 +194,12 @@
   "community.column_settings.local_only": "Somente local",
   "community.column_settings.media_only": "Somente mídia",
   "community.column_settings.remote_only": "Somente global",
-  "compose.error.blank_post": "A postagem não pode estar em branco.",
+  "compose.error.blank_post": "A publicação não pode estar em branco.",
   "compose.language.change": "Alterar idioma",
   "compose.language.search": "Pesquisar idiomas...",
   "compose.published.body": "Publicado.",
   "compose.published.open": "Abrir",
-  "compose.saved.body": "Postagem salva.",
+  "compose.saved.body": "Publicação salva.",
   "compose_form.direct_message_warning_learn_more": "Saiba mais",
   "compose_form.encryption_warning": "As publicações no Mastodon não são criptografadas de ponta-a-ponta. Não compartilhe nenhuma informação sensível no Mastodon.",
   "compose_form.hashtag_warning": "Esta publicação não será exibida sob nenhuma hashtag, já que não é pública. Apenas postagens públicas podem ser pesquisadas por meio de hashtags.",
@@ -215,7 +215,7 @@
   "compose_form.poll.type": "Estilo",
   "compose_form.publish": "Publicar",
   "compose_form.reply": "Responder",
-  "compose_form.save_changes": "Atualização",
+  "compose_form.save_changes": "Atualizar",
   "compose_form.spoiler.marked": "Com Aviso de Conteúdo",
   "compose_form.spoiler.unmarked": "Sem Aviso de Conteúdo",
   "compose_form.spoiler_placeholder": "Aviso de conteúdo (opcional)",
@@ -229,11 +229,11 @@
   "confirmations.delete_list.title": "Excluir lista?",
   "confirmations.discard_draft.confirm": "Descartar e continuar",
   "confirmations.discard_draft.edit.cancel": "Continuar editando",
-  "confirmations.discard_draft.edit.message": "Continuar vai descartar quaisquer mudanças feitas ao post sendo editado.",
-  "confirmations.discard_draft.edit.title": "Descartar mudanças no seu post?",
+  "confirmations.discard_draft.edit.message": "Continuar vai descartar quaisquer mudanças feitas à publicação sendo editada.",
+  "confirmations.discard_draft.edit.title": "Descartar mudanças na sua publicação?",
   "confirmations.discard_draft.post.cancel": "Continuar rascunho",
   "confirmations.discard_draft.post.message": "Continuar eliminará a publicação que está sendo elaborada no momento.",
-  "confirmations.discard_draft.post.title": "Eliminar seu esboço de publicação?",
+  "confirmations.discard_draft.post.title": "Eliminar seu rascunho de publicação?",
   "confirmations.discard_edit_media.confirm": "Descartar",
   "confirmations.discard_edit_media.message": "Há mudanças não salvas na descrição ou pré-visualização da mídia. Descartar assim mesmo?",
   "confirmations.follow_to_list.confirm": "Seguir e adicionar à lista",
@@ -244,34 +244,34 @@
   "confirmations.logout.title": "Sair da sessão?",
   "confirmations.missing_alt_text.confirm": "Adicione texto alternativo",
   "confirmations.missing_alt_text.message": "Seu post contém mídia sem texto alternativo. Adicionar descrições ajuda a tornar seu conteúdo acessível para mais pessoas.",
-  "confirmations.missing_alt_text.secondary": "Postar mesmo assim",
+  "confirmations.missing_alt_text.secondary": "Publicar mesmo assim",
   "confirmations.missing_alt_text.title": "Adicionar texto alternativo?",
   "confirmations.mute.confirm": "Silenciar",
   "confirmations.private_quote_notify.cancel": "Voltar à edição",
-  "confirmations.private_quote_notify.confirm": "Publicar postagem",
+  "confirmations.private_quote_notify.confirm": "Publicar citação",
   "confirmations.private_quote_notify.do_not_show_again": "Não me mostre esta mensagem novamente",
-  "confirmations.private_quote_notify.message": "A pessoa que está citando e outras menções serão notificadas e poderão ver sua postagem, mesmo que não sigam você.",
+  "confirmations.private_quote_notify.message": "A pessoa que está sendo citada e outras mencionadas serão notificadas e poderão ver sua publicação, mesmo que não sigam você.",
   "confirmations.private_quote_notify.title": "Compartilhar com seguidores e usuários mencionados?",
   "confirmations.quiet_post_quote_info.dismiss": "Não me lembrar novamente",
   "confirmations.quiet_post_quote_info.got_it": "Entendi",
   "confirmations.quiet_post_quote_info.message": "Ao citar uma publicação pública silenciosa, sua postagem será oculta das linhas de tempo em tendência.",
   "confirmations.quiet_post_quote_info.title": "Citando publicações públicas silenciadas",
   "confirmations.redraft.confirm": "Excluir e rascunhar",
-  "confirmations.redraft.message": "Você tem certeza de que quer apagar essa postagem e rascunhá-la? Favoritos e impulsos serão perdidos, e respostas à postagem original ficarão órfãs.",
+  "confirmations.redraft.message": "Você tem certeza de que quer apagar essa publicação e rascunhá-la? Favoritos e impulsos serão perdidos, e respostas à postagem original ficarão órfãs.",
   "confirmations.redraft.title": "Excluir e rascunhar publicação?",
   "confirmations.remove_from_followers.confirm": "Remover seguidor",
   "confirmations.remove_from_followers.message": "{name} vai parar de te seguir. Tem certeza de que deseja continuar?",
   "confirmations.remove_from_followers.title": "Remover seguidor?",
   "confirmations.revoke_quote.confirm": "Remover publicação",
-  "confirmations.revoke_quote.message": "Essa ação não pode ser desfeita.",
+  "confirmations.revoke_quote.message": "Esta ação não pode ser desfeita.",
   "confirmations.revoke_quote.title": "Remover publicação?",
   "confirmations.unblock.confirm": "Desbloquear",
   "confirmations.unblock.title": "Desbloquear {name}?",
   "confirmations.unfollow.confirm": "Deixar de seguir",
   "confirmations.unfollow.title": "Deixar de seguir {name}?",
   "confirmations.withdraw_request.confirm": "Retirar solicitação",
-  "confirmations.withdraw_request.title": "Cancelar solicitação para seguir {name}?",
-  "content_warning.hide": "Ocultar post",
+  "confirmations.withdraw_request.title": "Retirar solicitação para seguir {name}?",
+  "content_warning.hide": "Ocultar publicação",
   "content_warning.show": "Mostrar mesmo assim",
   "content_warning.show_more": "Mostrar mais",
   "conversation.delete": "Excluir conversa",
@@ -289,9 +289,9 @@
   "disabled_account_banner.text": "Sua conta {disabledAccount} está desativada no momento.",
   "dismissable_banner.community_timeline": "Estas são as publicações públicas mais recentes das pessoas cujas contas são hospedadas por {domain}.",
   "dismissable_banner.dismiss": "Dispensar",
-  "dismissable_banner.public_timeline": "Estas são as publicações mais recentes das pessoas no fediverse que as pessoas do {domain} seguem.",
+  "dismissable_banner.public_timeline": "Estas são as publicações mais recentes das pessoas no fediverso que as pessoas do {domain} seguem.",
   "domain_block_modal.block": "Bloquear servidor",
-  "domain_block_modal.block_account_instead": "Bloquear @{name}",
+  "domain_block_modal.block_account_instead": "Bloquear @{name} em vez disso",
   "domain_block_modal.they_can_interact_with_old_posts": "Pessoas deste servidor podem interagir com suas publicações antigas.",
   "domain_block_modal.they_cant_follow": "Ninguém deste servidor pode lhe seguir.",
   "domain_block_modal.they_wont_know": "Eles não saberão que foram bloqueados.",
@@ -302,8 +302,8 @@
   "domain_pill.activitypub_lets_connect": "Ele permite que você se conecte e interaja com pessoas não apenas no Mastodon, mas também em diferentes aplicativos sociais.",
   "domain_pill.activitypub_like_language": "ActivityPub é como a linguagem que o Mastodon fala com outras redes sociais.",
   "domain_pill.server": "Servidor",
-  "domain_pill.their_handle": "Seu identificador:",
-  "domain_pill.their_server": "Sua casa digital, onde ficam todas as suas postagens.",
+  "domain_pill.their_handle": "Identificador dele/a:",
+  "domain_pill.their_server": "Casa digital dele/a, onde ficam todas as suas postagens.",
   "domain_pill.their_username": "Seu identificador exclusivo em seu servidor. É possível encontrar usuários com o mesmo nome de usuário em servidores diferentes.",
   "domain_pill.username": "Nome de usuário",
   "domain_pill.whats_in_a_handle": "O que há em um identificador?",
@@ -423,8 +423,8 @@
   "generic.saved": "Salvo",
   "getting_started.heading": "Primeiros passos",
   "hashtag.admin_moderation": "Abrir interface de moderação para #{name}",
-  "hashtag.browse": "Buscar postagens em #{hashtag}",
-  "hashtag.browse_from_account": "Procurar mensagens de @{name} em #{hashtag}",
+  "hashtag.browse": "Buscar publicações em #{hashtag}",
+  "hashtag.browse_from_account": "Buscar publicações de @{name} em #{hashtag}",
   "hashtag.column_header.tag_mode.all": "e {additional}",
   "hashtag.column_header.tag_mode.any": "ou {additional}",
   "hashtag.column_header.tag_mode.none": "sem {additional}",
@@ -443,14 +443,14 @@
   "hashtag.unfeature": "Não destacar no perfil",
   "hashtag.unfollow": "Parar de seguir hashtag",
   "hashtags.and_other": "…e {count, plural, one {}other {outros #}}",
-  "hints.profiles.followers_may_be_missing": "Os seguidores deste perfil podem estar faltando.",
-  "hints.profiles.follows_may_be_missing": "Os seguidores deste perfil podem estar faltando.",
+  "hints.profiles.followers_may_be_missing": "Pode haver seguidores deste perfil faltando.",
+  "hints.profiles.follows_may_be_missing": "Pode haver seguidos por este perfil faltando.",
   "hints.profiles.posts_may_be_missing": "É possível que algumas publicações deste perfil estejam faltando.",
   "hints.profiles.see_more_followers": "Ver mais seguidores no {domain}",
-  "hints.profiles.see_more_follows": "Ver mais seguidores no {domain}",
+  "hints.profiles.see_more_follows": "Ver mais seguidos no {domain}",
   "hints.profiles.see_more_posts": "Ver mais publicações em {domain}",
   "home.column_settings.show_quotes": "Mostrar citações",
-  "home.column_settings.show_reblogs": "Mostrar boosts",
+  "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respostas",
   "home.hide_announcements": "Ocultar comunicados",
   "home.pending_critical_update.body": "Por favor, atualize o seu servidor Mastodon o mais rápido possível!",
@@ -482,7 +482,7 @@
   "intervals.full.minutes": "{number, plural, one {# minuto} other {# minutos}}",
   "keyboard_shortcuts.back": "voltar",
   "keyboard_shortcuts.blocked": "abrir usuários bloqueados",
-  "keyboard_shortcuts.boost": "dar boost",
+  "keyboard_shortcuts.boost": "Impulsionar a publicação",
   "keyboard_shortcuts.column": "focar na coluna",
   "keyboard_shortcuts.compose": "focar no compositor",
   "keyboard_shortcuts.description": "Descrição",
@@ -606,7 +606,7 @@
   "notification.admin.report_statuses_other": "{name} denunciou {target}",
   "notification.admin.sign_up": "{name} se inscreveu",
   "notification.admin.sign_up.name_and_others": "{name} e {count, plural, one {# other} other {# outros}}",
-  "notification.annual_report.message": "O #Wrapstodon do seu {year} está esperando! Desvende seus destaques do ano e momentos memoráveis no Mastodon!",
+  "notification.annual_report.message": "O seu #Wrapstodon de {year} está esperando! Desvende seus destaques do ano e momentos memoráveis no Mastodon!",
   "notification.annual_report.view": "Ver #Wrapstodon",
   "notification.favourite": "{name} favoritou sua publicação",
   "notification.favourite.name_and_others_with_link": "{name} e <a>{count, plural, one {# outro} other {# others}}</a> favoritaram a publicação",
@@ -634,8 +634,8 @@
   "notification.moderation_warning.action_suspend": "Sua conta foi suspensa.",
   "notification.own_poll": "Sua enquete terminou",
   "notification.poll": "Uma enquete que você votou terminou",
-  "notification.quoted_update": "{name} Editou um post seu",
-  "notification.reblog": "{name} deu boost no teu toot",
+  "notification.quoted_update": "{name} editou uma pulicação que você citou",
+  "notification.reblog": "{name} impulsionou sua publicação",
   "notification.reblog.name_and_others_with_link": "{name} e <a>{count, plural, one {# outra} other {# outras}}</a> impulsionaram a publicação",
   "notification.relationships_severance_event": "Conexões perdidas com {name}",
   "notification.relationships_severance_event.account_suspension": "Um administrador de {from} suspendeu {target}, o que significa que você não pode mais receber atualizações deles ou interagir com eles.",
@@ -679,7 +679,7 @@
   "notifications.column_settings.poll": "Enquetes:",
   "notifications.column_settings.push": "Notificações push",
   "notifications.column_settings.quote": "Citações:",
-  "notifications.column_settings.reblog": "Boosts:",
+  "notifications.column_settings.reblog": "Impulsos:",
   "notifications.column_settings.show": "Mostrar na coluna",
   "notifications.column_settings.sound": "Tocar som",
   "notifications.column_settings.status": "Novos toots:",
@@ -687,7 +687,7 @@
   "notifications.column_settings.unread_notifications.highlight": "Destacar notificações não lidas",
   "notifications.column_settings.update": "Editar:",
   "notifications.filter.all": "Tudo",
-  "notifications.filter.boosts": "Boosts",
+  "notifications.filter.boosts": "Impulsionamentos",
   "notifications.filter.favourites": "Favoritos",
   "notifications.filter.follows": "Seguidores",
   "notifications.filter.mentions": "Menções",
@@ -759,14 +759,14 @@
   "privacy.quote.limited": "{visibility} Citações limitadas",
   "privacy.unlisted.additional": "Isso se comporta exatamente como público, exceto que a publicação não aparecerá nos _feeds ao vivo_ ou nas _hashtags_, explorar, ou barra de busca, mesmo que você seja escolhido em toda a conta.",
   "privacy.unlisted.long": "Oculto para os resultados de pesquisa do Mastodon, tendências e linhas do tempo públicas",
-  "privacy.unlisted.short": "Público silenciado",
+  "privacy.unlisted.short": "Público silencioso",
   "privacy_policy.last_updated": "Atualizado {date}",
   "privacy_policy.title": "Política de privacidade",
   "quote_error.edit": "Citações não podem ser adicionadas durante a edição de uma publicação.",
   "quote_error.poll": "Citações não permitidas com enquetes.",
   "quote_error.private_mentions": "Citações não são permitidas com menções diretas.",
-  "quote_error.quote": "Apenas uma citação por vez é permitido.",
-  "quote_error.unauthorized": "Você não é autorizado a citar essa publicação.",
+  "quote_error.quote": "Somente é permitida uma citação por vez.",
+  "quote_error.unauthorized": "Você não tem autorização para citar essa publicação.",
   "quote_error.upload": "Citações não são permitidas com mídias anexadas.",
   "recommended": "Recomendado",
   "refresh": "Atualizar",
@@ -877,12 +877,12 @@
   "status.admin_account": "Abrir interface de moderação para @{name}",
   "status.admin_domain": "Abrir interface de moderação para {domain}",
   "status.admin_status": "Abrir este toot na interface de moderação",
-  "status.all_disabled": "Acelerações e citações estão desabilitados",
+  "status.all_disabled": "Impulsos e citações estão desabilitados",
   "status.block": "Bloquear @{name}",
   "status.bookmark": "Salvar",
-  "status.cancel_reblog_private": "Desfazer boost",
+  "status.cancel_reblog_private": "Desfazer impulso",
   "status.cannot_quote": "Você não tem permissão para citar esta publicação",
-  "status.cannot_reblog": "Este toot não pode receber boost",
+  "status.cannot_reblog": "Esta publicação não pode ser impulsionada",
   "status.contains_quote": "Contém citação",
   "status.context.loading": "Carregando mais respostas",
   "status.context.loading_error": "Não foi possível carregar novas respostas",
@@ -901,7 +901,7 @@
   "status.edited": "Última edição em {date}",
   "status.edited_x_times": "Editado {count, plural, one {{count} hora} other {{count} vezes}}",
   "status.embed": "Obter código de incorporação",
-  "status.favourite": "Favorita",
+  "status.favourite": "Favoritar",
   "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filtrar esta publicação",
   "status.history.created": "{name} criou {date}",
@@ -934,17 +934,17 @@
   "status.quote_policy_change": "Mude quem pode citar",
   "status.quote_post_author": "Publicação citada por @{name}",
   "status.quote_private": "Publicações privadas não podem ser citadas",
-  "status.quotes": "{count, plural, one {# voto} other {# votos}}",
+  "status.quotes": "{count, plural, one {# citação} other {# citações}}",
   "status.quotes.empty": "Ninguém citou essa publicação até agora. Quando alguém citar aparecerá aqui.",
   "status.quotes.local_other_disclaimer": "Citações rejeitadas pelo autor não serão exibidas.",
   "status.quotes.remote_other_disclaimer": "Apenas citações do {domain} têm a garantia de serem exibidas aqui. Citações rejeitadas pelo autor não serão exibidas.",
   "status.read_more": "Ler mais",
-  "status.reblog": "Dar boost",
-  "status.reblog_or_quote": "Acelerar ou citar",
+  "status.reblog": "Impulsionar",
+  "status.reblog_or_quote": "Impulsionar ou citar",
   "status.reblog_private": "Compartilhar novamente com seus seguidores",
-  "status.reblogged_by": "{name} deu boost",
+  "status.reblogged_by": "{name} impulsionou",
   "status.reblogs": "{count, plural, one {boost} other {boosts}}",
-  "status.reblogs.empty": "Nada aqui. Quando alguém der boost, o usuário aparecerá aqui.",
+  "status.reblogs.empty": "Ninguém impulsionou esta publicação ainda. Quando alguém o fizer, o usuário aparecerá aqui.",
   "status.redraft": "Excluir e rascunhar",
   "status.remove_bookmark": "Remover do Salvos",
   "status.remove_favourite": "Remover dos favoritos",
@@ -1019,7 +1019,7 @@
   "video.volume_up": "Aumentar o volume",
   "visibility_modal.button_title": "Selecionar Visibilidade",
   "visibility_modal.direct_quote_warning.text": "Se salvar as configurações atuais, a cotação incorporada será convertida em um link.",
-  "visibility_modal.direct_quote_warning.title": "Cotações não podem ser incorporadas em menções privadas",
+  "visibility_modal.direct_quote_warning.title": "Citações não podem ser incorporadas em menções privadas",
   "visibility_modal.header": "Visibilidade e interação",
   "visibility_modal.helper.direct_quoting": "Menções privadas escritas no Mastodon.",
   "visibility_modal.helper.privacy_editing": "A visibilidade não pode ser alterada após uma publicação ser publicada.",

app/javascript/mastodon/locales/ru.json

@@ -629,7 +629,7 @@
   "notification.moderation_warning.action_disable": "Ваша учётная запись была отключена.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Некоторые ваши посты были отмечены как содержимое деликатного характера.",
   "notification.moderation_warning.action_none": "Модераторы вынесли вам предупреждение.",
-  "notification.moderation_warning.action_sensitive": "С этого момента все ваши новые посты будут отмечены как содержимое деликатного характера.",
+  "notification.moderation_warning.action_sensitive": "С этого момента все ваши посты будут отмечены как содержимое деликатного характера.",
   "notification.moderation_warning.action_silence": "Ваша учётная запись была ограничена.",
   "notification.moderation_warning.action_suspend": "Ваша учётная запись была заблокирована.",
   "notification.own_poll": "Ваш опрос завершился",

app/javascript/mastodon/locales/sk.json

@@ -227,7 +227,9 @@
   "confirmations.delete_list.title": "Vymazať zoznam?",
   "confirmations.discard_draft.confirm": "Zahodiť a pokračovať",
   "confirmations.discard_draft.edit.cancel": "Pokračovať v úpravách",
+  "confirmations.discard_draft.edit.title": "Zahodiť zmeny v tvojom príspevku?",
   "confirmations.discard_draft.post.cancel": "Pokračuj v rozpísanom",
+  "confirmations.discard_draft.post.title": "Zahodiť tvoj rozpísaný príspevok?",
   "confirmations.discard_edit_media.confirm": "Zahodiť",
   "confirmations.discard_edit_media.message": "Máte neuložené zmeny v popise alebo náhľade média, zahodiť ich aj tak?",
   "confirmations.follow_to_list.confirm": "Nasleduj a pridaj do zoznamu",
@@ -244,7 +246,9 @@
   "confirmations.private_quote_notify.cancel": "Späť na úpravu",
   "confirmations.private_quote_notify.confirm": "Zverejni príspevok",
   "confirmations.private_quote_notify.do_not_show_again": "Neukazuj mi túto spravu znova",
+  "confirmations.private_quote_notify.title": "Zdieľať z nasledovateľmi a spomenutými užívateľmi?",
   "confirmations.quiet_post_quote_info.dismiss": "Nepripomínaj mi znova",
+  "confirmations.quiet_post_quote_info.got_it": "Mám to",
   "confirmations.redraft.confirm": "Vymazať a prepísať",
   "confirmations.redraft.message": "Určite chcete tento príspevok vymazať a prepísať? Prídete o jeho zdieľania a ohviezdičkovania a odpovede na pôvodný príspevok budú odlúčené.",
   "confirmations.redraft.title": "Vymazať a prepísať príspevok?",

app/javascript/mastodon/locales/sl.json

@@ -1,6 +1,7 @@
 {
   "about.blocks": "Moderirani strežniki",
   "about.contact": "Stik:",
+  "about.default_locale": "Privzeto",
   "about.disclaimer": "Mastodon je prosto, odprtokodno programje in blagovna znamka podjetja Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Razlog ni na voljo",
   "about.domain_blocks.preamble": "Mastodon vam na splošno omogoča ogled vsebin in interakcijo z uporabniki z vseh drugih strežnikov v fediverzumu. Tu so navedene izjeme, ki jih postavlja ta strežnik.",
@@ -8,6 +9,7 @@
   "about.domain_blocks.silenced.title": "Omejeno",
   "about.domain_blocks.suspended.explanation": "Nobeni podatki s tega strežnika ne bodo obdelani, shranjeni ali izmenjani, zaradi česar je nemogoča kakršna koli interakcija ali komunikacija z uporabniki s tega strežnika.",
   "about.domain_blocks.suspended.title": "Suspendiran",
+  "about.language_label": "Jezik",
   "about.not_available": "Ti podatki še niso na voljo na tem strežniku.",
   "about.powered_by": "Decentraliziran družabni medij, ki ga poganja {mastodon}",
   "about.rules": "Pravila strežnika",
@@ -24,18 +26,27 @@
   "account.direct": "Zasebno omeni @{name}",
   "account.disable_notifications": "Ne obveščaj me več, ko ima @{name} novo objavo",
   "account.edit_profile": "Uredi profil",
+  "account.edit_profile_short": "Uredi",
   "account.enable_notifications": "Obvesti me, ko ima @{name} novo objavo",
   "account.endorse": "Izpostavi v profilu",
+  "account.familiar_followers_one": "Sledi {name1}",
+  "account.featured": "Izpostavljeni",
+  "account.featured.accounts": "Profili",
+  "account.featured.hashtags": "Ključniki",
   "account.featured_tags.last_status_at": "Zadnja objava {date}",
   "account.featured_tags.last_status_never": "Ni objav",
   "account.follow": "Sledi",
   "account.follow_back": "Sledi nazaj",
+  "account.follow_back_short": "Sledi nazaj",
+  "account.follow_request_cancel": "Prekliči zahtevo",
+  "account.follow_request_cancel_short": "Prekliči",
   "account.followers": "Sledilci",
   "account.followers.empty": "Nihče še ne sledi temu uporabniku.",
   "account.followers_counter": "{count, plural, one {{counter} sledilec} two {{counter} sledilca} few {{counter} sledilci} other {{counter} sledilcev}}",
   "account.following": "Sledim",
   "account.following_counter": "{count, plural, one {{counter} sleden} two {{counter} sledena} few {{counter} sledeni} other {{counter} sledenih}}",
   "account.follows.empty": "Ta uporabnik še ne sledi nikomur.",
+  "account.follows_you": "Vam sledi",
   "account.go_to_profile": "Pojdi na profil",
   "account.hide_reblogs": "Skrij izpostavitve od @{name}",
   "account.in_memoriam": "V spomin.",
@@ -50,6 +61,7 @@
   "account.mute_notifications_short": "Utišaj obvestila",
   "account.mute_short": "Utišaj",
   "account.muted": "Utišan",
+  "account.mutual": "Drug drugemu sledita",
   "account.no_bio": "Ni opisa.",
   "account.open_original_page": "Odpri izvirno stran",
   "account.posts": "Objave",
@@ -61,6 +73,7 @@
   "account.statuses_counter": "{count, plural, one {{counter} objava} two {{counter} objavi} few {{counter} objave} other {{counter} objav}}",
   "account.unblock": "Odblokiraj @{name}",
   "account.unblock_domain": "Odblokiraj domeno {domain}",
+  "account.unblock_domain_short": "Odblokiraj",
   "account.unblock_short": "Odblokiraj",
   "account.unendorse": "Ne vključi v profil",
   "account.unfollow": "Ne sledi več",
@@ -150,6 +163,8 @@
   "column.edit_list": "Uredi seznam",
   "column.favourites": "Priljubljeni",
   "column.firehose": "Viri v živo",
+  "column.firehose_local": "Vir v živo za ta strežnik",
+  "column.firehose_singular": "Vir v živo",
   "column.follow_requests": "Prošnje za sledenje",
   "column.home": "Domov",
   "column.list_members": "Upravljaj člane seznama",
@@ -169,6 +184,7 @@
   "community.column_settings.local_only": "Samo krajevno",
   "community.column_settings.media_only": "Samo predstavnosti",
   "community.column_settings.remote_only": "Samo oddaljeno",
+  "compose.error.blank_post": "Objava ne sme biti prazna",
   "compose.language.change": "Spremeni jezik",
   "compose.language.search": "Poišči jezike ...",
   "compose.published.body": "Objavljeno.",
@@ -201,6 +217,8 @@
   "confirmations.delete_list.confirm": "Izbriši",
   "confirmations.delete_list.message": "Ali ste prepričani, da želite trajno izbrisati ta seznam?",
   "confirmations.delete_list.title": "Želite izbrisati seznam?",
+  "confirmations.discard_draft.edit.cancel": "Nadaljuj z urejanjem",
+  "confirmations.discard_draft.post.cancel": "Nadaljuj na osnutku",
   "confirmations.discard_edit_media.confirm": "Opusti",
   "confirmations.discard_edit_media.message": "Spremenjenega opisa predstavnosti ali predogleda niste shranili. Želite spremembe kljub temu opustiti?",
   "confirmations.follow_to_list.confirm": "Sledi in dodaj na seznam",
@@ -214,10 +232,24 @@
   "confirmations.missing_alt_text.secondary": "Vseeno objavi",
   "confirmations.missing_alt_text.title": "Dodam nadomestno besedilo?",
   "confirmations.mute.confirm": "Utišaj",
+  "confirmations.private_quote_notify.cancel": "Nazaj k urejanju",
+  "confirmations.private_quote_notify.confirm": "Objavi objavo",
+  "confirmations.private_quote_notify.do_not_show_again": "Ne prikazuj mi več tega sporočila",
+  "confirmations.quiet_post_quote_info.dismiss": "Ne opominjaj me več",
+  "confirmations.quiet_post_quote_info.got_it": "Razumem",
   "confirmations.redraft.confirm": "Izbriši in preoblikuj",
   "confirmations.redraft.message": "Ali ste prepričani, da želite izbrisati to objavo in jo preoblikovati? Izkazi priljubljenosti in izpostavitve bodo izgubljeni, odgovori na izvirno objavo pa bodo osiroteli.",
   "confirmations.redraft.title": "Želite izbrisati in preoblikovati objavo?",
+  "confirmations.remove_from_followers.confirm": "Odstrani sledilca",
+  "confirmations.remove_from_followers.title": "Ali želite odstraniti sledilca?",
+  "confirmations.revoke_quote.confirm": "Odstrani objavo",
+  "confirmations.revoke_quote.message": "Tega dejanja ni možno povrniti.",
+  "confirmations.revoke_quote.title": "Ali želite odstraniti objavo?",
+  "confirmations.unblock.confirm": "Odblokiraj",
+  "confirmations.unblock.title": "Ali želite odblokirati {name}?",
   "confirmations.unfollow.confirm": "Ne sledi več",
+  "confirmations.unfollow.title": "Ali želite prenehati slediti {name}?",
+  "confirmations.withdraw_request.confirm": "Umakni zahtevo",
   "content_warning.hide": "Skrij objavo",
   "content_warning.show": "Vseeno pokaži",
   "content_warning.show_more": "Pokaži več",
@@ -304,9 +336,14 @@
   "errors.unexpected_crash.copy_stacktrace": "Kopiraj sled sklada na odložišče",
   "errors.unexpected_crash.report_issue": "Prijavi težavo",
   "explore.suggested_follows": "Ljudje",
+  "explore.title": "V trendu",
   "explore.trending_links": "Novice",
   "explore.trending_statuses": "Objave",
   "explore.trending_tags": "Ključniki",
+  "featured_carousel.next": "Naprej",
+  "featured_carousel.post": "Objava",
+  "featured_carousel.previous": "Nazaj",
+  "featured_carousel.slide": "{index} od {total}",
   "filter_modal.added.context_mismatch_explanation": "Ta kategorija filtra ne velja za kontekst, v katerem ste dostopali do te objave. Če želite, da je objava filtrirana tudi v tem kontekstu, morate urediti filter.",
   "filter_modal.added.context_mismatch_title": "Neujemanje konteksta!",
   "filter_modal.added.expired_explanation": "Ta kategorija filtra je pretekla. Morali boste spremeniti datum veljavnosti, da bo veljal še naprej.",
@@ -371,7 +408,10 @@
   "hashtag.counter_by_accounts": "{count, plural, one {{counter} udeleženec} two {{counter} udeleženca} few {{counter} udeležencev} other {{counter} udeležencev}}",
   "hashtag.counter_by_uses": "{count, plural, one {{counter} objava} two {{counter} posts} few {{counter} objavi} other {{counter} objav}}",
   "hashtag.counter_by_uses_today": "{count, plural, one {{counter} objava} two {{counter} objavi} few {{counter} objav} other {{counter} objav}}",
+  "hashtag.feature": "Izpostavi v profilu",
   "hashtag.follow": "Sledi ključniku",
+  "hashtag.mute": "Utišaj #{hashtag}",
+  "hashtag.unfeature": "Ne izpostavljaj v profilu",
   "hashtag.unfollow": "Nehaj slediti ključniku",
   "hashtags.and_other": "… in še {count, plural, other {#}}",
   "hints.profiles.followers_may_be_missing": "Sledilci za ta profil morda manjkajo.",
@@ -380,6 +420,7 @@
   "hints.profiles.see_more_followers": "Pokaži več sledilcev na {domain}",
   "hints.profiles.see_more_follows": "Pokaži več sledenih ljudi na zbirališču {domain}",
   "hints.profiles.see_more_posts": "Pokaži več objav na {domain}",
+  "home.column_settings.show_quotes": "Pokaži citate",
   "home.column_settings.show_reblogs": "Pokaži izpostavitve",
   "home.column_settings.show_replies": "Pokaži odgovore",
   "home.hide_announcements": "Skrij obvestila",
@@ -404,6 +445,7 @@
   "interaction_modal.no_account_yet": "Še nimate računa?",
   "interaction_modal.on_another_server": "Na drugem strežniku",
   "interaction_modal.on_this_server": "Na tem strežniku",
+  "interaction_modal.title": "Za nadaljevanje se prijavite",
   "interaction_modal.username_prompt": "Npr. {example}",
   "intervals.full.days": "{number, plural, one {# dan} two {# dni} few {# dni} other {# dni}}",
   "intervals.full.hours": "{number, plural, one {# ura} two {# uri} few {# ure} other {# ur}}",
@@ -432,6 +474,7 @@
   "keyboard_shortcuts.open_media": "Odpri predstavnost",
   "keyboard_shortcuts.pinned": "Odpri seznam pripetih objav",
   "keyboard_shortcuts.profile": "Odpri avtorjev profil",
+  "keyboard_shortcuts.quote": "Citiraj objavo",
   "keyboard_shortcuts.reply": "Odgovori na objavo",
   "keyboard_shortcuts.requests": "Odpri seznam s prošnjami za sledenje",
   "keyboard_shortcuts.search": "Pozornost na iskalno vrstico",
@@ -443,6 +486,8 @@
   "keyboard_shortcuts.translate": "za prevod objave",
   "keyboard_shortcuts.unfocus": "Odstrani pozornost z območja za sestavljanje besedila/iskanje",
   "keyboard_shortcuts.up": "Premakni navzgor po seznamu",
+  "learn_more_link.got_it": "Razumem",
+  "learn_more_link.learn_more": "Več o tem",
   "lightbox.close": "Zapri",
   "lightbox.next": "Naslednji",
   "lightbox.previous": "Prejšnji",
@@ -492,8 +537,10 @@
   "mute_modal.you_wont_see_mentions": "Objav, ki jih omenjajo, ne boste videli.",
   "mute_modal.you_wont_see_posts": "Še vedno vidijo vaše objave, vi pa ne njihovih.",
   "navigation_bar.about": "O Mastodonu",
+  "navigation_bar.account_settings": "Geslo in varnost",
   "navigation_bar.administration": "Upravljanje",
   "navigation_bar.advanced_interface": "Odpri v naprednem spletnem vmesniku",
+  "navigation_bar.automated_deletion": "Samodejno brisanje objav",
   "navigation_bar.blocks": "Blokirani uporabniki",
   "navigation_bar.bookmarks": "Zaznamki",
   "navigation_bar.direct": "Zasebne omembe",
@@ -503,12 +550,15 @@
   "navigation_bar.follow_requests": "Prošnje za sledenje",
   "navigation_bar.followed_tags": "Sledeni ključniki",
   "navigation_bar.follows_and_followers": "Sledenja in sledilci",
+  "navigation_bar.import_export": "Uvoz in izvoz",
   "navigation_bar.lists": "Seznami",
   "navigation_bar.logout": "Odjava",
   "navigation_bar.moderation": "Moderiranje",
+  "navigation_bar.more": "Več",
   "navigation_bar.mutes": "Utišani uporabniki",
   "navigation_bar.opened_in_classic_interface": "Objave, računi in druge specifične strani se privzeto odprejo v klasičnem spletnem vmesniku.",
   "navigation_bar.preferences": "Nastavitve",
+  "navigation_bar.privacy_and_reach": "Zasebnost in dosegljivost",
   "navigation_bar.search": "Iskanje",
   "not_signed_in_indicator.not_signed_in": "Za dostop do tega vira se morate prijaviti.",
   "notification.admin.report": "{name} je prijavil/a {target}",
@@ -531,6 +581,7 @@
   "notification.label.mention": "Omemba",
   "notification.label.private_mention": "Zasebna omemba",
   "notification.label.private_reply": "Zasebni odgovor",
+  "notification.label.quote": "{name} je citiral/a vašo objavo",
   "notification.label.reply": "Odgovori",
   "notification.mention": "Omemba",
   "notification.mentioned_you": "{name} vas je omenil/a",
@@ -588,6 +639,7 @@
   "notifications.column_settings.mention": "Omembe:",
   "notifications.column_settings.poll": "Rezultati ankete:",
   "notifications.column_settings.push": "Potisna obvestila",
+  "notifications.column_settings.quote": "Citati:",
   "notifications.column_settings.reblog": "Izpostavitve:",
   "notifications.column_settings.show": "Pokaži v stolpcu",
   "notifications.column_settings.sound": "Predvajaj zvok",
@@ -682,6 +734,7 @@
   "relative_time.minutes": "{number} m",
   "relative_time.seconds": "{number} s",
   "relative_time.today": "danes",
+  "remove_quote_hint.button_label": "Razumem",
   "reply_indicator.attachments": "{count, plural, one {# priloga} two {# prilogi} few {# priloge} other {# prilog}}",
   "reply_indicator.cancel": "Prekliči",
   "reply_indicator.poll": "Anketa",
@@ -735,6 +788,7 @@
   "report_notification.categories.violation": "Kršitev pravila",
   "report_notification.categories.violation_sentence": "kršitev pravila",
   "report_notification.open": "Odpri prijavo",
+  "search.clear": "Počisti iskanje",
   "search.no_recent_searches": "Ni nedavnih iskanj",
   "search.placeholder": "Iskanje",
   "search.quick_action.account_search": "Profili, ki se ujemajo z {x}",
@@ -776,9 +830,13 @@
   "status.bookmark": "Dodaj med zaznamke",
   "status.cancel_reblog_private": "Prekliči izpostavitev",
   "status.cannot_reblog": "Te objave ni mogoče izpostaviti",
+  "status.contains_quote": "Vsebuje citat",
+  "status.context.retry": "Poskusi znova",
+  "status.context.show": "Pokaži",
   "status.continued_thread": "Nadaljevanje niti",
   "status.copy": "Kopiraj povezavo do objave",
   "status.delete": "Izbriši",
+  "status.delete.success": "Objava je izbrisana",
   "status.detailed_status": "Podroben pogled pogovora",
   "status.direct": "Zasebno omeni @{name}",
   "status.direct_indicator": "Zasebna omemba",
@@ -801,6 +859,14 @@
   "status.mute_conversation": "Utišaj pogovor",
   "status.open": "Razširi to objavo",
   "status.pin": "Pripni na profil",
+  "status.quote.cancel": "Prekliči citat",
+  "status.quote_error.filtered": "Skrito zaradi enega od vaših filtrov",
+  "status.quote_error.limited_account_hint.action": "Vseeno pokaži",
+  "status.quote_error.limited_account_hint.title": "Ta račun so moderatorji {domain} skrili.",
+  "status.quote_error.not_available": "Objava ni na voljo",
+  "status.quote_followers_only": "Samo sledilci lahko citirajo to objavo",
+  "status.quote_policy_change": "Spremenite, kdo lahko citira",
+  "status.quote_private": "Zasebnih objav ni možno citirati",
   "status.read_more": "Preberi več",
   "status.reblog": "Izpostavi",
   "status.reblogged_by": "{name} je izpostavil/a",
@@ -809,6 +875,7 @@
   "status.redraft": "Izbriši in preoblikuj",
   "status.remove_bookmark": "Odstrani zaznamek",
   "status.remove_favourite": "Odstrani iz priljubljenih",
+  "status.remove_quote": "Odstrani",
   "status.replied_in_thread": "Odgovor iz niti",
   "status.replied_to": "Odgovoril/a {name}",
   "status.reply": "Odgovori",
@@ -829,7 +896,10 @@
   "subscribed_languages.save": "Shrani spremembe",
   "subscribed_languages.target": "Spremeni naročene jezike za {target}",
   "tabs_bar.home": "Domov",
+  "tabs_bar.menu": "Meni",
   "tabs_bar.notifications": "Obvestila",
+  "tabs_bar.publish": "Nova objava",
+  "tabs_bar.search": "Išči",
   "terms_of_service.effective_as_of": "Veljavno od {date}",
   "terms_of_service.title": "Pogoji uporabe",
   "terms_of_service.upcoming_changes_on": "Spremembe začnejo veljati {date}",
@@ -863,6 +933,19 @@
   "video.expand": "Razširi video",
   "video.fullscreen": "Celozaslonski način",
   "video.hide": "Skrij video",
+  "video.mute": "Utišaj",
   "video.pause": "Premor",
-  "video.play": "Predvajaj"
+  "video.play": "Predvajaj",
+  "video.skip_backward": "Preskoči nazaj",
+  "video.skip_forward": "Preskoči naprej",
+  "video.unmute": "Odtišaj",
+  "video.volume_down": "Zmanjšaj glasnost",
+  "video.volume_up": "Povečaj glasnost",
+  "visibility_modal.header": "Vidnost in interakcija",
+  "visibility_modal.privacy_label": "Vidnost",
+  "visibility_modal.quote_followers": "Samo sledilci",
+  "visibility_modal.quote_label": "Kdo lahko citira",
+  "visibility_modal.quote_nobody": "Samo jaz",
+  "visibility_modal.quote_public": "Vsi",
+  "visibility_modal.save": "Shrani"
 }

app/javascript/mastodon/locales/sv.json

@@ -340,11 +340,11 @@
   "empty_column.blocks": "Du har ännu ej blockerat några användare.",
   "empty_column.bookmarked_statuses": "Du har inte bokmärkt några inlägg än. När du bokmärker ett inlägg kommer det synas här.",
   "empty_column.community": "Den lokala tidslinjen är tom. Skriv något offentligt för att sätta bollen i rullning!",
-  "empty_column.direct": "Du har inga privata omnämninande. När du skickar eller tar emot ett direktmeddelande kommer det att visas här.",
+  "empty_column.direct": "Du har inga privata omnämnanden. När du skickar eller tar emot ett direktmeddelande kommer det att visas här.",
   "empty_column.disabled_feed": "Detta flöde har inaktiverats av dina serveradministratörer.",
   "empty_column.domain_blocks": "Det finns ännu inga dolda domäner.",
   "empty_column.explore_statuses": "Ingenting är trendigt just nu. Kom tillbaka senare!",
-  "empty_column.favourited_statuses": "Du har inga favoritmarkerade inlägg ännu. När du favoritmärker ett så kommer det att dyka upp här.",
+  "empty_column.favourited_statuses": "Du har inga favoritmarkerade inlägg ännu. När du favoritmarkerar ett så kommer det att dyka upp här.",
   "empty_column.favourites": "Ingen har favoritmarkerat detta inlägg än. När någon gör det kommer de synas här.",
   "empty_column.follow_requests": "Du har inga följarförfrågningar än. När du får en kommer den visas här.",
   "empty_column.followed_tags": "Du följer inga hashtaggar ännu. När du gör det kommer de att dyka upp här.",
@@ -927,21 +927,34 @@
   "status.quote_error.not_available": "Inlägg ej tillgängligt",
   "status.quote_error.pending_approval": "Väntande inlägg",
   "status.quote_error.pending_approval_popout.body": "På Mastodon kan du styra om någon kan citera dig. Det här inlägget väntar medan vi får den ursprungliga författarens godkännande.",
+  "status.quote_error.revoked": "Inlägg borttaget av författaren",
+  "status.quote_followers_only": "Detta inlägg kan bara citeras av följare",
+  "status.quote_manual_review": "Författaren kommer att granska manuellt",
+  "status.quote_noun": "Citat",
   "status.quote_policy_change": "Ändra vem som kan citera",
   "status.quote_post_author": "Citerade ett inlägg av @{name}",
+  "status.quote_private": "Privata inlägg kan inte citeras",
+  "status.quotes": "{count, plural, one {citat} other {citat}}",
+  "status.quotes.empty": "Ingen har citerat detta inlägg än. När någon gör det kommer det att synas här.",
+  "status.quotes.local_other_disclaimer": "Citat som avvisats av författaren kommer inte att visas.",
+  "status.quotes.remote_other_disclaimer": "Endast citat från {domain} är garanterade att visas här. Citat som avvisats av författaren kommer inte att visas.",
   "status.read_more": "Läs mer",
   "status.reblog": "Boosta",
+  "status.reblog_or_quote": "Boosta eller citera",
+  "status.reblog_private": "Dela igen med dina följare",
   "status.reblogged_by": "{name} boostade",
   "status.reblogs": "{count, plural, one {# röst} other {# röster}}",
   "status.reblogs.empty": "Ingen har boostat detta inlägg än. När någon gör det kommer de synas här.",
   "status.redraft": "Radera & gör om",
   "status.remove_bookmark": "Ta bort bokmärke",
   "status.remove_favourite": "Ta bort från Favoriter",
+  "status.remove_quote": "Ta bort",
   "status.replied_in_thread": "Svarade i tråden",
   "status.replied_to": "Svarade på {name}",
   "status.reply": "Svara",
   "status.replyAll": "Svara på tråden",
   "status.report": "Rapportera @{name}",
+  "status.request_quote": "Begär att få citera",
   "status.revoke_quote": "Ta bort mitt inlägg från @{name}s inlägg",
   "status.sensitive_warning": "Känsligt innehåll",
   "status.share": "Dela",
@@ -980,6 +993,7 @@
   "upload_button.label": "Lägg till media",
   "upload_error.limit": "Filöverföringsgränsen överskriden.",
   "upload_error.poll": "Filuppladdning tillåts inte med omröstningar.",
+  "upload_error.quote": "Filuppladdning tillåts inte med citat.",
   "upload_form.drag_and_drop.instructions": "För att plocka upp en mediebilaga, tryck på mellanslag eller enter. Använd piltangenterna för att flytta mediebilagan. Tryck på mellanslag eller enter igen för att släppa mediebilagan i sin nya position, eller tryck på escape för att avbryta.",
   "upload_form.drag_and_drop.on_drag_cancel": "Flytten avbröts. Mediebilagan {item} släpptes.",
   "upload_form.drag_and_drop.on_drag_end": "Mediebilagan {item} släpptes.",
@@ -1004,9 +1018,19 @@
   "video.volume_down": "Volym ned",
   "video.volume_up": "Volym upp",
   "visibility_modal.button_title": "Ange synlighet",
+  "visibility_modal.direct_quote_warning.text": "Om du sparar de nuvarande inställningarna kommer det inbäddade citatet bli konverterat till en länk.",
+  "visibility_modal.direct_quote_warning.title": "Citat kan inte bäddas in i privata omnämnanden",
   "visibility_modal.header": "Synlighet och interaktion",
+  "visibility_modal.helper.direct_quoting": "Privata omnämnanden som författats på Mastodon kan inte citeras av andra.",
+  "visibility_modal.helper.privacy_editing": "Synligheten kan inte ändras efter att ett inlägg är publicerat.",
+  "visibility_modal.helper.privacy_private_self_quote": "Självcitat av privata inlägg kan inte göras publika.",
+  "visibility_modal.helper.private_quoting": "Inlägg som endast är för följare och som författats på Mastodon kan inte citeras av andra.",
   "visibility_modal.helper.unlisted_quoting": "När folk citerar dig, deras inlägg kommer också att döljas från trendiga tidslinjer.",
+  "visibility_modal.instructions": "Kontrollera vem som kan interagera med detta inlägg. Du kan också använda inställningar för alla framtida inlägg genom att navigera till <link>Preferences > Posting defaults</link>.",
+  "visibility_modal.privacy_label": "Synlighet",
   "visibility_modal.quote_followers": "Endast följare",
+  "visibility_modal.quote_label": "Vem kan citera",
+  "visibility_modal.quote_nobody": "Bara jag",
   "visibility_modal.quote_public": "Alla",
   "visibility_modal.save": "Spara"
 }

app/javascript/mastodon/locales/th.json

@@ -31,6 +31,8 @@
   "account.edit_profile_short": "แก้ไข",
   "account.enable_notifications": "แจ้งเตือนฉันเมื่อ @{name} โพสต์",
   "account.endorse": "แสดงในโปรไฟล์",
+  "account.familiar_followers_one": "ติดตามโดย {name1}",
+  "account.familiar_followers_two": "ติดตามโดย {name1} และ {name2}",
   "account.featured": "น่าสนใจ",
   "account.featured.accounts": "โปรไฟล์",
   "account.featured.hashtags": "แฮชแท็ก",
@@ -65,6 +67,7 @@
   "account.mute_short": "ซ่อน",
   "account.muted": "ซ่อนอยู่",
   "account.muting": "กำลังซ่อน",
+  "account.mutual": "คุณติดตามกันและกัน",
   "account.no_bio": "ไม่ได้ให้คำอธิบาย",
   "account.open_original_page": "เปิดหน้าดั้งเดิม",
   "account.posts": "โพสต์",
@@ -232,6 +235,7 @@
   "confirmations.missing_alt_text.secondary": "โพสต์ต่อไป",
   "confirmations.missing_alt_text.title": "เพิ่มข้อความแสดงแทน?",
   "confirmations.mute.confirm": "ซ่อน",
+  "confirmations.private_quote_notify.confirm": "เผยแพร่โพสต์",
   "confirmations.quiet_post_quote_info.dismiss": "ไม่ต้องเตือนฉันอีก",
   "confirmations.quiet_post_quote_info.got_it": "เข้าใจแล้ว",
   "confirmations.redraft.confirm": "ลบแล้วร่างใหม่",
@@ -419,6 +423,7 @@
   "hints.profiles.see_more_followers": "ดูผู้ติดตามเพิ่มเติมใน {domain}",
   "hints.profiles.see_more_follows": "ดูการติดตามเพิ่มเติมใน {domain}",
   "hints.profiles.see_more_posts": "ดูโพสต์เพิ่มเติมใน {domain}",
+  "home.column_settings.show_quotes": "แสดงการอ้างอิง",
   "home.column_settings.show_reblogs": "แสดงการดัน",
   "home.column_settings.show_replies": "แสดงการตอบกลับ",
   "home.hide_announcements": "ซ่อนประกาศ",
@@ -463,6 +468,7 @@
   "keyboard_shortcuts.home": "เปิดเส้นเวลาหน้าแรก",
   "keyboard_shortcuts.hotkey": "ปุ่มลัด",
   "keyboard_shortcuts.legend": "แสดงคำอธิบายนี้",
+  "keyboard_shortcuts.load_more": "โฟกัสปุ่ม \"โหลดเพิ่มเติม\"",
   "keyboard_shortcuts.local": "เปิดเส้นเวลาในเซิร์ฟเวอร์",
   "keyboard_shortcuts.mention": "กล่าวถึงผู้สร้าง",
   "keyboard_shortcuts.muted": "เปิดรายการผู้ใช้ที่ซ่อนอยู่",
@@ -471,6 +477,7 @@
   "keyboard_shortcuts.open_media": "เปิดสื่อ",
   "keyboard_shortcuts.pinned": "เปิดรายการโพสต์ที่ปักหมุด",
   "keyboard_shortcuts.profile": "เปิดโปรไฟล์ของผู้สร้าง",
+  "keyboard_shortcuts.quote": "อ้างอิงโพสต์",
   "keyboard_shortcuts.reply": "ตอบกลับโพสต์",
   "keyboard_shortcuts.requests": "เปิดรายการคำขอติดตาม",
   "keyboard_shortcuts.search": "โฟกัสแถบค้นหา",
@@ -548,6 +555,8 @@
   "navigation_bar.follows_and_followers": "การติดตามและผู้ติดตาม",
   "navigation_bar.import_export": "การนำเข้าและการส่งออก",
   "navigation_bar.lists": "รายการ",
+  "navigation_bar.live_feed_local": "ฟีดสด (ในเซิร์ฟเวอร์)",
+  "navigation_bar.live_feed_public": "ฟีดสด (สาธารณะ)",
   "navigation_bar.logout": "ออกจากระบบ",
   "navigation_bar.moderation": "การกลั่นกรอง",
   "navigation_bar.more": "เพิ่มเติม",
@@ -556,6 +565,7 @@
   "navigation_bar.preferences": "การกำหนดลักษณะ",
   "navigation_bar.privacy_and_reach": "ความเป็นส่วนตัวและการเข้าถึง",
   "navigation_bar.search": "ค้นหา",
+  "navigation_bar.search_trends": "ค้นหา / กำลังนิยม",
   "navigation_panel.collapse_lists": "ยุบเมนูรายการ",
   "navigation_panel.expand_lists": "ขยายเมนูรายการ",
   "not_signed_in_indicator.not_signed_in": "คุณจำเป็นต้องเข้าสู่ระบบเพื่อเข้าถึงทรัพยากรนี้",
@@ -578,6 +588,7 @@
   "notification.label.mention": "การกล่าวถึง",
   "notification.label.private_mention": "การกล่าวถึงแบบส่วนตัว",
   "notification.label.private_reply": "การตอบกลับแบบส่วนตัว",
+  "notification.label.quote": "{name} ได้อ้างอิงโพสต์ของคุณ",
   "notification.label.reply": "การตอบกลับ",
   "notification.mention": "การกล่าวถึง",
   "notification.mentioned_you": "{name} ได้กล่าวถึงคุณ",
@@ -592,6 +603,7 @@
   "notification.moderation_warning.action_suspend": "ระงับบัญชีของคุณแล้ว",
   "notification.own_poll": "การสำรวจความคิดเห็นของคุณได้สิ้นสุดแล้ว",
   "notification.poll": "การสำรวจความคิดเห็นที่คุณได้ลงคะแนนได้สิ้นสุดแล้ว",
+  "notification.quoted_update": "{name} ได้แก้ไขโพสต์ที่คุณได้อ้างอิง",
   "notification.reblog": "{name} ได้ดันโพสต์ของคุณ",
   "notification.reblog.name_and_others_with_link": "{name} และ <a>{count, plural, other {# อื่น ๆ}}</a> ได้ดันโพสต์ของคุณ",
   "notification.relationships_severance_event": "สูญเสียการเชื่อมต่อกับ {name}",
@@ -635,6 +647,7 @@
   "notifications.column_settings.mention": "การกล่าวถึง:",
   "notifications.column_settings.poll": "ผลลัพธ์การสำรวจความคิดเห็น:",
   "notifications.column_settings.push": "การแจ้งเตือนแบบผลัก",
+  "notifications.column_settings.quote": "การอ้างอิง:",
   "notifications.column_settings.reblog": "การดัน:",
   "notifications.column_settings.show": "แสดงในคอลัมน์",
   "notifications.column_settings.sound": "เล่นเสียง",
@@ -710,7 +723,11 @@
   "privacy.private.short": "ผู้ติดตาม",
   "privacy.public.long": "ใครก็ตามที่อยู่ในและนอก Mastodon",
   "privacy.public.short": "สาธารณะ",
+  "privacy.quote.anyone": "{visibility}, ใครก็ตามสามารถอ้างอิง",
+  "privacy.quote.disabled": "{visibility}, ปิดใช้งานการอ้างอิงแล้ว",
+  "privacy.quote.limited": "{visibility}, จำกัดการอ้างอิงอยู่",
   "privacy.unlisted.additional": "สิ่งนี้ทำงานเหมือนกับสาธารณะทุกประการ ยกเว้นโพสต์จะไม่ปรากฏในฟีดสดหรือแฮชแท็ก, การสำรวจ หรือการค้นหา Mastodon แม้ว่าคุณได้เลือกรับทั่วทั้งบัญชีก็ตาม",
+  "privacy.unlisted.long": "ซ่อนจากผลลัพธ์การค้นหา, กำลังนิยม และเส้นเวลาสาธารณะของ Mastodon",
   "privacy.unlisted.short": "สาธารณะแบบเงียบ",
   "privacy_policy.last_updated": "อัปเดตล่าสุดเมื่อ {date}",
   "privacy_policy.title": "นโยบายความเป็นส่วนตัว",
@@ -852,6 +869,8 @@
   "status.mute_conversation": "ซ่อนการสนทนา",
   "status.open": "ขยายโพสต์นี้",
   "status.pin": "ปักหมุดในโปรไฟล์",
+  "status.quote_error.limited_account_hint.action": "แสดงต่อไป",
+  "status.quote_post_author": "อ้างอิงโพสต์โดย @{name}",
   "status.read_more": "อ่านเพิ่มเติม",
   "status.reblog": "ดัน",
   "status.reblogged_by": "{name} ได้ดัน",
@@ -920,5 +939,11 @@
   "video.pause": "หยุดชั่วคราว",
   "video.play": "เล่น",
   "video.unmute": "เลิกปิดเสียง",
+  "visibility_modal.button_title": "ตั้งการมองเห็น",
+  "visibility_modal.header": "การมองเห็นและการโต้ตอบ",
+  "visibility_modal.privacy_label": "การมองเห็น",
+  "visibility_modal.quote_followers": "ผู้ติดตามเท่านั้น",
+  "visibility_modal.quote_nobody": "แค่ฉัน",
+  "visibility_modal.quote_public": "ใครก็ตาม",
   "visibility_modal.save": "บันทึก"
 }

app/javascript/mastodon/locales/tok.json

@@ -4,10 +4,10 @@
   "about.default_locale": "ante ala",
   "about.disclaimer": "ilo Mastodon la jan ale li lawa e ona li pana e pona tawa ona. kulupu esun Mastodon gGmbH li lawa e nimi ona.",
   "about.domain_blocks.no_reason_available": "mi sona ala e tan",
-  "about.domain_blocks.preamble": "ilo Masoton li ken e ni: sina lukin e toki jan pi ma ilo mute. sina ken toki tawa ona lon kulupu ma. taso, ma ni li ken ala e ni tawa ma ni:",
+  "about.domain_blocks.preamble": "ilo Mastodon li ken e ni: sina lukin e toki jan pi ma ilo mute. sina ken toki tawa ona lon kulupu ma. taso, ma ni li ken ala e ni tawa ma ni:",
   "about.domain_blocks.silenced.explanation": "sina lukin ala e toki e jan tan ma ni. taso, sina wile la, sina ken ni.",
   "about.domain_blocks.silenced.title": "ken lukin lili ",
-  "about.domain_blocks.suspended.explanation": "sona ale pi ma ni li kama pali ala, li kama esun ala, li kama awen ala la sina ken ala toki tawa jan pi ma ni.",
+  "about.domain_blocks.suspended.explanation": "sona ale pi ma ni li kama pali ala, li kama esun ala, li kama awen ala la, sina ken ala toki tawa jan pi ma ni.",
   "about.domain_blocks.suspended.title": "weka",
   "about.language_label": "toki",
   "about.not_available": "lon kulupu ni la sina ken alasa ala e sona ni.",
@@ -24,11 +24,12 @@
   "account.blocking": "mi len e jan ni",
   "account.cancel_follow_request": "o kute ala",
   "account.copy": "o pali same e linja pi lipu jan",
-  "account.direct": "len la o mu e @{name}",
+  "account.direct": "o mu len e @{name}",
   "account.disable_notifications": "@{name} li toki la o mu ala e mi",
   "account.domain_blocking": "mi len e ma ni",
   "account.edit_profile": "o ante e lipu mi",
-  "account.enable_notifications": "@{name} li toki la o toki e toki ona tawa mi",
+  "account.edit_profile_short": "o ante",
+  "account.enable_notifications": "@{name} li toki la o mu e mi",
   "account.endorse": "lipu jan la o suli e ni",
   "account.familiar_followers_many": "{name1} en {name2} en {othersCount, plural, other {jan ante #}} li kute e jan ni",
   "account.familiar_followers_one": "{name1} li kute e jan ni",
@@ -40,13 +41,17 @@
   "account.featured_tags.last_status_never": "toki ala li lon",
   "account.follow": "o kute",
   "account.follow_back": "jan ni li kute e sina. o kute",
+  "account.follow_back_short": "o kute",
+  "account.follow_request": "o wile kute",
+  "account.follow_request_cancel": "o wile ala kute",
+  "account.follow_request_cancel_short": "o wile ala kute",
   "account.followers": "jan kute",
   "account.followers.empty": "jan ala li kute e jan ni",
   "account.followers_counter": "{count, plural, other {jan {counter} li kute e ona}}",
   "account.followers_you_know_counter": "jan {counter} pi kute sama",
   "account.following": "sina kute e jan ni",
   "account.following_counter": "{count, plural, other {ona li kute e jan {counter}}}",
-  "account.follows.empty": "jan ni li kute e jan ala",
+  "account.follows.empty": "jan ni li kute ala e jan",
   "account.follows_you": "ona li kute e sina",
   "account.go_to_profile": "o tawa lipu jan",
   "account.hide_reblogs": "o lukin ala e pana toki tan @{name}",
@@ -56,7 +61,7 @@
   "account.link_verified_on": "{date} la mi sona e ni: jan seme li jo e lipu ni",
   "account.locked_info": "sina wile kute e jan ni la ona o toki e ken",
   "account.media": "sitelen",
-  "account.mention": "o mu e jan @{name}",
+  "account.mention": "o mu e @{name}",
   "account.moved_to": "jan ni la lipu sin li ni:",
   "account.mute": "o len e @{name}",
   "account.mute_notifications_short": "o kute ala e mu tan jan ni",
@@ -69,20 +74,20 @@
   "account.posts": "toki suli",
   "account.posts_with_replies": "toki ale",
   "account.remove_from_followers": "sijelo kute la o weka e sijelo \"{name}\".",
-  "account.report": "jan @{name} la o toki e ike tawa lawa",
-  "account.requested_follow": "jan {name} li wile kute e sina",
+  "account.report": "@{name} la o toki e jaki tawa lawa",
+  "account.requested_follow": "{name} li wile kute e sina",
   "account.requests_to_follow_you": "jan ni li wile kute e sina",
-  "account.share": "o pana e lipu jan @{name}",
+  "account.share": "o pana e lipu tan @{name}",
   "account.show_reblogs": "o lukin e pana toki tan @{name}",
   "account.statuses_counter": "{count, plural, other {toki {counter}}}",
-  "account.unblock": "o len ala e jan {name}",
+  "account.unblock": "o len ala e {name}",
   "account.unblock_domain": "o len ala e ma {domain}",
-  "account.unblock_domain_short": "o len ala e jan ni",
+  "account.unblock_domain_short": "o len ala",
   "account.unblock_short": "o len ala",
   "account.unendorse": "lipu jan la o suli ala e ni",
   "account.unfollow": "o kute ala",
   "account.unmute": "o len ala e @{name}",
-  "account.unmute_notifications_short": "o kute e mu tan jan ni",
+  "account.unmute_notifications_short": "o kute e mu",
   "account.unmute_short": "o len ala",
   "account_note.placeholder": "o luka e ni la sona pi sina taso",
   "admin.dashboard.daily_retention": "nanpa pi awen jan lon tenpo suno",
@@ -115,20 +120,20 @@
   "annual_report.summary.followers.followers": "jan kute sina",
   "annual_report.summary.followers.total": "ale la {count}",
   "annual_report.summary.here_it_is": "toki lili la tenpo sike nanpa {year} li sama ni tawa sina:",
-  "annual_report.summary.highlighted_post.by_favourites": "toki pi pona suli",
-  "annual_report.summary.highlighted_post.by_reblogs": "toki pi pana suli",
-  "annual_report.summary.highlighted_post.by_replies": "toki li jo e toki kama pi nanpa wan",
-  "annual_report.summary.highlighted_post.possessive": "tan jan {name}",
+  "annual_report.summary.highlighted_post.by_favourites": "toki ni li pona suli tawa jan",
+  "annual_report.summary.highlighted_post.by_reblogs": "jan ante li pana suli e toki ni",
+  "annual_report.summary.highlighted_post.by_replies": "la jan ante li toki suli tan toki ni",
+  "annual_report.summary.highlighted_post.possessive": "{name}",
   "annual_report.summary.most_used_app.most_used_app": "ilo pi kepeken suli",
   "annual_report.summary.most_used_hashtag.most_used_hashtag": "kulupu toki pi kepeken suli",
   "annual_report.summary.most_used_hashtag.none": "ala",
   "annual_report.summary.new_posts.new_posts": "toki suli sin",
   "annual_report.summary.percentile.text": "<topLabel>ni la sina nanpa sewi</topLabel><percentage></percentage><bottomLabel>pi jan ale lon {domain}.</bottomLabel>",
   "annual_report.summary.percentile.we_wont_tell_bernie": "sona ni li len tawa ale.",
-  "annual_report.summary.thanks": "sina jan pi kulupu Mastodon la sina pona a!",
+  "annual_report.summary.thanks": "sina lon kulupu Mastodon la sina pona a!",
   "attachments_list.unprocessed": "(nasin open)",
   "audio.hide": "o len e kalama",
-  "block_modal.remote_users_caveat": "mi pana e wile sina tawa ma {domain}. taso, o sona: ma li ken kepeken nasin len ante la pakala li ken lon. toki pi lukin ale la jan pi ma ala li ken lukin.",
+  "block_modal.remote_users_caveat": "mi pana e wile sina tawa ma {domain}. taso ma li ken kepeken nasin ante la pakala li ken. jan li awen ken lukin e toki kepeken sijelo ala.",
   "block_modal.show_less": "o lili e toki",
   "block_modal.show_more": "o suli e toki",
   "block_modal.they_cant_mention": "ona li ken ala toki tawa sina li ken ala kute e sina.",
@@ -167,7 +172,9 @@
   "column.edit_list": "o ante e kulupu",
   "column.favourites": "ijo pona",
   "column.firehose": "toki pi tenpo ni",
-  "column.follow_requests": "wile alasa pi jan ante",
+  "column.firehose_local": "ma ni la toki pi tenpo ni",
+  "column.firehose_singular": "toki pi tenpo ni",
+  "column.follow_requests": "wile kute",
   "column.home": "lipu open",
   "column.list_members": "o ante e kulupu jan",
   "column.lists": "kulupu lipu",
@@ -175,25 +182,26 @@
   "column.notifications": "mu pi sona sin",
   "column.pins": "toki sewi",
   "column.public": "toki pi ma poka ale",
-  "column_back_button.label": "o tawa monsi",
-  "column_header.hide_settings": "o len e lawa",
+  "column_back_button.label": "o weka",
+  "column_header.hide_settings": "o len e nasin lawa",
   "column_header.moveLeft_settings": "poki toki ni o tawa ni ←",
   "column_header.moveRight_settings": "poki toki ni o tawa ni →",
   "column_header.pin": "o sewi",
-  "column_header.show_settings": "o lukin e lawa",
+  "column_header.show_settings": "o lukin e nasin lawa",
   "column_header.unpin": "o sewi ala",
   "column_search.cancel": "o ala",
   "community.column_settings.local_only": "toki tan ni taso",
   "community.column_settings.media_only": "sitelen taso",
   "community.column_settings.remote_only": "toki tan ante taso",
+  "compose.error.blank_post": "toki li wile.",
   "compose.language.change": "o ante e nasin toki",
   "compose.language.search": "o alasa e nasin toki...",
-  "compose.published.body": "toki li pana.",
+  "compose.published.body": "mi pana e toki.",
   "compose.published.open": "o lukin",
-  "compose.saved.body": "ilo li awen e ijo pana sina.",
-  "compose_form.direct_message_warning_learn_more": "o kama sona",
+  "compose.saved.body": "mi awen e toki sina.",
+  "compose_form.direct_message_warning_learn_more": "o sona",
   "compose_form.encryption_warning": "ilo Mastodon la toki li len ala. o pana ala e sona suli pi ken pakala.",
-  "compose_form.lock_disclaimer": "lipu sina li open, li {locked} ala. jan ale li ken kama kute e sina, li ken lukin e toki sama ni.",
+  "compose_form.lock_disclaimer": "lipu sina li {locked} ala. jan ale li ken kama kute e sina li ken lukin e toki sama ni.",
   "compose_form.lock_disclaimer.lock": "pini",
   "compose_form.placeholder": "sina wile toki e seme?",
   "compose_form.poll.duration": "tenpo pana",
@@ -237,6 +245,9 @@
   "confirmations.missing_alt_text.secondary": "o pana a",
   "confirmations.missing_alt_text.title": "o pana ala pana e toki pi sona lukin?",
   "confirmations.mute.confirm": "o len",
+  "confirmations.private_quote_notify.confirm": "o pana e toki ni tawa ale",
+  "confirmations.private_quote_notify.do_not_show_again": "o toki ala e toki ni",
+  "confirmations.quiet_post_quote_info.dismiss": "o toki ala e ni tawa mi",
   "confirmations.quiet_post_quote_info.got_it": "sona",
   "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.",
@@ -246,7 +257,10 @@
   "confirmations.remove_from_followers.title": "o kama ala kama kute ala e jan?",
   "confirmations.revoke_quote.confirm": "o weka e toki tan lipu Mastodon",
   "confirmations.revoke_quote.title": "sina wile weka ala weka e toki?",
+  "confirmations.unblock.confirm": "o len ala",
+  "confirmations.unblock.title": "o len ala e {name}?",
   "confirmations.unfollow.confirm": "o kute ala",
+  "confirmations.unfollow.title": "o kute ala e {name}?",
   "content_warning.hide": "o len",
   "content_warning.show": "o lukin a",
   "content_warning.show_more": "o lukin",
@@ -287,10 +301,12 @@
   "domain_pill.your_handle": "nimi sina:",
   "domain_pill.your_server": "ni li ma sina lon ilo. toki ale sina li lon ma ni. ma li ike tawa sina la, sina ken tawa ma ante. ni la jan kute sina li tawa sama.",
   "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.",
+  "dropdown.empty": "o wile e ijo wan",
   "embed.instructions": "o pana e toki ni la, toki li lon lipu ante. ",
   "embed.preview": "ni li jo e sitelen ni:",
   "emoji_button.activity": "musi",
   "emoji_button.clear": "o weka",
+  "emoji_button.custom": "pali sin",
   "emoji_button.flags": "len ma",
   "emoji_button.food": "moku",
   "emoji_button.label": "o pana e sitelen pilin",
@@ -331,6 +347,7 @@
   "featured_carousel.post": "toki",
   "featured_carousel.previous": "pini",
   "featured_carousel.slide": "lipu {total} la lipu nanpa {index}",
+  "filter_modal.added.review_and_configure_title": "o alasa e lawa",
   "filter_modal.added.settings_link": "lipu lawa",
   "filter_modal.select_filter.expired": "tenpo pini",
   "filter_modal.select_filter.search": "o alasa anu pali",
@@ -371,8 +388,10 @@
   "hashtag.counter_by_accounts": "{count, plural, other {jan {counter}}}",
   "hashtag.counter_by_uses": "{count, plural, other {toki {counter}}}",
   "hashtag.counter_by_uses_today": "{count, plural, other {toki poka {counter}}}",
+  "hashtag.feature": "lipu jan la o suli e ni",
   "hashtag.follow": "o kute e kulupu lipu",
   "hashtag.mute": "o kute ala e kulupu #{hashtag}",
+  "hashtag.unfeature": "lipu jan la o suli ala e ni",
   "hashtag.unfollow": "o kute ala e kulupu lipu",
   "hints.profiles.followers_may_be_missing": "jan kute li ken weka.",
   "hints.profiles.see_more_followers": "o lukin e jan ni lon ma {domain}: ona li kute e jan ni.",

app/javascript/mastodon/locales/ug.json

@@ -15,6 +15,18 @@
   "account.cancel_follow_request": "ئەگىشىش ئىلتىماسىدىن ۋاز كەچ",
   "account.copy": "تەرجىمىھال ئۇلانمىسىنى كۆچۈر",
   "account.direct": "@{name} نى يوشۇرۇن ئاتا",
+  "account.edit_profile_short": "تەھرىر",
+  "account.follow_request_cancel_short": "ۋاز كەچ",
+  "account.follow_request_short": "ئىلتىماس",
+  "account.followers": "ئەگەشكۈچى",
+  "account.followers.empty": "تېخى ھېچكىم بۇ كىشىگە ئەگەشمىدى.",
+  "account.followers_counter": "{count, plural, one {{counter} ئەگەشكۈچى} other {{counter} ئەگەشكۈچى}}",
+  "account.followers_you_know_counter": "تونۇيدىغىنىڭىز {counter}",
+  "account.following": "ئەگىشىۋاتىدۇ",
+  "account.following_counter": "{count, plural, one {{counter} ئەگىشىۋاتىدۇ} other {{counter} ئەگىشىۋاتىدۇ}}",
+  "account.follows.empty": "بۇ ئىشلەتكۈچى تېخى ھېچكىمگە ئەگەشمىدى.",
+  "account.follows_you": "سىزگە ئەگەشتى",
+  "account.go_to_profile": "تەرجىمىھالغا يۆتكەل",
   "account.posts": "يازما",
   "account.posts_with_replies": "يازما ۋە ئىنكاس",
   "account.report": "@{name} نى پاش قىل",

app/javascript/mastodon/locales/uk.json

@@ -26,8 +26,12 @@
   "account.direct": "Особиста згадка @{name}",
   "account.disable_notifications": "Не повідомляти мене про дописи @{name}",
   "account.edit_profile": "Редагувати профіль",
+  "account.edit_profile_short": "Редагувати",
   "account.enable_notifications": "Повідомляти мене про дописи @{name}",
   "account.endorse": "Рекомендувати у моєму профілі",
+  "account.familiar_followers_many": "Має серед підисників {name1}, {name2} та ще {othersCount, plural, one {# відомого вам користувача} few {# відомих вам користувачів} many {# відомих вам користувачів} other {# відомих вам користувачів}}",
+  "account.familiar_followers_one": "Має серед підписників {name1}",
+  "account.familiar_followers_two": "Має серед підписників {name1} та {name2}",
   "account.featured": "Рекомендоване",
   "account.featured.accounts": "Профілі",
   "account.featured.hashtags": "Хештеги",
@@ -35,10 +39,16 @@
   "account.featured_tags.last_status_never": "Немає дописів",
   "account.follow": "Підписатися",
   "account.follow_back": "Стежити також",
+  "account.follow_back_short": "Підписатись навзаєм",
+  "account.follow_request": "Запит на підписку",
+  "account.follow_request_cancel": "Скасувати запит",
+  "account.follow_request_cancel_short": "Скасувати",
+  "account.follow_request_short": "Запит",
   "account.followers": "Підписники",
   "account.followers.empty": "Ніхто ще не підписаний на цього користувача.",
   "account.followers_counter": "{count, plural, one {{counter} підписник} few {{counter} підписники} many {{counter} підписників} other {{counter} підписник}}",
-  "account.following": "Ви стежите",
+  "account.followers_you_know_counter": "{count, plural, one {{counter} відомий вам} few {{counter} відомі вам} many {{counter} відомих вам} other {{counter} відомі вам}}",
+  "account.following": "Підписки",
   "account.following_counter": "{count, plural, one {{counter} підписка} few {{counter} підписки} many {{counter} підписок} other {{counter} підписка}}",
   "account.follows.empty": "Цей користувач ще ні на кого не підписався.",
   "account.follows_you": "Підписаний(-а) на вас",
@@ -56,12 +66,15 @@
   "account.mute_notifications_short": "Не сповіщати",
   "account.mute_short": "Ігнорувати",
   "account.muted": "Приховується",
+  "account.mutual": "Підписані навзаєм",
   "account.no_bio": "Немає опису.",
   "account.open_original_page": "Відкрити оригінальну сторінку",
   "account.posts": "Дописи",
   "account.posts_with_replies": "Дописи й відповіді",
+  "account.remove_from_followers": "Вилучити {name} із підписників",
   "account.report": "Поскаржитися на @{name}",
   "account.requested_follow": "{name} надсилає запит на стеження",
+  "account.requests_to_follow_you": "Просить дозвіл на вас підписатись",
   "account.share": "Поділитися профілем @{name}",
   "account.show_reblogs": "Показати поширення від @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} допис} few {{counter} дописи} many {{counter} дописів} other {{counter} допис}}",
@@ -176,6 +189,7 @@
   "community.column_settings.local_only": "Лише локальні",
   "community.column_settings.media_only": "Лише з медіа",
   "community.column_settings.remote_only": "Лише віддалені",
+  "compose.error.blank_post": "Допис не може бути порожнім.",
   "compose.language.change": "Змінити мову",
   "compose.language.search": "Шукати мови...",
   "compose.published.body": "Допис опубліковано.",
@@ -223,13 +237,30 @@
   "confirmations.missing_alt_text.secondary": "Все одно опублікувати",
   "confirmations.missing_alt_text.title": "Додати альтернативний текст?",
   "confirmations.mute.confirm": "Приховати",
+  "confirmations.private_quote_notify.cancel": "Назад до редагування",
+  "confirmations.private_quote_notify.confirm": "Оприлюднити допис",
+  "confirmations.private_quote_notify.do_not_show_again": "Більше не показувати цього повідомлення",
+  "confirmations.private_quote_notify.message": "Ті, кого ви цитуєте чи згадуєте, отримають сповіщення й зможуть переглянути ваш допис, навіть якщо не підписані на вас.",
+  "confirmations.private_quote_notify.title": "Поширити підписникам і згаданим користувачам?",
+  "confirmations.quiet_post_quote_info.dismiss": "Більше не нагадувати",
+  "confirmations.quiet_post_quote_info.got_it": "Зрозуміло",
+  "confirmations.quiet_post_quote_info.message": "Цитати тихого публічного допису не буде показано в стрічках трендів.",
+  "confirmations.quiet_post_quote_info.title": "Цитування тихих публічних дописів",
   "confirmations.redraft.confirm": "Видалити та виправити",
   "confirmations.redraft.message": "Ви впевнені, що хочете видалити цей допис та переписати його? Додавання у вибране та поширення буде втрачено, а відповіді на оригінальний допис залишаться без першоджерела.",
   "confirmations.redraft.title": "Видалити та переробити допис?",
+  "confirmations.remove_from_followers.confirm": "Вилучити підписника",
+  "confirmations.remove_from_followers.message": "Точно відписати {name} від вас?",
+  "confirmations.remove_from_followers.title": "Вилучити підписника?",
   "confirmations.revoke_quote.confirm": "Видалити публікацію",
   "confirmations.revoke_quote.message": "Цю дію не можна скасувати.",
   "confirmations.revoke_quote.title": "Видалити публікацію?",
+  "confirmations.unblock.confirm": "Розблокувати",
+  "confirmations.unblock.title": "Розблокувати {name}?",
   "confirmations.unfollow.confirm": "Відписатися",
+  "confirmations.unfollow.title": "Відписатись від {name}?",
+  "confirmations.withdraw_request.confirm": "Відкликати запит",
+  "confirmations.withdraw_request.title": "Відкликати запит на підписку на {name}?",
   "content_warning.hide": "Сховати допис",
   "content_warning.show": "Усе одно показати",
   "content_warning.show_more": "Показати більше",
@@ -397,6 +428,7 @@
   "hints.profiles.see_more_followers": "Переглянути більше підписників на {domain}",
   "hints.profiles.see_more_follows": "Переглянути більше підписок на {domain}",
   "hints.profiles.see_more_posts": "Переглянути більше дописів на {domain}",
+  "home.column_settings.show_quotes": "Показувати цитати",
   "home.column_settings.show_reblogs": "Показувати поширення",
   "home.column_settings.show_replies": "Показувати відповіді",
   "home.hide_announcements": "Приховати оголошення",
@@ -443,6 +475,7 @@
   "keyboard_shortcuts.home": "Відкрити домашню стрічку",
   "keyboard_shortcuts.hotkey": "Гаряча клавіша",
   "keyboard_shortcuts.legend": "Показати легенду",
+  "keyboard_shortcuts.load_more": "Фокусуватися на кнопці «Завантажити більше»",
   "keyboard_shortcuts.local": "Відкрити локальну стрічку",
   "keyboard_shortcuts.mention": "Згадати автора",
   "keyboard_shortcuts.muted": "Відкрити список прихованих користувачів",
@@ -451,7 +484,7 @@
   "keyboard_shortcuts.open_media": "Відкрити медіа",
   "keyboard_shortcuts.pinned": "Відкрити список закріплених дописів",
   "keyboard_shortcuts.profile": "Відкрити профіль автора",
-  "keyboard_shortcuts.quote": "Цитувати пост",
+  "keyboard_shortcuts.quote": "Цитувати допис",
   "keyboard_shortcuts.reply": "Відповісти",
   "keyboard_shortcuts.requests": "Відкрити список охочих підписатися",
   "keyboard_shortcuts.search": "Сфокусуватися на пошуку",
@@ -565,6 +598,7 @@
   "notification.label.mention": "Згадка",
   "notification.label.private_mention": "Особиста згадка",
   "notification.label.private_reply": "Приватна відповідь",
+  "notification.label.quote": "{name} цитує ваш допис",
   "notification.label.reply": "Відповідь",
   "notification.mention": "Згадка",
   "notification.mentioned_you": "{name} згадує вас",
@@ -579,6 +613,7 @@
   "notification.moderation_warning.action_suspend": "Ваш обліковий запис було заблоковано.",
   "notification.own_poll": "Ваше опитування завершилося",
   "notification.poll": "Опитування, в якому ви проголосували, завершено",
+  "notification.quoted_update": "{name} редагує цитований вами допис",
   "notification.reblog": "{name} поширює ваш допис",
   "notification.reblog.name_and_others_with_link": "{name} та <a>{count, plural, one {# інший} few {# інших} many {# інших} other {# інший}}</a> поширили ваш допис",
   "notification.relationships_severance_event": "Втрачено з'єднання з {name}",
@@ -622,6 +657,7 @@
   "notifications.column_settings.mention": "Згадки:",
   "notifications.column_settings.poll": "Результати опитування:",
   "notifications.column_settings.push": "Push-сповіщення",
+  "notifications.column_settings.quote": "Цитати:",
   "notifications.column_settings.reblog": "Поширення:",
   "notifications.column_settings.show": "Показати в стовпчику",
   "notifications.column_settings.sound": "Відтворювати звуки",
@@ -697,10 +733,20 @@
   "privacy.private.short": "Підписники",
   "privacy.public.long": "Усі з Mastodon",
   "privacy.public.short": "Публічно",
+  "privacy.quote.anyone": "{visibility}, будь-хто може цитувати",
+  "privacy.quote.disabled": "{visibility}, цитування вимкнено",
+  "privacy.quote.limited": "{visibility}, цитування обмежено",
   "privacy.unlisted.additional": "Має таку ж поведінку, як у людей, але повідомлення не з'являтимуться у стрічках або хештегах, оглядах, або пошуку Mastodon, навіть якщо ви використовуєте облікові записи.",
+  "privacy.unlisted.long": "Сховано з результатів пошуку Mastodon, трендових і публічних стрічок",
   "privacy.unlisted.short": "Без додавання до стрічки",
   "privacy_policy.last_updated": "Оновлено {date}",
   "privacy_policy.title": "Політика приватності",
+  "quote_error.edit": "Цитат не можна додавати під час редагування допису.",
+  "quote_error.poll": "Одночасно цитувати й опитувати не можна.",
+  "quote_error.private_mentions": "Одночасно цитувати й особисто когось згадувати не можна.",
+  "quote_error.quote": "Дозволено лише одну цитату.",
+  "quote_error.unauthorized": "Вам не дозволено цитувати цей допис.",
+  "quote_error.upload": "Одночасно цитувати й додавати мультимедіа не можна.",
   "recommended": "Рекомендовано",
   "refresh": "Оновити",
   "regeneration_indicator.please_stand_by": "Будь ласка, очікуйте.",
@@ -716,6 +762,9 @@
   "relative_time.minutes": "{number}х",
   "relative_time.seconds": "{number}с",
   "relative_time.today": "сьогодні",
+  "remove_quote_hint.button_label": "Зрозуміло",
+  "remove_quote_hint.message": "Це можна зробити за допомогою {icon} меню параметрів.",
+  "remove_quote_hint.title": "Хочете вилучити допис із цитати?",
   "reply_indicator.attachments": "{count, plural, one {# вкладення} few {# вкладення} many {# вкладень} other {# вкладення}}",
   "reply_indicator.cancel": "Скасувати",
   "reply_indicator.poll": "Опитування",
@@ -793,7 +842,7 @@
   "search_results.no_search_yet": "Спробуйте пошукати дописи, профілі або хештеґи.",
   "search_results.see_all": "Показати все",
   "search_results.statuses": "Дописів",
-  "search_results.title": "Шукати \"{q}\"",
+  "search_results.title": "Пошук «{q}»",
   "server_banner.about_active_users": "Люди, які використовують цей сервер протягом останніх 30 днів (Щомісячні Активні Користувачі)",
   "server_banner.active_users": "активні користувачі",
   "server_banner.administered_by": "Адміністратор:",
@@ -807,13 +856,23 @@
   "status.admin_account": "Відкрити інтерфейс модерації для @{name}",
   "status.admin_domain": "Відкрити інтерфейс модерації для {domain}",
   "status.admin_status": "Відкрити цей допис в інтерфейсі модерації",
+  "status.all_disabled": "Поширення й цитування вимкнено",
   "status.block": "Заблокувати @{name}",
   "status.bookmark": "Додати до закладок",
   "status.cancel_reblog_private": "Скасувати поширення",
+  "status.cannot_quote": "Вам не дозволено цитувати цей допис",
   "status.cannot_reblog": "Цей допис не може бути поширений",
+  "status.contains_quote": "Містить цитату",
+  "status.context.loading": "Завантаження відповідей",
+  "status.context.loading_error": "Не вдалося завантажити нові відповіді",
+  "status.context.loading_success": "Нові відповіді завантажено",
+  "status.context.more_replies_found": "Знайдено більше відповідей",
+  "status.context.retry": "Повторити",
+  "status.context.show": "Показати",
   "status.continued_thread": "Продовження у потоці",
   "status.copy": "Копіювати посилання на допис",
   "status.delete": "Видалити",
+  "status.delete.success": "Допис видалено",
   "status.detailed_status": "Детальний вигляд бесіди",
   "status.direct": "Особиста згадка @{name}",
   "status.direct_indicator": "Особиста згадка",
@@ -836,27 +895,50 @@
   "status.mute_conversation": "Ігнорувати розмову",
   "status.open": "Розгорнути допис",
   "status.pin": "Закріпити у профілі",
+  "status.quote": "Цитувати",
+  "status.quote.cancel": "Скасувати цитування",
+  "status.quote_error.blocked_account_hint.title": "Допис сховано, бо ви блокуєте @{name}.",
+  "status.quote_error.blocked_domain_hint.title": "Допис сховано, бо ви блокуєте {domain}.",
   "status.quote_error.filtered": "Приховано через один з ваших фільтрів",
-  "status.quote_error.not_available": "Пост недоступний",
+  "status.quote_error.limited_account_hint.action": "Усе одно показати",
+  "status.quote_error.limited_account_hint.title": "Обліковий запис сховали модератори {domain}.",
+  "status.quote_error.muted_account_hint.title": "Допис сховано, бо ви приховуєте @{name}.",
+  "status.quote_error.not_available": "Допис недоступний",
+  "status.quote_error.pending_approval": "Цитати ще не схвалено",
+  "status.quote_error.pending_approval_popout.body": "Mastodon дає вам змогу контролювати, чи можна вас цитувати. Допис буде показано, коли автор схвалить його цитування.",
+  "status.quote_error.revoked": "Автор допису не дозволив його цитувати",
+  "status.quote_followers_only": "Цитувати можна лише підписникам",
+  "status.quote_manual_review": "Автор матиме схвалити вручну",
+  "status.quote_noun": "Цитата",
+  "status.quote_policy_change": "Змінити, кому можна цитувати",
   "status.quote_post_author": "Цитований допис @{name}",
+  "status.quote_private": "Приватних повідомлень цитувати не можна",
+  "status.quotes": "{count, plural, one {цитата} few {цитати} many {цитат} other {цитати}}",
+  "status.quotes.empty": "Допису ще не цитували. Цитати буде показано тут.",
+  "status.quotes.local_other_disclaimer": "Відхилених автором цитат показано не буде.",
+  "status.quotes.remote_other_disclaimer": "Цитати за межами {domain} показуються не завжди. Відхилених автором цитат показано не буде.",
   "status.read_more": "Дізнатися більше",
   "status.reblog": "Поширити",
+  "status.reblog_or_quote": "Поширити чи цитувати",
+  "status.reblog_private": "Поширити підписникам ще раз",
   "status.reblogged_by": "{name} поширює",
   "status.reblogs": "{count, plural, one {поширення} few {поширення} many {поширень} other {поширення}}",
   "status.reblogs.empty": "Ніхто ще не поширив цей допис. Коли хтось це зроблять, вони будуть зображені тут.",
   "status.redraft": "Видалити та виправити",
   "status.remove_bookmark": "Видалити закладку",
   "status.remove_favourite": "Вилучити з улюбленого",
+  "status.remove_quote": "Вилучити",
   "status.replied_in_thread": "Відповідь у потоці",
   "status.replied_to": "Відповідь для {name}",
   "status.reply": "Відповісти",
   "status.replyAll": "Відповісти на ланцюжок",
   "status.report": "Поскаржитися на @{name}",
+  "status.request_quote": "Попросити дозвіл цитувати",
   "status.revoke_quote": "Видалити мою публікацію з допису @{name}",
   "status.sensitive_warning": "Делікатний вміст",
   "status.share": "Поділитися",
-  "status.show_less_all": "Згорнути для всіх",
-  "status.show_more_all": "Розгорнути для всіх",
+  "status.show_less_all": "Згорнути всі",
+  "status.show_more_all": "Розгорнути всі",
   "status.show_original": "Показати оригінал",
   "status.title.with_attachments": "{user} розміщує {{attachmentCount, plural, one {вкладення} few {{attachmentCount} вкладення} many {{attachmentCount} вкладень} other {{attachmentCount} вкладень}}",
   "status.translate": "Перекласти",
@@ -890,6 +972,7 @@
   "upload_button.label": "Додати зображення, відео або аудіо",
   "upload_error.limit": "Ви перевищили ліміт завантаження файлів.",
   "upload_error.poll": "Не можна завантажувати файли до опитувань.",
+  "upload_error.quote": "Додавати файли й цитувати одночасно не можна.",
   "upload_form.drag_and_drop.instructions": "Щоб вибрати медіавкладення, натисніть пробіл або Enter. Під час перетягування, використайте клавіші зі стрілками для переміщення вкладення в будь-якому напрямку. Натисніть пробіл або Enter знову, щоб залишити медіавкладення в новому положенні, або натисніть клавішу Escape, щоб скасувати.",
   "upload_form.drag_and_drop.on_drag_cancel": "Перетягування скасовано. Медіавкладення {item} прибрано.",
   "upload_form.drag_and_drop.on_drag_end": "Медіавкладення {item} прибрано.",
@@ -905,10 +988,28 @@
   "video.expand": "Розгорнути відео",
   "video.fullscreen": "На весь екран",
   "video.hide": "Приховати відео",
+  "video.mute": "Вимкнути звук",
   "video.pause": "Призупинити",
   "video.play": "Програвати",
+  "video.skip_backward": "Перемотати назад",
+  "video.skip_forward": "Перемотати вперед",
+  "video.unmute": "Увімкнути звук",
+  "video.volume_down": "Тихіше",
+  "video.volume_up": "Гучніше",
+  "visibility_modal.button_title": "Налаштувати видимість",
+  "visibility_modal.direct_quote_warning.text": "При збереженні поточних налаштувань цитату буде замінено на посилання.",
+  "visibility_modal.direct_quote_warning.title": "Цитат не можна вкладати в особисті згадки",
+  "visibility_modal.header": "Видимість і взаємодія",
+  "visibility_modal.helper.direct_quoting": "Mastodon не дозволяє цитувати особисті згадки.",
   "visibility_modal.helper.privacy_editing": "Видимість не може бути змінена після публікації повідомлення.",
+  "visibility_modal.helper.privacy_private_self_quote": "Цитати власних приватних повідомлень не можна робити публічними.",
+  "visibility_modal.helper.private_quoting": "Mastodon не дозволяє цитувати дописи, адресовані лише підписникам.",
+  "visibility_modal.helper.unlisted_quoting": "Цитати вашого допису також буде сховано зі стрічок трендів.",
+  "visibility_modal.instructions": "Налаштуйте, кому можна взаємодіяти з цим дописом. Для майбутніх дописів це можна налаштувати, відкривши <link>Налаштування > Усталені налаштування дописів</link>.",
+  "visibility_modal.privacy_label": "Видимість",
   "visibility_modal.quote_followers": "Тільки для підписників",
+  "visibility_modal.quote_label": "Кому можна цитувати",
+  "visibility_modal.quote_nobody": "Лише мені",
   "visibility_modal.quote_public": "Будь-хто",
   "visibility_modal.save": "Зберегти"
 }

app/javascript/mastodon/locales/vi.json

@@ -1021,12 +1021,12 @@
   "visibility_modal.direct_quote_warning.text": "Nếu bạn lưu cài đặt hiện tại, trích dẫn được nhúng sẽ được chuyển đổi thành liên kết.",
   "visibility_modal.direct_quote_warning.title": "Không thể nhúng trích dẫn vào Nhắn Riêng",
   "visibility_modal.header": "Hiển thị và tương tác",
-  "visibility_modal.helper.direct_quoting": "Nhắn riêng trên Mastodon không thể được người khác trích dẫn.",
+  "visibility_modal.helper.direct_quoting": "Không thể trích dẫn tút Nhắn riêng trên Mastodon.",
   "visibility_modal.helper.privacy_editing": "Không thể thay đổi chế độ hiển thị sau khi một tút đã đăng.",
   "visibility_modal.helper.privacy_private_self_quote": "Không thể công khai trích dẫn tút của bản thân hoặc tút riêng tư.",
-  "visibility_modal.helper.private_quoting": "Tút chỉ dành cho người theo dõi trên Mastodon không thể được người khác trích dẫn.",
+  "visibility_modal.helper.private_quoting": "Không thể trích dẫn tút chỉ dành cho người theo dõi trên Mastodon.",
   "visibility_modal.helper.unlisted_quoting": "Khi ai đó trích dẫn bạn, tút của họ cũng sẽ bị ẩn khỏi bảng tin công khai.",
-  "visibility_modal.instructions": "Kiểm soát những ai có thể tương tác với tút này. Bạn cũng có thể áp dụng cài đặt cho tất cả các tút trong tương lai bằng cách điều hướng đến <link>Thiết lập > Đăng</link>.",
+  "visibility_modal.instructions": "Kiểm soát những ai có thể tương tác với tút này. Bạn cũng có thể đặt sẵn cho tất cả tút trong tương lai bằng cách truy cập <link>Thiết lập > Mặc định cho tút</link>.",
   "visibility_modal.privacy_label": "Hiển thị",
   "visibility_modal.quote_followers": "Chỉ người theo dõi",
   "visibility_modal.quote_label": "Ai có thể trích dẫn",

app/javascript/mastodon/locales/zh-TW.json

@@ -1,43 +1,43 @@
 {
-  "about.blocks": "被限制的伺服器",
+  "about.blocks": "受管制的伺服器",
   "about.contact": "聯絡我們：",
   "about.default_locale": "預設",
   "about.disclaimer": "Mastodon 是一個自由的開源軟體，是 Mastodon gGmbH 之註冊商標。",
   "about.domain_blocks.no_reason_available": "無法存取的原因",
-  "about.domain_blocks.preamble": "Mastodon 基本上允許您瀏覽聯邦宇宙中任何伺服器的內容並與使用者互動。以下是在本伺服器上設定的例外。",
-  "about.domain_blocks.silenced.explanation": "一般來說您不會看到來自這個伺服器的個人檔案和內容，除非您明確搜尋或主動跟隨對方。",
+  "about.domain_blocks.preamble": "Mastodon 基本上允許您瀏覽聯邦宇宙中任何伺服器的內容並與使用者互動。以下是於本伺服器上設定之例外。",
+  "about.domain_blocks.silenced.explanation": "一般來說您不會看到來自這個伺服器的個人檔案與內容，除非您明確地檢視或著跟隨此個人檔案。",
   "about.domain_blocks.silenced.title": "已受限",
   "about.domain_blocks.suspended.explanation": "來自此伺服器的資料都不會被處理、儲存或交換，也無法和此伺服器上的使用者互動與交流。",
   "about.domain_blocks.suspended.title": "已停權",
   "about.language_label": "語言",
   "about.not_available": "無法於本伺服器上使用此資訊。",
-  "about.powered_by": "由 {mastodon} 提供的去中心化社群媒體",
+  "about.powered_by": "由 {mastodon} 提供之去中心化社群媒體",
   "about.rules": "伺服器規則",
   "account.account_note_header": "個人備註",
   "account.add_or_remove_from_list": "自列表中新增或移除",
   "account.badges.bot": "機器人",
   "account.badges.group": "群組",
   "account.block": "封鎖 @{name}",
-  "account.block_domain": "封鎖來自 {domain} 網域的所有內容",
+  "account.block_domain": "封鎖來自 {domain} 網域之所有內容",
   "account.block_short": "封鎖",
   "account.blocked": "已封鎖",
   "account.blocking": "封鎖中",
   "account.cancel_follow_request": "收回跟隨請求",
   "account.copy": "複製個人檔案連結",
-  "account.direct": " @{name}",
-  "account.disable_notifications": "取消來自 @{name} 嘟文的通知",
+  "account.direct": "私訊 @{name}",
+  "account.disable_notifications": "取消來自 @{name} 嘟文之通知",
   "account.domain_blocking": "封鎖中網域",
   "account.edit_profile": "編輯個人檔案",
   "account.edit_profile_short": "編輯",
-  "account.enable_notifications": "當 @{name} 嘟文時通知我",
-  "account.endorse": "於個人檔案推薦對方",
+  "account.enable_notifications": "當 @{name} 發嘟時通知我",
+  "account.endorse": "於個人檔案推薦",
   "account.familiar_followers_many": "被 {name1}、{name2}、及{othersCount, plural, other {其他您認識的 # 人}} 跟隨",
   "account.familiar_followers_one": "被 {name1} 跟隨",
   "account.familiar_followers_two": "被 {name1} 與 {name2} 跟隨",
   "account.featured": "精選內容",
   "account.featured.accounts": "個人檔案",
   "account.featured.hashtags": "主題標籤",
-  "account.featured_tags.last_status_at": "上次嘟文於 {date}",
+  "account.featured_tags.last_status_at": "上次發嘟於 {date}",
   "account.featured_tags.last_status_never": "沒有嘟文",
   "account.follow": "跟隨",
   "account.follow_back": "跟隨回去",
@@ -47,20 +47,20 @@
   "account.follow_request_cancel_short": "取消",
   "account.follow_request_short": "跟隨請求",
   "account.followers": "跟隨者",
-  "account.followers.empty": "尚未有人跟隨這位使用者。",
+  "account.followers.empty": "尚未有人跟隨此使用者。",
   "account.followers_counter": "被 {count, plural, other {{counter} 人}}跟隨",
-  "account.followers_you_know_counter": "{counter} 位您知道的跟隨者",
+  "account.followers_you_know_counter": "{counter} 位您認識的跟隨者",
   "account.following": "跟隨中",
   "account.following_counter": "正在跟隨 {count,plural,other {{counter} 人}}",
-  "account.follows.empty": "這位使用者尚未跟隨任何人。",
+  "account.follows.empty": "此使用者尚未跟隨任何人。",
   "account.follows_you": "已跟隨您",
   "account.go_to_profile": "前往個人檔案",
-  "account.hide_reblogs": "隱藏來自 @{name} 的轉嘟",
+  "account.hide_reblogs": "隱藏來自 @{name} 之轉嘟",
   "account.in_memoriam": "謹此悼念。",
   "account.joined_short": "加入時間",
   "account.languages": "變更訂閱的語言",
   "account.link_verified_on": "已於 {date} 檢查此連結的擁有者權限",
-  "account.locked_info": "此帳號的隱私狀態設定為鎖定。該擁有者會手動審核能跟隨此帳號的人。",
+  "account.locked_info": "此帳號的隱私狀態被設為鎖定。該擁有者會手動審核能跟隨此帳號的人。",
   "account.media": "媒體",
   "account.mention": "提及 @{name}",
   "account.moved_to": "{name} 目前的新帳號為：",
@@ -90,7 +90,7 @@
   "account.unmute": "解除靜音 @{name}",
   "account.unmute_notifications_short": "解除靜音推播通知",
   "account.unmute_short": "解除靜音",
-  "account_note.placeholder": "按此新增備註",
+  "account_note.placeholder": "點擊以新增備註",
   "admin.dashboard.daily_retention": "註冊後使用者存留率（日）",
   "admin.dashboard.monthly_retention": "註冊後使用者存留率（月）",
   "admin.dashboard.retention.average": "平均",
@@ -119,9 +119,9 @@
   "annual_report.summary.archetype.pollster": "民調專家",
   "annual_report.summary.archetype.replier": "社交菁英",
   "annual_report.summary.followers.followers": "跟隨者",
-  "annual_report.summary.followers.total": "總共 {count}",
+  "annual_report.summary.followers.total": "總共 {count} 人",
   "annual_report.summary.here_it_is": "以下是您的 {year} 年度回顧：",
-  "annual_report.summary.highlighted_post.by_favourites": "最多被加到最愛的嘟文",
+  "annual_report.summary.highlighted_post.by_favourites": "最多被加至最愛的嘟文",
   "annual_report.summary.highlighted_post.by_reblogs": "最多轉嘟的嘟文",
   "annual_report.summary.highlighted_post.by_replies": "最多回覆的嘟文",
   "annual_report.summary.highlighted_post.possessive": "{name} 的",
@@ -132,38 +132,38 @@
   "annual_report.summary.percentile.text": "<topLabel>這讓您成為前</topLabel><percentage></percentage><bottomLabel>{domain} 的使用者。</bottomLabel>",
   "annual_report.summary.percentile.we_wont_tell_bernie": "我們不會告訴 Bernie。",
   "annual_report.summary.thanks": "感謝您成為 Mastodon 的一份子！",
-  "attachments_list.unprocessed": "（未經處理）",
+  "attachments_list.unprocessed": "（未處理）",
   "audio.hide": "隱藏音訊",
   "block_modal.remote_users_caveat": "我們會要求 {domain} 伺服器尊重您的決定。然而，我們無法保證所有伺服器皆會遵守，某些伺服器可能以不同方式處理封鎖。未登入之使用者仍可能看見您的公開嘟文。",
   "block_modal.show_less": "減少顯示",
   "block_modal.show_more": "顯示更多",
   "block_modal.they_cant_mention": "他們無法提及或跟隨您。",
-  "block_modal.they_cant_see_posts": "他們無法讀取您的嘟文，且您不會見到他們的。",
+  "block_modal.they_cant_see_posts": "他們無法讀取您的嘟文，且您不會見到他們的嘟文。",
   "block_modal.they_will_know": "他們能見到他們已被封鎖。",
   "block_modal.title": "是否封鎖該使用者？",
-  "block_modal.you_wont_see_mentions": "您不會見到提及他們的嘟文。",
-  "boost_modal.combo": "下次您可以按 {combo} 跳過",
+  "block_modal.you_wont_see_mentions": "您將不會見到提及他們的嘟文。",
+  "boost_modal.combo": "您下次可以按 {combo} 跳過",
   "boost_modal.reblog": "是否要轉嘟？",
   "boost_modal.undo_reblog": "是否要取消轉嘟？",
   "bundle_column_error.copy_stacktrace": "複製錯誤報告",
-  "bundle_column_error.error.body": "無法繪製請求的頁面。這可能是因為我們程式碼中的臭蟲或是瀏覽器的相容問題。",
+  "bundle_column_error.error.body": "無法繪製請求的頁面。這可能是因為我們程式碼中的臭蟲或是瀏覽器相容問題。",
   "bundle_column_error.error.title": "糟糕！",
   "bundle_column_error.network.body": "嘗試載入此頁面時發生錯誤。這可能是因為您的網際網路連線或此伺服器有暫時性的問題。",
   "bundle_column_error.network.title": "網路錯誤",
   "bundle_column_error.retry": "重試",
   "bundle_column_error.return": "返回首頁",
-  "bundle_column_error.routing.body": "找不到請求的頁面。您確定網址列中的 URL 是正確的嗎？",
+  "bundle_column_error.routing.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.other_server_instructions": "因為 Mastodon 是去中心化的，所以您也能於其他伺服器上建立帳號，並仍然與此伺服器互動。",
   "closed_registrations_modal.description": "目前無法於 {domain} 建立新帳號，但也請別忘了，您並不一定需要有 {domain} 伺服器的帳號，也能使用 Mastodon。",
   "closed_registrations_modal.find_another_server": "尋找另一個伺服器",
   "closed_registrations_modal.preamble": "Mastodon 是去中心化的，所以無論您於哪個伺服器新增帳號，都可以與此伺服器上的任何人跟隨及互動。您甚至能自行架設自己的伺服器！",
   "closed_registrations_modal.title": "註冊 Mastodon",
   "column.about": "關於",
-  "column.blocks": "已封鎖的使用者",
+  "column.blocks": "已封鎖使用者",
   "column.bookmarks": "書籤",
   "column.community": "本站時間軸",
   "column.create_list": "建立列表",
@@ -179,7 +179,7 @@
   "column.home": "首頁",
   "column.list_members": "管理列表成員",
   "column.lists": "列表",
-  "column.mutes": "已靜音的使用者",
+  "column.mutes": "已靜音使用者",
   "column.notifications": "推播通知",
   "column.pins": "釘選的嘟文",
   "column.public": "聯邦時間軸",
@@ -191,9 +191,9 @@
   "column_header.show_settings": "顯示設定",
   "column_header.unpin": "取消釘選",
   "column_search.cancel": "取消",
-  "community.column_settings.local_only": "只顯示本站",
-  "community.column_settings.media_only": "只顯示媒體",
-  "community.column_settings.remote_only": "只顯示遠端",
+  "community.column_settings.local_only": "僅顯示本站",
+  "community.column_settings.media_only": "僅顯示媒體",
+  "community.column_settings.remote_only": "僅顯示遠端",
   "compose.error.blank_post": "嘟文無法為空白。",
   "compose.language.change": "變更語言",
   "compose.language.search": "搜尋語言...",
@@ -202,14 +202,14 @@
   "compose.saved.body": "已儲存嘟文。",
   "compose_form.direct_message_warning_learn_more": "了解更多",
   "compose_form.encryption_warning": "Mastodon 上的嘟文並未進行端到端加密。請不要透過 Mastodon 分享任何敏感資訊。",
-  "compose_form.hashtag_warning": "由於這則嘟文設定為非公開，將不會列於任何主題標籤下。只有公開的嘟文才能藉由主題標籤被找到。",
-  "compose_form.lock_disclaimer": "您的帳號尚未 {locked}。任何人皆能跟隨您並看到您設定成只對跟隨者顯示的嘟文。",
+  "compose_form.hashtag_warning": "由於這則嘟文設定為「不公開」，它將不被列於任何主題標籤下。只有公開的嘟文才能藉由主題標籤被找到。",
+  "compose_form.lock_disclaimer": "您的帳號尚未 {locked}。任何人皆能跟隨您並看到您設定成僅有跟隨者可見的嘟文。",
   "compose_form.lock_disclaimer.lock": "上鎖",
   "compose_form.placeholder": "正在想些什麼嗎？",
   "compose_form.poll.duration": "投票期限",
   "compose_form.poll.multiple": "多選",
   "compose_form.poll.option_placeholder": "選項 {number}",
-  "compose_form.poll.single": "單一選擇",
+  "compose_form.poll.single": "單選",
   "compose_form.poll.switch_to_multiple": "變更投票為允許多個選項",
   "compose_form.poll.switch_to_single": "變更投票為允許單一選項",
   "compose_form.poll.type": "投票方式",
@@ -229,7 +229,7 @@
   "confirmations.delete_list.title": "是否刪除該列表？",
   "confirmations.discard_draft.confirm": "捨棄並繼續",
   "confirmations.discard_draft.edit.cancel": "恢復編輯",
-  "confirmations.discard_draft.edit.message": "繼續將會捨棄任何您對正在編輯的此嘟文進行之任何變更。",
+  "confirmations.discard_draft.edit.message": "繼續將捨棄任何您對正在編輯的此嘟文進行之任何變更。",
   "confirmations.discard_draft.edit.title": "是否捨棄對您的嘟文之變更？",
   "confirmations.discard_draft.post.cancel": "恢復草稿",
   "confirmations.discard_draft.post.message": "繼續將捨棄您正在撰寫中之嘟文。",
@@ -257,20 +257,20 @@
   "confirmations.quiet_post_quote_info.message": "當引用不於公開時間軸顯示之嘟文時，您的嘟文將自熱門時間軸隱藏。",
   "confirmations.quiet_post_quote_info.title": "引用不於公開時間軸顯示之嘟文",
   "confirmations.redraft.confirm": "刪除並重新編輯",
-  "confirmations.redraft.message": "您確定要刪除這則嘟文並重新編輯嗎？您將失去這則嘟文之轉嘟及最愛，且對此嘟文之回覆會變成獨立的嘟文。",
+  "confirmations.redraft.message": "您確定要刪除這則嘟文並重新編輯嗎？您將失去此嘟文之轉嘟及最愛，且對原嘟文之回覆將變成獨立嘟文。",
   "confirmations.redraft.title": "是否刪除並重新編輯該嘟文？",
   "confirmations.remove_from_followers.confirm": "移除跟隨者",
-  "confirmations.remove_from_followers.message": "{name} 將會停止跟隨您。您確定要繼續嗎？",
+  "confirmations.remove_from_followers.message": "{name} 將停止跟隨您。您確定要繼續嗎？",
   "confirmations.remove_from_followers.title": "是否移除該跟隨者？",
   "confirmations.revoke_quote.confirm": "移除嘟文",
   "confirmations.revoke_quote.message": "此動作無法復原。",
-  "confirmations.revoke_quote.title": "您是否確定移除嘟文？",
+  "confirmations.revoke_quote.title": "是否移除該嘟文？",
   "confirmations.unblock.confirm": "解除封鎖",
-  "confirmations.unblock.title": "解除封鎖 {name}？",
+  "confirmations.unblock.title": "是否解除封鎖 {name}？",
   "confirmations.unfollow.confirm": "取消跟隨",
-  "confirmations.unfollow.title": "取消跟隨 {name}？",
+  "confirmations.unfollow.title": "是否取消跟隨 {name}？",
   "confirmations.withdraw_request.confirm": "收回跟隨請求",
-  "confirmations.withdraw_request.title": "收回對 {name} 之跟隨請求？",
+  "confirmations.withdraw_request.title": "是否收回對 {name} 之跟隨請求？",
   "content_warning.hide": "隱藏嘟文",
   "content_warning.show": "仍要顯示",
   "content_warning.show_more": "顯示更多",
@@ -282,7 +282,7 @@
   "copypaste.copied": "已複製",
   "copypaste.copy_to_clipboard": "複製到剪貼簿",
   "directory.federated": "來自已知聯邦宇宙",
-  "directory.local": "僅來自 {domain} 網域",
+  "directory.local": "僅來自 {domain}",
   "directory.new_arrivals": "新人",
   "directory.recently_active": "最近活躍",
   "disabled_account_banner.account_settings": "帳號設定",
@@ -296,9 +296,9 @@
   "domain_block_modal.they_cant_follow": "來自此伺服器之使用者將無法跟隨您。",
   "domain_block_modal.they_wont_know": "他們不會知道他們已被封鎖。",
   "domain_block_modal.title": "是否封鎖該網域？",
-  "domain_block_modal.you_will_lose_num_followers": "您將會失去 {followersCount, plural, other {{followersCountDisplay} 個跟隨者}} 與 {followingCount, plural, other {{followingCountDisplay} 個您跟隨之帳號}}.",
+  "domain_block_modal.you_will_lose_num_followers": "您將失去 {followersCount, plural, other {{followersCountDisplay} 個跟隨者}} 與 {followingCount, plural, other {{followingCountDisplay} 個您跟隨之帳號}}。",
   "domain_block_modal.you_will_lose_relationships": "您將失去所有的跟隨者與您自此伺服器跟隨之帳號。",
-  "domain_block_modal.you_wont_see_posts": "您不會見到來自此伺服器使用者之任何嘟文或推播通知。",
+  "domain_block_modal.you_wont_see_posts": "您將不會見到來自此伺服器使用者之任何嘟文或推播通知。",
   "domain_pill.activitypub_lets_connect": "它使您能於 Mastodon 及其他不同的社群應用程式與人連結及互動。",
   "domain_pill.activitypub_like_language": "ActivityPub 像是 Mastodon 與其他社群網路溝通時所用的語言。",
   "domain_pill.server": "伺服器",
@@ -312,8 +312,8 @@
   "domain_pill.your_handle": "您的帳號：",
   "domain_pill.your_server": "您數位世界的家，您所有的嘟文都在這裡。不喜歡這台伺服器嗎？您能隨時搬家至其他伺服器並且仍保有您的跟隨者。",
   "domain_pill.your_username": "您於您的伺服器中獨一無二的識別。於不同的伺服器上可能找到具有相同帳號的使用者。",
-  "dropdown.empty": "選項",
-  "embed.instructions": "若您欲於您的網站嵌入此嘟文，請複製以下程式碼。",
+  "dropdown.empty": "請選擇一個選項",
+  "embed.instructions": "請複製以下程式碼以於您的網站嵌入此嘟文。",
   "embed.preview": "它將顯示成這樣：",
   "emoji_button.activity": "活動",
   "emoji_button.clear": "清除",
@@ -337,7 +337,7 @@
   "empty_column.account_suspended": "帳號已被停權",
   "empty_column.account_timeline": "這裡還沒有嘟文！",
   "empty_column.account_unavailable": "無法取得個人檔案",
-  "empty_column.blocks": "您還沒有封鎖任何使用者。",
+  "empty_column.blocks": "您尚未封鎖任何使用者。",
   "empty_column.bookmarked_statuses": "您還沒有新增任何書籤。當您新增書籤時，它將於此顯示。",
   "empty_column.community": "本站時間軸是空的。快公開嘟些文搶頭香啊！",
   "empty_column.direct": "您還沒有收到任何私訊。當您私訊別人或收到私訊時，它將於此顯示。",
@@ -349,12 +349,12 @@
   "empty_column.follow_requests": "您還沒有收到任何跟隨請求。當您收到的跟隨請求時，它將於此顯示。",
   "empty_column.followed_tags": "您還沒有跟隨任何主題標籤。當您跟隨主題標籤時，它們將於此顯示。",
   "empty_column.hashtag": "這個主題標籤下什麼也沒有。",
-  "empty_column.home": "您的首頁時間軸是空的！跟隨更多人來將它填滿吧！",
+  "empty_column.home": "您的首頁時間軸是空的！跟隨更多人將它填滿吧！",
   "empty_column.list": "這份列表下什麼也沒有。當此列表的成員嘟出新的嘟文時，它們將顯示於此。",
   "empty_column.mutes": "您尚未靜音任何使用者。",
   "empty_column.notification_requests": "清空啦！已經沒有任何推播通知。當您收到新推播通知時，它們將依照您的設定於此顯示。",
   "empty_column.notifications": "您還沒有收到任何推播通知，當您與別人開始互動時，它將於此顯示。",
-  "empty_column.public": "這裡什麼都沒有！嘗試寫些公開的嘟文，或者跟隨其他伺服器的使用者後，就會有嘟文出現了",
+  "empty_column.public": "這裡什麼都沒有！嘗試寫些公開的嘟文，或著自己跟隨其他伺服器的使用者後就會有嘟文出現了",
   "error.unexpected_crash.explanation": "由於發生系統故障或瀏覽器相容性問題，無法正常顯示此頁面。",
   "error.unexpected_crash.explanation_addons": "此頁面無法被正常顯示，這可能是由瀏覽器附加元件或網頁自動翻譯工具造成的。",
   "error.unexpected_crash.next_steps": "請嘗試重新整理頁面。如果狀況沒有改善，您可以使用不同的瀏覽器或應用程式以檢視來使用 Mastodon。",
@@ -565,8 +565,8 @@
   "mute_modal.they_can_mention_and_follow": "他們仍可提及或跟隨您，但您不會見到他們。",
   "mute_modal.they_wont_know": "他們不會知道他們已被靜音。",
   "mute_modal.title": "是否靜音該使用者？",
-  "mute_modal.you_wont_see_mentions": "您不會見到提及他們的嘟文。",
-  "mute_modal.you_wont_see_posts": "他們仍可讀取您的嘟文，但您不會見到他們的。",
+  "mute_modal.you_wont_see_mentions": "您將不會見到提及他們的嘟文。",
+  "mute_modal.you_wont_see_posts": "他們仍可讀取您的嘟文，但您不會見到他們的嘟文。",
   "navigation_bar.about": "關於",
   "navigation_bar.account_settings": "密碼與安全性",
   "navigation_bar.administration": "管理介面",
@@ -629,7 +629,7 @@
   "notification.moderation_warning.action_disable": "您的帳號已被停用。",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "某些您的嘟文已被標記為敏感內容。",
   "notification.moderation_warning.action_none": "您的帳號已收到管理員警告。",
-  "notification.moderation_warning.action_sensitive": "即日起，您的嘟文將會被標記為敏感內容。",
+  "notification.moderation_warning.action_sensitive": "即日起，您的嘟文將被標記為敏感內容。",
   "notification.moderation_warning.action_silence": "您的帳號已被限制。",
   "notification.moderation_warning.action_suspend": "您的帳號已被停權。",
   "notification.own_poll": "您的投票已結束",
@@ -647,10 +647,10 @@
   "notification_requests.accept": "接受",
   "notification_requests.accept_multiple": "{count, plural, other {接受 # 則請求...}}",
   "notification_requests.confirm_accept_multiple.button": "{count, plural, other {接受請求}}",
-  "notification_requests.confirm_accept_multiple.message": "您將接受 {count, plural, other {# 則推播通知請求}}。您確定要繼續？",
+  "notification_requests.confirm_accept_multiple.message": "您將接受 {count, plural, other {# 則推播通知請求}}。您確定要繼續嗎？",
   "notification_requests.confirm_accept_multiple.title": "是否接受推播通知請求？",
   "notification_requests.confirm_dismiss_multiple.button": "{count, plural, other {忽略請求}}",
-  "notification_requests.confirm_dismiss_multiple.message": "您將忽略 {count, plural, other {# 則推播通知請求}}。您將不再能輕易存取{count, plural, other {這些}}推播通知。您確定要繼續？",
+  "notification_requests.confirm_dismiss_multiple.message": "您將忽略 {count, plural, other {# 則推播通知請求}}。您將不再能輕易存取{count, plural, other {這些}}推播通知。您確定要繼續嗎？",
   "notification_requests.confirm_dismiss_multiple.title": "是否忽略推播通知請求？",
   "notification_requests.dismiss": "關閉",
   "notification_requests.dismiss_multiple": "{count, plural, other {忽略 # 則請求...}}",
@@ -757,7 +757,7 @@
   "privacy.quote.anyone": "{visibility}，任何人皆可引用",
   "privacy.quote.disabled": "{visibility}，停用引用嘟文",
   "privacy.quote.limited": "{visibility}，受限的引用嘟文",
-  "privacy.unlisted.additional": "此與公開嘟文完全相同，但嘟文不會出現於即時內容或主題標籤、探索、及 Mastodon 搜尋中，即使您在帳戶設定中選擇加入。",
+  "privacy.unlisted.additional": "此與公開嘟文完全相同，但嘟文不會出現於即時內容或主題標籤、探索、及 Mastodon 搜尋中，即使您於帳戶設定中選擇加入。",
   "privacy.unlisted.long": "不顯示於 Mastodon 之搜尋結果、熱門趨勢、及公開時間軸上",
   "privacy.unlisted.short": "不公開",
   "privacy_policy.last_updated": "最後更新：{date}",
@@ -790,7 +790,7 @@
   "reply_indicator.cancel": "取消",
   "reply_indicator.poll": "投票",
   "report.block": "封鎖",
-  "report.block_explanation": "您將不再看到他們的嘟文。他們將無法看到您的嘟文或是跟隨您。他們會發現他們已被封鎖。",
+  "report.block_explanation": "您將不再看到他們的嘟文。他們將無法檢視您的嘟文或是跟隨您。他們會發現他們已被封鎖。",
   "report.categories.legal": "合法性",
   "report.categories.other": "其他",
   "report.categories.spam": "垃圾訊息",
@@ -804,7 +804,7 @@
   "report.forward": "轉寄到 {target}",
   "report.forward_hint": "這個帳號屬於其他伺服器。要向該伺服器發送匿名的檢舉訊息嗎？",
   "report.mute": "靜音",
-  "report.mute_explanation": "您將不再看到他們的嘟文。他們仍能可以跟隨您以及察看您的嘟文，並且不會知道他們已被靜音。",
+  "report.mute_explanation": "您將不再看到他們的嘟文。他們仍能可以跟隨您以及檢視您的嘟文，並且不會知道他們已被靜音。",
   "report.next": "繼續",
   "report.placeholder": "其他備註",
   "report.reasons.dislike": "我不喜歡",
@@ -994,7 +994,7 @@
   "upload_error.limit": "已達到檔案上傳限制。",
   "upload_error.poll": "不允許於投票時上傳檔案。",
   "upload_error.quote": "引用嘟文無法上傳檔案。",
-  "upload_form.drag_and_drop.instructions": "請按空白鍵或 Enter 鍵取多媒體附加檔案。使用方向鍵移動多媒體附加檔案。按下空白鍵或 Enter 鍵於新位置放置多媒體附加檔案，或按下 ESC 鍵取消。",
+  "upload_form.drag_and_drop.instructions": "請按空白鍵或 Enter 鍵選取多媒體附加檔案。使用方向鍵移動多媒體附加檔案。按下空白鍵或 Enter 鍵於新位置放置多媒體附加檔案，或按下 ESC 鍵取消。",
   "upload_form.drag_and_drop.on_drag_cancel": "移動已取消。多媒體附加檔案 {item} 已被放置。",
   "upload_form.drag_and_drop.on_drag_end": "多媒體附加檔案 {item} 已被放置。",
   "upload_form.drag_and_drop.on_drag_over": "多媒體附加檔案 {item} 已被移動。",

app/javascript/mastodon/main.tsx

@@ -9,7 +9,6 @@ import { me, reduceMotion } from 'mastodon/initial_state';
 import ready from 'mastodon/ready';
 import { store } from 'mastodon/store';
 
-import { initializeEmoji } from './features/emoji';
 import { isProduction, isDevelopment } from './utils/environment';
 
 function main() {
@@ -30,6 +29,7 @@ function main() {
       });
     }
 
+    const { initializeEmoji } = await import('./features/emoji/index');
     initializeEmoji();
 
     const root = createRoot(mountNode);

app/javascript/mastodon/reducers/compose.js

@@ -341,8 +341,8 @@ export const composeReducer = (state = initialState, action) => {
     const isDirect = state.get('privacy') === 'direct';
     return state
       .set('quoted_status_id', isDirect ? null : status.get('id'))
-      .set('spoiler', status.get('sensitive'))
-      .set('spoiler_text', status.get('spoiler_text'))
+      .update('spoiler', spoiler => (spoiler) || !!status.get('spoiler_text'))
+      .update('spoiler_text', (spoiler_text) => spoiler_text || status.get('spoiler_text'))
       .update('privacy', (visibility) => {
         if (['public', 'unlisted'].includes(visibility) && status.get('visibility') === 'private') {
           return 'private';
@@ -530,7 +530,7 @@ export const composeReducer = (state = initialState, action) => {
       map.set('sensitive', action.status.get('sensitive'));
       map.set('language', action.status.get('language'));
       map.set('id', null);
-      map.set('quoted_status_id', action.status.getIn(['quote', 'quoted_status']));
+      map.set('quoted_status_id', action.status.getIn(['quote', 'quoted_status'], null));
       // Mastodon-authored posts can be expected to have at most one automatic approval policy
       map.set('quote_policy', action.status.getIn(['quote_approval', 'automatic', 0]) || 'nobody');
 
@@ -567,7 +567,7 @@ export const composeReducer = (state = initialState, action) => {
       map.set('idempotencyKey', uuid());
       map.set('sensitive', action.status.get('sensitive'));
       map.set('language', action.status.get('language'));
-      map.set('quoted_status_id', action.status.getIn(['quote', 'quoted_status']));
+      map.set('quoted_status_id', action.status.getIn(['quote', 'quoted_status'], null));
       // Mastodon-authored posts can be expected to have at most one automatic approval policy
       map.set('quote_policy', action.status.getIn(['quote_approval', 'automatic', 0]) || 'nobody');
 

app/javascript/mastodon/reducers/statuses.js

@@ -65,6 +65,10 @@ const statusTranslateUndo = (state, id) => {
   });
 };
 
+const removeStatusStub = (state, id) => {
+  return state.getIn([id, 'id']) ? state.deleteIn([id, 'isLoading']) : state.delete(id);
+}
+
 
 /** @type {ImmutableMap<string, import('mastodon/models/status').Status>} */
 const initialState = ImmutableMap();
@@ -92,11 +96,10 @@ export default function statuses(state = initialState, action) {
     return state.setIn([action.id, 'isLoading'], true);
   case STATUS_FETCH_FAIL: {
     if (action.parentQuotePostId && action.error.status === 404) {
-      return state
-        .delete(action.id)
+      return removeStatusStub(state, action.id)
         .setIn([action.parentQuotePostId, 'quote', 'state'], 'deleted')
     } else {
-      return state.delete(action.id);
+      return removeStatusStub(state, action.id);
     }
   }
   case STATUS_IMPORT:

app/javascript/mastodon/selectors/index.js

@@ -32,7 +32,11 @@ function getStatusResultFunction(
     };
   }
 
-  if (statusBase.get('isLoading') && !statusBase.get('content')) {
+  // When a status is loading, a `isLoading` property is set
+  // A status can be loading because it is not known yet (in which case it will only contain `isLoading`)
+  // or because it is being re-fetched; in the latter case, `visibility` will always be set to a non-empty
+  // string.
+  if (statusBase.get('isLoading') && !statusBase.get('visibility')) {
     return {
       status: null,
       loadingState: 'loading',