reduce some font sizes

CHANGELOG.md

@@ -2,48 +2,6 @@
 
 All notable changes to this project will be documented in this file.
 
-## [4.3.2] - 2024-12-03
-
-### Added
-
-- Add `tootctl feeds vacuum` (#33065 by @ClearlyClaire)
-- Add error message when user tries to follow their own account (#31910 by @lenikadali)
-- Add client_secret_expires_at to OAuth Applications (#30317 by @ThisIsMissEm)
-
-### Changed
-
-- Change design of Content Warnings and filters (#32543 by @ClearlyClaire)
-
-### Fixed
-
-- Fix processing incoming post edits with mentions to unresolvable accounts (#33129 by @ClearlyClaire)
-- Fix error when including multiple instances of `embed.js` (#33107 by @YKWeyer)
-- Fix inactive users' timelines being backfilled on follow and unsuspend (#33094 by @ClearlyClaire)
-- Fix direct inbox delivery pushing posts into inactive followers' timelines (#33067 by @ClearlyClaire)
-- Fix `TagFollow` records not being correctly handled in account operations (#33063 by @ClearlyClaire)
-- Fix pushing hashtag-followed posts to feeds of inactive users (#33018 by @Gargron)
-- Fix duplicate notifications in notification groups when using slow mode (#33014 by @ClearlyClaire)
-- Fix posts made in the future being allowed to trend (#32996 by @ClearlyClaire)
-- Fix uploading higher-than-wide GIF profile picture with libvips enabled (#32911 by @ClearlyClaire)
-- Fix domain attribution field having autocorrect and autocapitalize enabled (#32903 by @ClearlyClaire)
-- Fix titles being escaped twice (#32889 by @ClearlyClaire)
-- Fix list creation limit check (#32869 by @ClearlyClaire)
-- Fix error in `tootctl email_domain_blocks` when supplying `--with-dns-records` (#32863 by @mjankowski)
-- Fix `min_id` and `max_id` causing error in search API (#32857 by @Gargron)
-- Fix inefficiencies when processing removal of posts that use featured tags (#32787 by @ClearlyClaire)
-- Fix alt-text pop-in not using the translated description (#32766 by @ClearlyClaire)
-- Fix preview cards with long titles erroneously causing layout changes (#32678 by @ClearlyClaire)
-- Fix embed modal layout on mobile (#32641 by @DismalShadowX)
-- Fix and improve batch attachment deletion handling when using OpenStack Swift (#32637 by @hugogameiro)
-- Fix blocks not being applied on link timeline (#32625 by @tribela)
-- Fix follow counters being incorrectly changed (#32622 by @oneiros)
-- Fix 'unknown' media attachment type rendering (#32613 and #32713 by @ThisIsMissEm and @renatolond)
-- Fix tl language native name (#32606 by @seav)
-
-### Security
-
-- Update dependencies
-
 ## [4.3.1] - 2024-10-21
 
 ### Added

Gemfile.lock

@@ -698,7 +698,7 @@ GEM
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.3.9)
+    rexml (3.3.8)
     rotp (6.3.0)
     rouge (4.3.0)
     rpam2 (4.0.2)

app/controllers/admin/announcements_controller.rb

@@ -6,7 +6,6 @@ class Admin::AnnouncementsController < Admin::BaseController
 
   def index
     authorize :announcement, :index?
-    @published_announcements_count = Announcement.published.async_count
   end
 
   def new

app/controllers/admin/disputes/appeals_controller.rb

@@ -6,7 +6,6 @@ class Admin::Disputes::AppealsController < Admin::BaseController
   def index
     authorize :appeal, :index?
 
-    @pending_appeals_count = Appeal.pending.async_count
     @appeals = filtered_appeals.page(params[:page])
   end
 

app/controllers/admin/trends/links/preview_card_providers_controller.rb

@@ -4,7 +4,6 @@ class Admin::Trends::Links::PreviewCardProvidersController < Admin::BaseControll
   def index
     authorize :preview_card_provider, :review?
 
-    @pending_preview_card_providers_count = PreviewCardProvider.unreviewed.async_count
     @preview_card_providers = filtered_preview_card_providers.page(params[:page])
     @form = Trends::PreviewCardProviderBatch.new
   end

app/controllers/admin/trends/tags_controller.rb

@@ -4,7 +4,6 @@ class Admin::Trends::TagsController < Admin::BaseController
   def index
     authorize :tag, :review?
 
-    @pending_tags_count = Tag.pending_review.async_count
     @tags = filtered_tags.page(params[:page])
     @form = Trends::TagBatch.new
   end

app/controllers/api/v1/accounts_controller.rb

@@ -16,7 +16,6 @@ class Api::V1::AccountsController < Api::BaseController
   before_action :check_account_confirmation, except: [:index, :create]
   before_action :check_enabled_registrations, only: [:create]
   before_action :check_accounts_limit, only: [:index]
-  before_action :check_following_self, only: [:follow]
 
   skip_before_action :require_authenticated_user!, only: :create
 
@@ -102,10 +101,6 @@ class Api::V1::AccountsController < Api::BaseController
     raise(Mastodon::ValidationError) if account_ids.size > DEFAULT_ACCOUNTS_LIMIT
   end
 
-  def check_following_self
-    render json: { error: I18n.t('accounts.self_follow_error') }, status: 403 if current_user.account.id == @account.id
-  end
-
   def relationships(**options)
     AccountRelationshipsPresenter.new([@account], current_user.account_id, **options)
   end

app/helpers/application_helper.rb

@@ -79,7 +79,7 @@ module ApplicationHelper
 
   def html_title
     safe_join(
-      [content_for(:page_title), title]
+      [content_for(:page_title).to_s.chomp, title]
       .compact_blank,
       ' - '
     )

app/helpers/languages_helper.rb

@@ -162,7 +162,7 @@ module LanguagesHelper
     th: ['Thai', 'ไทย'].freeze,
     ti: ['Tigrinya', 'ትግርኛ'].freeze,
     tk: ['Turkmen', 'Türkmen'].freeze,
-    tl: ['Tagalog', 'Tagalog'].freeze,
+    tl: ['Tagalog', 'Wikang Tagalog'].freeze,
     tn: ['Tswana', 'Setswana'].freeze,
     to: ['Tonga', 'faka Tonga'].freeze,
     tr: ['Turkish', 'Türkçe'].freeze,

app/javascript/mastodon/components/content_warning.tsx

@@ -8,7 +8,7 @@ export const ContentWarning: React.FC<{
   <StatusBanner
     expanded={expanded}
     onClick={onClick}
-    variant={BannerVariant.Warning}
+    variant={BannerVariant.Yellow}
   >
     <p dangerouslySetInnerHTML={{ __html: text }} />
   </StatusBanner>

app/javascript/mastodon/components/filter_warning.tsx

@@ -10,16 +10,13 @@ export const FilterWarning: React.FC<{
   <StatusBanner
     expanded={expanded}
     onClick={onClick}
-    variant={BannerVariant.Filter}
+    variant={BannerVariant.Blue}
   >
     <p>
       <FormattedMessage
         id='filter_warning.matches_filter'
-        defaultMessage='Matches filter “<span>{title}</span>”'
-        values={{
-          title,
-          span: (chunks) => <span className='filter-name'>{chunks}</span>,
-        }}
+        defaultMessage='Matches filter “{title}”'
+        values={{ title }}
       />
     </p>
   </StatusBanner>

app/javascript/mastodon/components/media_gallery.jsx

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

app/javascript/mastodon/components/status.jsx

@@ -449,7 +449,7 @@ class Status extends ImmutablePureComponent {
     } else if (status.get('media_attachments').size > 0) {
       const language = status.getIn(['translation', 'language']) || status.get('language');
 
-      if (['image', 'gifv', 'unknown'].includes(status.getIn(['media_attachments', 0, 'type'])) || status.get('media_attachments').size > 1) {
+      if (['image', 'gifv'].includes(status.getIn(['media_attachments', 0, 'type'])) || status.get('media_attachments').size > 1) {
         media = (
           <Bundle fetchComponent={MediaGallery} loading={this.renderLoadingMediaGallery}>
             {Component => (

app/javascript/mastodon/components/status_banner.tsx

@@ -1,8 +1,8 @@
 import { FormattedMessage } from 'react-intl';
 
 export enum BannerVariant {
-  Warning = 'warning',
-  Filter = 'filter',
+  Yellow = 'yellow',
+  Blue = 'blue',
 }
 
 export const StatusBanner: React.FC<{
@@ -11,9 +11,9 @@ export const StatusBanner: React.FC<{
   expanded?: boolean;
   onClick?: () => void;
 }> = ({ children, variant, expanded, onClick }) => (
-  <label
+  <div
     className={
-      variant === BannerVariant.Warning
+      variant === BannerVariant.Yellow
         ? 'content-warning'
         : 'content-warning content-warning--filter'
     }
@@ -26,11 +26,6 @@ export const StatusBanner: React.FC<{
           id='content_warning.hide'
           defaultMessage='Hide post'
         />
-      ) : variant === BannerVariant.Warning ? (
-        <FormattedMessage
-          id='content_warning.show_more'
-          defaultMessage='Show more'
-        />
       ) : (
         <FormattedMessage
           id='content_warning.show'
@@ -38,5 +33,5 @@ export const StatusBanner: React.FC<{
         />
       )}
     </button>
-  </label>
+  </div>
 );

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

@@ -152,7 +152,7 @@ export const DetailedStatus: React.FC<{
     media = <PictureInPicturePlaceholder aspectRatio={attachmentAspectRatio} />;
   } else if (status.get('media_attachments').size > 0) {
     if (
-      ['image', 'gifv', 'unknown'].includes(
+      ['image', 'gifv'].includes(
         status.getIn(['media_attachments', 0, 'type']) as string,
       ) ||
       status.get('media_attachments').size > 1

app/javascript/mastodon/locales/ar.json

@@ -302,6 +302,7 @@
   "filter_modal.select_filter.subtitle": "استخدم فئة موجودة أو قم بإنشاء فئة جديدة",
   "filter_modal.select_filter.title": "تصفية هذا المنشور",
   "filter_modal.title.status": "تصفية منشور",
+  "filter_warning.matches_filter": "يطابق عامل التصفية \"{title}\"",
   "filtered_notifications_banner.title": "الإشعارات المصفاة",
   "firehose.all": "الكل",
   "firehose.local": "هذا الخادم",
@@ -490,7 +491,6 @@
   "notification.label.private_reply": "رد خاص",
   "notification.label.reply": "ردّ",
   "notification.mention": "إشارة",
-  "notification.mentioned_you": "{name} mentioned you",
   "notification.moderation-warning.learn_more": "اعرف المزيد",
   "notification.moderation_warning": "لقد تلقيت تحذيرًا بالإشراف",
   "notification.moderation_warning.action_delete_statuses": "تم حذف بعض من منشوراتك.",

app/javascript/mastodon/locales/ast.json

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

app/javascript/mastodon/locales/be.json

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

app/javascript/mastodon/locales/bg.json

@@ -22,7 +22,7 @@
   "account.cancel_follow_request": "Оттегляне на заявката за последване",
   "account.copy": "Копиране на връзка към профила",
   "account.direct": "Частно споменаване на @{name}",
-  "account.disable_notifications": "Спиране на известяване при публикуване от @{name}",
+  "account.disable_notifications": "Сприране на известия при публикуване от @{name}",
   "account.domain_blocked": "Блокиран домейн",
   "account.edit_profile": "Редактиране на профила",
   "account.enable_notifications": "Известяване при публикуване от @{name}",
@@ -120,7 +120,7 @@
   "column.about": "Относно",
   "column.blocks": "Блокирани потребители",
   "column.bookmarks": "Отметки",
-  "column.community": "Локална хронология",
+  "column.community": "Локален инфопоток",
   "column.direct": "Частни споменавания",
   "column.directory": "Разглеждане на профили",
   "column.domain_blocks": "Блокирани домейни",
@@ -132,7 +132,7 @@
   "column.mutes": "Заглушени потребители",
   "column.notifications": "Известия",
   "column.pins": "Закачени публикации",
-  "column.public": "Федеративна хронология",
+  "column.public": "Федериран инфопоток",
   "column_back_button.label": "Назад",
   "column_header.hide_settings": "Скриване на настройките",
   "column_header.moveLeft_settings": "Преместване на колона вляво",
@@ -193,11 +193,9 @@
   "confirmations.reply.message": "Отговарянето сега ще замени съобщението, което в момента съставяте. Сигурни ли сте, че искате да продължите?",
   "confirmations.reply.title": "Презаписвате ли публикацията?",
   "confirmations.unfollow.confirm": "Без следване",
-  "confirmations.unfollow.message": "Наистина ли искате вече да не следвате {name}?",
+  "confirmations.unfollow.message": "Наистина ли искате да не следвате {name}?",
   "confirmations.unfollow.title": "Спирате ли да следвате потребителя?",
   "content_warning.hide": "Скриване на публ.",
-  "content_warning.show": "Нека се покаже",
-  "content_warning.show_more": "Показване на още",
   "conversation.delete": "Изтриване на разговора",
   "conversation.mark_as_read": "Маркиране като прочетено",
   "conversation.open": "Преглед на разговора",
@@ -213,7 +211,7 @@
   "disabled_account_banner.text": "Вашият акаунт {disabledAccount} сега е изключен.",
   "dismissable_banner.community_timeline": "Ето най-скорошните публични публикации от хора, чиито акаунти са разположени в {domain}.",
   "dismissable_banner.dismiss": "Отхвърляне",
-  "dismissable_banner.explore_links": "Има новинарски истории, които са най-споделяните в социалната мрежа днес. По-нови новинарски истории, публикувани от повече различни хора са класирани по-напред.",
+  "dismissable_banner.explore_links": "Това са най-споделяните новини в социалната мрежа днес. По-нови истории, споделени от повече хора се показват по-напред.",
   "dismissable_banner.explore_statuses": "Има публикации през социалната мрежа, които днес набират популярност. По-новите публикации с повече подсилвания и любими са класирани по-високо.",
   "dismissable_banner.explore_tags": "Тези хаштагове сега набират популярност сред хората в този и други сървъри на децентрализирата мрежа.",
   "dismissable_banner.public_timeline": "Ето най-новите обществени публикации от хора в социална мрежа, която хората в {domain} следват.",
@@ -223,8 +221,6 @@
   "domain_block_modal.they_cant_follow": "Никого от този сървър не може да ви последва.",
   "domain_block_modal.they_wont_know": "Няма да узнаят, че са били блокирани.",
   "domain_block_modal.title": "Блокирате ли домейн?",
-  "domain_block_modal.you_will_lose_num_followers": "Ще загубите {followersCount, plural, one {{followersCountDisplay} последовател} other {{followersCountDisplay} последователи}} и {followingCount, plural, one {{followingCountDisplay} лице, което следвате} other {{followingCountDisplay} души, които следвате}}.",
-  "domain_block_modal.you_will_lose_relationships": "Ще загубите всичките си последователи и хората, които следвате от този сървър.",
   "domain_block_modal.you_wont_see_posts": "Няма да виждате публикации или известия от потребителите на този сървър.",
   "domain_pill.activitypub_lets_connect": "Позволява ви да се свързвате и взаимодействате с хора не само в Mastodon, но и през различни социални приложения.",
   "domain_pill.activitypub_like_language": "ActivityPub е като език на Mastodon, говорещ с други социални мрежи.",
@@ -262,16 +258,16 @@
   "empty_column.account_unavailable": "Профилът не е наличен",
   "empty_column.blocks": "Още не сте блокирали никакви потребители.",
   "empty_column.bookmarked_statuses": "Още не сте отметнали публикации. Отметвайки някоя, то тя ще се покаже тук.",
-  "empty_column.community": "Локалната хронология е празна. Напишете нещо публично, за да завъртите процеса!",
+  "empty_column.community": "Локалният инфопоток е празен. Публикувайте нещо, за да започнете!",
   "empty_column.direct": "Още нямате никакви частни споменавания. Тук ще се показват, изпращайки или получавайки едно.",
   "empty_column.domain_blocks": "Още няма блокирани домейни.",
-  "empty_column.explore_statuses": "Няма нищо популярно в момента. Проверете пак по-късно!",
+  "empty_column.explore_statuses": "Няма тенденции в момента. Проверете пак по-късно!",
   "empty_column.favourited_statuses": "Още нямате никакви любими публикации. Правейки любима, то тя ще се покаже тук.",
   "empty_column.favourites": "Още никого не е слагал публикацията в любими. Когато някой го направи, този човек ще се покаже тук.",
   "empty_column.follow_requests": "Още нямате заявки за последване. Получавайки такава, то тя ще се покаже тук.",
   "empty_column.followed_tags": "Още не сте последвали никакви хаштагове. Последваните хаштагове ще се покажат тук.",
   "empty_column.hashtag": "Още няма нищо в този хаштаг.",
-  "empty_column.home": "Вашата начална хронология е празна! Последвайте повече хора, за да се запълни.",
+  "empty_column.home": "Вашата начална часова ос е празна! Последвайте повече хора, за да я запълните. {suggestions}",
   "empty_column.list": "Все още списъкът е празен. Членуващите на списъка, публикуващи нови публикации, ще се появят тук.",
   "empty_column.lists": "Все още нямате списъци. Когато създадете такъв, той ще се покаже тук.",
   "empty_column.mutes": "Още не сте заглушавали потребители.",
@@ -306,7 +302,6 @@
   "filter_modal.select_filter.subtitle": "Изберете съществуваща категория или създайте нова",
   "filter_modal.select_filter.title": "Филтриране на публ.",
   "filter_modal.title.status": "Филтриране на публ.",
-  "filter_warning.matches_filter": "Съвпадащ филтър на “<span>{title}</span>”",
   "filtered_notifications_banner.pending_requests": "От {count, plural, =0 {никого, когото може да познавате} one {едно лице, което може да познавате} other {# души, които може да познавате}}",
   "filtered_notifications_banner.title": "Филтрирани известия",
   "firehose.all": "Всичко",
@@ -371,23 +366,13 @@
   "home.pending_critical_update.link": "Преглед на обновяванията",
   "home.pending_critical_update.title": "Налично критично обновяване на сигурността!",
   "home.show_announcements": "Показване на оповестяванията",
-  "ignore_notifications_modal.disclaimer": "Mastodon не може да осведоми потребители, че сте пренебрегнали известията им. Пренебрегването на известията няма да спре самите съобщения да не бъдат изпращани.",
-  "ignore_notifications_modal.filter_to_act_users": "Вие все още ще може да приемате, отхвърляте или докладвате потребители",
-  "ignore_notifications_modal.filter_to_avoid_confusion": "Прецеждането помага за избягване на възможно объркване",
-  "ignore_notifications_modal.filter_to_review_separately": "Може да разгледате отделно филтрираните известия",
-  "ignore_notifications_modal.ignore": "Пренебрегване на известията",
-  "ignore_notifications_modal.limited_accounts_title": "Пренебрегвате ли известията от модерирани акаунти?",
-  "ignore_notifications_modal.new_accounts_title": "Пренебрегвате ли известията от нови акаунти?",
-  "ignore_notifications_modal.not_followers_title": "Пренебрегвате ли известията от хора, които не са ви последвали?",
-  "ignore_notifications_modal.not_following_title": "Пренебрегвате ли известията от хора, които не сте последвали?",
-  "ignore_notifications_modal.private_mentions_title": "Пренебрегвате ли известия от непоискани лични споменавания?",
   "interaction_modal.description.favourite": "Имайки акаунт в Mastodon, може да сложите тази публикации в любими, за да позволите на автора да узнае, че я цените и да я запазите за по-късно.",
   "interaction_modal.description.follow": "С акаунт в Mastodon може да последвате {name}, за да получавате публикациите от този акаунт в началния си инфоканал.",
   "interaction_modal.description.reblog": "С акаунт в Mastodon може да подсилите тази публикация, за да я споделите с последователите си.",
   "interaction_modal.description.reply": "С акаунт в Mastodon може да добавите отговор към тази публикация.",
   "interaction_modal.login.action": "Към началото",
   "interaction_modal.login.prompt": "Домейнът на сървъра ви, примерно, mastodon.social",
-  "interaction_modal.no_account_yet": "Още ли не сте в Mastodon?",
+  "interaction_modal.no_account_yet": "Още не е в Мастодон?",
   "interaction_modal.on_another_server": "На различен сървър",
   "interaction_modal.on_this_server": "На този сървър",
   "interaction_modal.sign_in": "Не сте влезли в този сървър. Къде се хоства акаунтът ви?",
@@ -410,12 +395,12 @@
   "keyboard_shortcuts.enter": "Отваряне на публикация",
   "keyboard_shortcuts.favourite": "Любима публикация",
   "keyboard_shortcuts.favourites": "Отваряне на списъка с любими",
-  "keyboard_shortcuts.federated": "Отваряне на федералната хронология",
+  "keyboard_shortcuts.federated": "Отваряне на федерирания инфопоток",
   "keyboard_shortcuts.heading": "Клавишни съчетания",
-  "keyboard_shortcuts.home": "Отваряне на началната хронология",
+  "keyboard_shortcuts.home": "Отваряне на личния инфопоток",
   "keyboard_shortcuts.hotkey": "Бърз клавиш",
   "keyboard_shortcuts.legend": "Показване на тази легенда",
-  "keyboard_shortcuts.local": "Отваряне на локалната хронология",
+  "keyboard_shortcuts.local": "Отваряне на локалния инфопоток",
   "keyboard_shortcuts.mention": "Споменаване на автора",
   "keyboard_shortcuts.muted": "Отваряне на списъка със заглушени потребители",
   "keyboard_shortcuts.my_profile": "Отваряне на профила ви",
@@ -436,8 +421,6 @@
   "lightbox.close": "Затваряне",
   "lightbox.next": "Напред",
   "lightbox.previous": "Назад",
-  "lightbox.zoom_in": "Увеличение до действителната големина",
-  "lightbox.zoom_out": "Увеличение до побиране",
   "limited_account_hint.action": "Показване на профила въпреки това",
   "limited_account_hint.title": "Този профил е бил скрит от модераторите на {domain}.",
   "link_preview.author": "От {name}",
@@ -459,7 +442,6 @@
   "lists.subheading": "Вашите списъци",
   "load_pending": "{count, plural, one {# нов елемент} other {# нови елемента}}",
   "loading_indicator.label": "Зареждане…",
-  "media_gallery.hide": "Скриване",
   "moved_to_account_banner.text": "Вашият акаунт {disabledAccount} сега е изключен, защото се преместихте в {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Скриване от известията",
   "mute_modal.hide_options": "Скриване на възможностите",
@@ -475,7 +457,7 @@
   "navigation_bar.advanced_interface": "Отваряне в разширен уебинтерфейс",
   "navigation_bar.blocks": "Блокирани потребители",
   "navigation_bar.bookmarks": "Отметки",
-  "navigation_bar.community_timeline": "Локална хронология",
+  "navigation_bar.community_timeline": "Локален инфопоток",
   "navigation_bar.compose": "Съставяне на нова публикация",
   "navigation_bar.direct": "Частни споменавания",
   "navigation_bar.discover": "Откриване",
@@ -508,7 +490,6 @@
   "notification.favourite": "{name} направи любима публикацията ви",
   "notification.favourite.name_and_others_with_link": "{name} и <a>{count, plural, one {# друг} other {# други}}</a> направиха любима ваша публикация",
   "notification.follow": "{name} ви последва",
-  "notification.follow.name_and_others": "{name} и <a>{count, plural, one {# друг} other {# други}}</a> ви последваха",
   "notification.follow_request": "{name} поиска да ви последва",
   "notification.follow_request.name_and_others": "{name} и {count, plural, one {# друг} other {# други}} поискаха да ви последват",
   "notification.label.mention": "Споменаване",
@@ -516,7 +497,6 @@
   "notification.label.private_reply": "Личен отговор",
   "notification.label.reply": "Отговор",
   "notification.mention": "Споменаване",
-  "notification.mentioned_you": "{name} ви спомена",
   "notification.moderation-warning.learn_more": "Научете повече",
   "notification.moderation_warning": "Получихте предупреждение за модериране",
   "notification.moderation_warning.action_delete_statuses": "Някои от публикациите ви са премахнати.",
@@ -538,15 +518,10 @@
   "notification.status": "{name} току-що публикува",
   "notification.update": "{name} промени публикация",
   "notification_requests.accept": "Приемам",
-  "notification_requests.accept_multiple": "{count, plural, one {Приемане на # заявка…} other {Приемане на # заявки…}}",
-  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Приемане на заявката} other {Приемане на заявките}}",
   "notification_requests.confirm_accept_multiple.message": "На път сте да приемете {count, plural, one {едно известие за заявка} other {# известия за заявки}}. Наистина ли искате да продължите?",
   "notification_requests.confirm_accept_multiple.title": "Приемате ли заявките за известие?",
-  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Отхвърляне на заявката} other {Отхвърляне на заявките}}",
-  "notification_requests.confirm_dismiss_multiple.message": "На път сте да отхвърлите {count, plural, one {една заявка за известие} other {# заявки за известие}}. Няма да имате лесен достъп до {count, plural, one {това лице} other {тях}} отново. Наистина ли искате да продължите?",
   "notification_requests.confirm_dismiss_multiple.title": "Отхвърляте ли заявките за известие?",
   "notification_requests.dismiss": "Отхвърлям",
-  "notification_requests.dismiss_multiple": "{count, plural, one {Отхвърляне на # заявка…} other {Отхвърляне на # заявки…}}",
   "notification_requests.edit_selection": "Редактиране",
   "notification_requests.exit_selection": "Готово",
   "notification_requests.explainer_for_limited_account": "Известията от този акаунт са прецедени, защото акаунтът е ограничен от модератор.",
@@ -567,7 +542,6 @@
   "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": "Изскачащи известия",
@@ -593,8 +567,6 @@
   "notifications.permission_required": "Известията на работния плот ги няма, щото няма дадено нужното позволение.",
   "notifications.policy.accept": "Приемам",
   "notifications.policy.accept_hint": "Показване в известия",
-  "notifications.policy.drop": "Пренебрегване",
-  "notifications.policy.drop_hint": "Изпращане в празнотата, за да не се видим никога пак",
   "notifications.policy.filter": "Филтър",
   "notifications.policy.filter_limited_accounts_hint": "Ограничено от модераторите на сървъра",
   "notifications.policy.filter_limited_accounts_title": "Модерирани акаунти",
@@ -615,7 +587,7 @@
   "onboarding.actions.go_to_explore": "Виж тенденции",
   "onboarding.actions.go_to_home": "Към началния ми инфоканал",
   "onboarding.compose.template": "Здравейте, #Mastodon!",
-  "onboarding.follows.empty": "За съжаление, в момента не могат да се показват резултати. Може да опитате посредством търсене или сърфиране да разгледате страницата, за да намерите хора за последване, или опитайте пак по-късно.",
+  "onboarding.follows.empty": "За съжаление, в момента не могат да бъдат показани резултати. Може да опитате да търсите или да разгледате, за да намерите кого да последвате, или опитайте отново по-късно.",
   "onboarding.follows.lead": "Може да бъдете куратор на началния си инфоканал. Последвайки повече хора, по-деен и по-интересен ще става. Тези профили може да са добра начална точка, от която винаги по-късно да спрете да следвате!",
   "onboarding.follows.title": "Популярно в Mastodon",
   "onboarding.profile.discoverable": "Правене на моя профил откриваем",
@@ -623,7 +595,7 @@
   "onboarding.profile.display_name": "Името на показ",
   "onboarding.profile.display_name_hint": "Вашето пълно име или псевдоним…",
   "onboarding.profile.lead": "Винаги може да завършите това по-късно в настройките, където дори има повече възможности за настройване.",
-  "onboarding.profile.note": "Биография",
+  "onboarding.profile.note": "Биогр.",
   "onboarding.profile.note_hint": "Може да @споменавате други хора или #хаштагове…",
   "onboarding.profile.save_and_continue": "Запазване и продължаване",
   "onboarding.profile.title": "Настройване на профила",
@@ -640,7 +612,7 @@
   "onboarding.steps.follow_people.title": "Персонализиране на началния ви инфоканал",
   "onboarding.steps.publish_status.body": "Поздравете целия свят.",
   "onboarding.steps.publish_status.title": "Направете първата си публикация",
-  "onboarding.steps.setup_profile.body": "Подсилете взаимодействията си, имайки изчерпателен профил.",
+  "onboarding.steps.setup_profile.body": "Други са по-вероятно да взаимодействат с вас с попълнения профил.",
   "onboarding.steps.setup_profile.title": "Пригодете профила си",
   "onboarding.steps.share_profile.body": "Позволете на приятелите си да знаят как да ви намират в Mastodon!",
   "onboarding.steps.share_profile.title": "Споделяне на профила ви",
@@ -711,7 +683,7 @@
   "report.placeholder": "Допълнителни коментари",
   "report.reasons.dislike": "Не ми харесва",
   "report.reasons.dislike_description": "Не е нещо, което искате да виждате",
-  "report.reasons.legal": "Незаконно е",
+  "report.reasons.legal": "Законово е",
   "report.reasons.legal_description": "Смятате, че това нарушава закона на вашата страна или държавата на сървъра",
   "report.reasons.other": "Нещо друго е",
   "report.reasons.other_description": "Проблемът не попада в нито една от останалите категории",
@@ -749,7 +721,7 @@
   "search.quick_action.open_url": "Отваряне на URL адреса в Mastodon",
   "search.quick_action.status_search": "Съвпадение на публикации {x}",
   "search.search_or_paste": "Търсене/поставяне на URL",
-  "search_popout.full_text_search_disabled_message": "Не е налично на {domain}.",
+  "search_popout.full_text_search_disabled_message": "Не е достъпно на {domain}.",
   "search_popout.full_text_search_logged_out_message": "Достъпно само при влизане в системата.",
   "search_popout.language_code": "Код на езика по ISO",
   "search_popout.options": "Възможности при търсене",
@@ -781,7 +753,6 @@
   "status.bookmark": "Отмятане",
   "status.cancel_reblog_private": "Край на подсилването",
   "status.cannot_reblog": "Публикацията не може да се подсилва",
-  "status.continued_thread": "Продължена нишка",
   "status.copy": "Копиране на връзката към публикация",
   "status.delete": "Изтриване",
   "status.detailed_status": "Подробен изглед на разговора",
@@ -790,7 +761,6 @@
   "status.edit": "Редактиране",
   "status.edited": "Последно редактирано на {date}",
   "status.edited_x_times": "Редактирано {count, plural,one {{count} път} other {{count} пъти}}",
-  "status.embed": "Вземане на кода за вграждане",
   "status.favourite": "Любимо",
   "status.favourites": "{count, plural, one {любимо} other {любими}}",
   "status.filter": "Филтриране на публ.",
@@ -815,7 +785,6 @@
   "status.reblogs.empty": "Още никого не е подсилвал публикацията. Подсилващият ще се покаже тук.",
   "status.redraft": "Изтриване и преработване",
   "status.remove_bookmark": "Премахване на отметката",
-  "status.replied_in_thread": "Отговорено в нишката",
   "status.replied_to": "В отговор до {name}",
   "status.reply": "Отговор",
   "status.replyAll": "Отговор на нишка",
@@ -831,9 +800,9 @@
   "status.uncached_media_warning": "Онагледяването не е налично",
   "status.unmute_conversation": "Без заглушаването на разговора",
   "status.unpin": "Разкачане от профила",
-  "subscribed_languages.lead": "Публикации само на избрани езици ще се явяват в началото ви и в хронологичните списъци след промяната. Изберете \"нищо\", за да получавате публикации на всички езици.",
+  "subscribed_languages.lead": "Публикации само на избрани езици ще се явяват в началото ви и в списъка с часови оси след промяната. Изберете \"нищо\", за да получавате публикации на всички езици.",
   "subscribed_languages.save": "Запазване на промените",
-  "subscribed_languages.target": "Промяна на абонираните езици за {target}",
+  "subscribed_languages.target": "Смяна на езика за {target}",
   "tabs_bar.home": "Начало",
   "tabs_bar.notifications": "Известия",
   "time_remaining.days": "{number, plural, one {остава # ден} other {остават # дни}}",
@@ -853,11 +822,6 @@
   "upload_error.poll": "Качването на файлове не е позволено с анкети.",
   "upload_form.audio_description": "Опишете за хора, които са глухи или трудно чуват",
   "upload_form.description": "Опишете за хора, които са слепи или имат слабо зрение",
-  "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} е преместено.",
-  "upload_form.drag_and_drop.on_drag_start": "Избрано мултимедийно прикачване {item}.",
   "upload_form.edit": "Редактиране",
   "upload_form.thumbnail": "Промяна на миниобраза",
   "upload_form.video_description": "Опишете за хора, които са глухи или трудно чуват, слепи или имат слабо зрение",

app/javascript/mastodon/locales/br.json

@@ -172,7 +172,6 @@
   "confirmations.reply.message": "Respont bremañ a zilamo ar gemennadenn emaoc'h o skrivañ. Sur e oc'h e fell deoc'h kenderc'hel ganti?",
   "confirmations.unfollow.confirm": "Diheuliañ",
   "confirmations.unfollow.message": "Ha sur oc'h e fell deoc'h paouez da heuliañ {name} ?",
-  "content_warning.show_more": "Diskouez muioc'h",
   "conversation.delete": "Dilemel ar gaozeadenn",
   "conversation.mark_as_read": "Merkañ evel lennet",
   "conversation.open": "Gwelout ar gaozeadenn",
@@ -251,7 +250,6 @@
   "filter_modal.select_filter.subtitle": "Implijout ur rummad a zo anezhañ pe krouiñ unan nevez",
   "filter_modal.select_filter.title": "Silañ an toud-mañ",
   "filter_modal.title.status": "Silañ un toud",
-  "filter_warning.matches_filter": "A glot gant ar sil “<span>{title}</span>”",
   "firehose.all": "Pep tra",
   "firehose.local": "Ar servijer-mañ",
   "firehose.remote": "Servijerioù all",

app/javascript/mastodon/locales/ca.json

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Deixar de seguir l'usuari?",
   "content_warning.hide": "Amaga la publicació",
   "content_warning.show": "Mostra-la igualment",
-  "content_warning.show_more": "Mostra'n més",
   "conversation.delete": "Elimina la conversa",
   "conversation.mark_as_read": "Marca com a llegida",
   "conversation.open": "Mostra la conversa",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Usa una categoria existent o crea'n una de nova",
   "filter_modal.select_filter.title": "Filtra aquest tut",
   "filter_modal.title.status": "Filtra un tut",
-  "filter_warning.matches_filter": "Coincideix amb el filtre “<span>{title}</span>”",
+  "filter_warning.matches_filter": "Coincideix amb el filtre “{title}”",
   "filtered_notifications_banner.pending_requests": "{count, plural, =0 {De ningú} one {D'una persona} other {De # persones}} que potser coneixes",
   "filtered_notifications_banner.title": "Notificacions filtrades",
   "firehose.all": "Tots",
@@ -509,7 +508,6 @@
   "notification.favourite": "{name} ha afavorit el teu tut",
   "notification.favourite.name_and_others_with_link": "{name} i <a>{count, plural, one {# altre} other {# altres}}</a> han afavorit la vostra publicació",
   "notification.follow": "{name} et segueix",
-  "notification.follow.name_and_others": "{name} i <a>{count, plural, one {# altre} other {# altres}}</a> us han seguit",
   "notification.follow_request": "{name} ha sol·licitat de seguir-te",
   "notification.follow_request.name_and_others": "{name} i {count, plural, one {# altre} other {# altres}} han demanat de seguir-vos",
   "notification.label.mention": "Menció",
@@ -568,7 +566,6 @@
   "notifications.column_settings.filter_bar.category": "Barra ràpida de filtres",
   "notifications.column_settings.follow": "Nous seguidors:",
   "notifications.column_settings.follow_request": "Noves sol·licituds de seguiment:",
-  "notifications.column_settings.group": "Agrupa",
   "notifications.column_settings.mention": "Mencions:",
   "notifications.column_settings.poll": "Resultats de l’enquesta:",
   "notifications.column_settings.push": "Notificacions push",
@@ -615,11 +612,11 @@
   "onboarding.action.back": "Porta'm enrere",
   "onboarding.actions.back": "Porta'm enrere",
   "onboarding.actions.go_to_explore": "Mira què és tendència",
-  "onboarding.actions.go_to_home": "Aneu a la vostra pantalla d'inici",
+  "onboarding.actions.go_to_home": "Ves a la teva línia de temps",
   "onboarding.compose.template": "Hola Mastodon!",
   "onboarding.follows.empty": "Malauradament, cap resultat pot ser mostrat ara mateix. Pots provar de fer servir la cerca o visitar la pàgina Explora per a trobar gent a qui seguir o provar-ho de nou més tard.",
-  "onboarding.follows.lead": "La vostra pantalla d'inici és la manera principal d'experimentar Mastodon. Com més gent seguiu, més activa i interessant serà. Per a començar, alguns suggeriments:",
-  "onboarding.follows.title": "Personalitzeu la pantalla d'inci",
+  "onboarding.follows.lead": "La teva línia de temps inici només està a les teves mans. Com més gent segueixis, més activa i interessant serà. Aquests perfils poden ser un bon punt d'inici—sempre pots acabar deixant de seguir-los!:",
+  "onboarding.follows.title": "Personalitza la pantalla d'inci",
   "onboarding.profile.discoverable": "Fes el meu perfil descobrible",
   "onboarding.profile.discoverable_hint": "En acceptar d'ésser descobert a Mastodon els teus missatges poden aparèixer dins les tendències i els resultats de cerques, i el teu perfil es pot suggerir a qui tingui interessos semblants als teus.",
   "onboarding.profile.display_name": "Nom que es mostrarà",
@@ -639,7 +636,7 @@
   "onboarding.start.skip": "Vols saltar-te tota la resta?",
   "onboarding.start.title": "Llestos!",
   "onboarding.steps.follow_people.body": "Mastodon va de seguir a gent interessant.",
-  "onboarding.steps.follow_people.title": "Personalitzeu la pantalla d'inici",
+  "onboarding.steps.follow_people.title": "Personalitza la pantalla d'inci",
   "onboarding.steps.publish_status.body": "Saluda al món amb text, fotos, vídeos o enquestes {emoji}",
   "onboarding.steps.publish_status.title": "Fes el teu primer tut",
   "onboarding.steps.setup_profile.body": "És més fàcil que altres interactuïn amb tu si tens un perfil complet.",
@@ -678,7 +675,7 @@
   "recommended": "Recomanat",
   "refresh": "Actualitza",
   "regeneration_indicator.label": "Es carrega…",
-  "regeneration_indicator.sublabel": "Es prepara la vostra pantalla d'Inici!",
+  "regeneration_indicator.sublabel": "Es prepara la teva línia de temps d'Inici!",
   "relative_time.days": "{number}d",
   "relative_time.full.days": "fa {number, plural, one {# dia} other {# dies}}",
   "relative_time.full.hours": "fa {number, plural, one {# hora} other {# hores}}",

app/javascript/mastodon/locales/cy.json

@@ -13,7 +13,7 @@
   "about.rules": "Rheolau'r gweinydd",
   "account.account_note_header": "Nodyn personol",
   "account.add_or_remove_from_list": "Ychwanegu neu Ddileu o'r rhestrau",
-  "account.badges.bot": "Awtomataidd",
+  "account.badges.bot": "Bot",
   "account.badges.group": "Grŵp",
   "account.block": "Blocio @{name}",
   "account.block_domain": "Blocio parth {domain}",
@@ -36,7 +36,7 @@
   "account.followers.empty": "Does neb yn dilyn y defnyddiwr hwn eto.",
   "account.followers_counter": "{count, plural, one {{counter} dilynwr} two {{counter} ddilynwr} other {{counter} dilynwyr}}",
   "account.following": "Yn dilyn",
-  "account.following_counter": "{count, plural, one {Yn dilyn {counter}} other {Yn dilyn {counter} arall}}",
+  "account.following_counter": "{count, plural, one {Yn dilyn {counter}} other {Yn dilyn {counter}}}",
   "account.follows.empty": "Nid yw'r defnyddiwr hwn yn dilyn unrhyw un eto.",
   "account.go_to_profile": "Mynd i'r proffil",
   "account.hide_reblogs": "Cuddio hybiau gan @{name}",
@@ -62,7 +62,7 @@
   "account.requested_follow": "Mae {name} wedi gwneud cais i'ch dilyn",
   "account.share": "Rhannwch broffil @{name}",
   "account.show_reblogs": "Dangos hybiau gan @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} postiad} two {{counter} bostiad} few {{counter} phostiad} many {{counter} postiad} other {{counter} postiad}}",
+  "account.statuses_counter": "{count, plural, one {{counter} post} two {{counter} bost} few {{counter} phost} many {{counter} post} other {{counter} post}}",
   "account.unblock": "Dadflocio @{name}",
   "account.unblock_domain": "Dadflocio parth {domain}",
   "account.unblock_short": "Dadflocio",
@@ -91,7 +91,7 @@
   "audio.hide": "Cuddio sain",
   "block_modal.remote_users_caveat": "Byddwn yn gofyn i'r gweinydd {domain} barchu eich penderfyniad. Fodd bynnag, nid yw cydymffurfiad wedi'i warantu gan y gall rhai gweinyddwyr drin rhwystro mewn ffyrdd gwahanol. Mae'n bosibl y bydd postiadau cyhoeddus yn dal i fod yn weladwy i ddefnyddwyr nad ydynt wedi mewngofnodi.",
   "block_modal.show_less": "Dangos llai",
-  "block_modal.show_more": "Dangos rhagor",
+  "block_modal.show_more": "Dangos mwy",
   "block_modal.they_cant_mention": "Nid ydynt yn gallu eich crybwyll na'ch dilyn.",
   "block_modal.they_cant_see_posts": "Nid ydynt yn gallu gweld eich postiadau ac ni fyddwch yn gweld eu rhai hwy.",
   "block_modal.they_will_know": "Gallant weld eu bod wedi'u rhwystro.",
@@ -163,9 +163,9 @@
   "compose_form.poll.switch_to_single": "Newid pleidlais i gyfyngu i un dewis",
   "compose_form.poll.type": "Arddull",
   "compose_form.publish": "Postiad",
-  "compose_form.publish_form": "Postiad newydd",
+  "compose_form.publish_form": "Cyhoeddi",
   "compose_form.reply": "Ateb",
-  "compose_form.save_changes": "Diweddaru",
+  "compose_form.save_changes": "Diweddariad",
   "compose_form.spoiler.marked": "Dileu rhybudd cynnwys",
   "compose_form.spoiler.unmarked": "Ychwanegu rhybudd cynnwys",
   "compose_form.spoiler_placeholder": "Rhybudd cynnwys (dewisol)",
@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Dad-ddilyn defnyddiwr?",
   "content_warning.hide": "Cuddio'r postiad",
   "content_warning.show": "Dangos beth bynnag",
-  "content_warning.show_more": "Dangos rhagor",
   "conversation.delete": "Dileu sgwrs",
   "conversation.mark_as_read": "Nodi fel wedi'i ddarllen",
   "conversation.open": "Gweld sgwrs",
@@ -306,8 +305,8 @@
   "filter_modal.select_filter.subtitle": "Defnyddiwch gategori sy'n bodoli eisoes neu crëu un newydd",
   "filter_modal.select_filter.title": "Hidlo'r postiad hwn",
   "filter_modal.title.status": "Hidlo postiad",
-  "filter_warning.matches_filter": "Yn cyd-fynd â'r hidlydd “ <span>{title}</span> ”",
-  "filtered_notifications_banner.pending_requests": "Oddi wrth {count, plural, =0 {no one} one {un person} two {# berson} few {# pherson} other {# person}} efallai eich bod yn eu hadnabod",
+  "filter_warning.matches_filter": "Yn cydweddu'r hidlydd “{title}”",
+  "filtered_notifications_banner.pending_requests": "Gan {count, plural, =0 {no one} one {un person} two {# berson} few {# pherson} other {# person}} efallai eich bod yn eu hadnabod",
   "filtered_notifications_banner.title": "Hysbysiadau wedi'u hidlo",
   "firehose.all": "Popeth",
   "firehose.local": "Gweinydd hwn",
@@ -350,12 +349,12 @@
   "hashtag.column_settings.tag_mode.any": "Unrhyw un o'r rhain",
   "hashtag.column_settings.tag_mode.none": "Dim o'r rhain",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
-  "hashtag.counter_by_accounts": "{count, plural, one {{counter} cyfranogwr} other {{counter} cyfranogwr}}",
+  "hashtag.counter_by_accounts": "{cyfrif, lluosog, un {{counter} cyfranogwr} arall {{counter} cyfranogwr}}",
   "hashtag.counter_by_uses": "{count, plural, one {postiad {counter}} other {postiad {counter}}}",
-  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} postiad} other {{counter} postiad}} heddiw",
+  "hashtag.counter_by_uses_today": "{cyfrif, lluosog, un {{counter} postiad} arall {{counter} postiad}} heddiw",
   "hashtag.follow": "Dilyn hashnod",
   "hashtag.unfollow": "Dad-ddilyn hashnod",
-  "hashtags.and_other": "…a {count, plural, other {# arall}}",
+  "hashtags.and_other": "…a {count, plural, other {# more}}",
   "hints.profiles.followers_may_be_missing": "Mae'n bosibl bod dilynwyr y proffil hwn ar goll.",
   "hints.profiles.follows_may_be_missing": "Mae'n bosibl bod dilynwyr y proffil hwn ar goll.",
   "hints.profiles.posts_may_be_missing": "Mae'n bosibl bod rhai postiadau y proffil hwn ar goll.",
@@ -443,7 +442,7 @@
   "limited_account_hint.title": "Mae'r proffil hwn wedi cael ei guddio gan gymedrolwyr {domain}.",
   "link_preview.author": "Gan {name}",
   "link_preview.more_from_author": "Mwy gan {name}",
-  "link_preview.shares": "{count, plural, one {{counter} postiad } two {{counter} bostiad } few {{counter} postiad} many {{counter} postiad} other {{counter} postiad}}",
+  "link_preview.shares": "{count, plural, one {{counter} ostiad } two {{counter} bostiad } few {{counter} postiad} many {{counter} postiad} other {{counter} postiad}}",
   "lists.account.add": "Ychwanegu at restr",
   "lists.account.remove": "Tynnu o'r rhestr",
   "lists.delete": "Dileu rhestr",
@@ -500,18 +499,18 @@
   "navigation_bar.security": "Diogelwch",
   "not_signed_in_indicator.not_signed_in": "Rhaid i chi fewngofnodi i weld yr adnodd hwn.",
   "notification.admin.report": "Adroddwyd ar {name} {target}",
-  "notification.admin.report_account": "Adroddodd {name} {count, plural, one {un postiad} other {# postiad}} gan {target} oherwydd {category}",
-  "notification.admin.report_account_other": "Adroddodd {name} {count, plural, one {un postiad} two {# bostiad} few {# postiad} other {# postiad}} gan {target}",
+  "notification.admin.report_account": "{name} reported {count, plural, one {un postiad} other {# postiad}} from {target} for {category}",
+  "notification.admin.report_account_other": "Adroddodd {name} {count, plural, one {un postiad} two {# bostiad} few {# phost} other {# postiad}} gan {target}",
   "notification.admin.report_statuses": "Adroddodd {name} {target} ar gyfer {category}",
   "notification.admin.report_statuses_other": "Adroddodd {name} {target}",
   "notification.admin.sign_up": "Cofrestrodd {name}",
-  "notification.admin.sign_up.name_and_others": "Cofrestrodd {name} {count, plural, one {ac # arall} other {a # arall}}",
+  "notification.admin.sign_up.name_and_others": "Cofrestrodd {name} {count, plural, one {ac # arall} other {a # eraill}}",
   "notification.favourite": "Ffafriodd {name} eich postiad",
-  "notification.favourite.name_and_others_with_link": "Ffafriodd {name} a <a>{count, plural, one {# arall} other {# arall}}</a> eich postiad",
+  "notification.favourite.name_and_others_with_link": "Ffafriodd {name} a <a>{count, plural, one {# arall} other {# eraill}}</a> eich postiad",
   "notification.follow": "Dilynodd {name} chi",
-  "notification.follow.name_and_others": "Mae {name} a <a>{count, plural, zero {}one {# arall} two {# arall} few {# arall} many {# others} other {# arall}}</a> nawr yn eich dilyn chi",
+  "notification.follow.name_and_others": "Mae {name} a <a>{count, plural, zero {}one {# other} two {# others} few {# others} many {# others} other {# others}}</a> nawr yn eich dilyn chi",
   "notification.follow_request": "Mae {name} wedi gwneud cais i'ch dilyn",
-  "notification.follow_request.name_and_others": "Mae {name} a{count, plural, one {# arall} other {# arall}} wedi gofyn i'ch dilyn chi",
+  "notification.follow_request.name_and_others": "Mae {name} a{count, plural, one {# other} other {# others}} wedi gofyn i'ch dilyn chi",
   "notification.label.mention": "Crybwyll",
   "notification.label.private_mention": "Crybwyll preifat",
   "notification.label.private_reply": "Ateb preifat",
@@ -530,7 +529,7 @@
   "notification.own_poll": "Mae eich pleidlais wedi dod i ben",
   "notification.poll": "Mae arolwg y gwnaethoch bleidleisio ynddo wedi dod i ben",
   "notification.reblog": "Hybodd {name} eich post",
-  "notification.reblog.name_and_others_with_link": "Mae {name} a <a>{count, plural, one {# arall} other {# arall}}</a> wedi hybu eich postiad",
+  "notification.reblog.name_and_others_with_link": "Mae {name} a <a>{count, plural, one {# other} other {# others}}</a> wedi hybu eich postiad",
   "notification.relationships_severance_event": "Wedi colli cysylltiad â {name}",
   "notification.relationships_severance_event.account_suspension": "Mae gweinyddwr o {from} wedi atal {target}, sy'n golygu na allwch dderbyn diweddariadau ganddynt mwyach na rhyngweithio â nhw.",
   "notification.relationships_severance_event.domain_block": "Mae gweinyddwr o {from} wedi blocio {target}, gan gynnwys {followersCount} o'ch dilynwyr a {followingCount, plural, one {# cyfrif} other {# cyfrif}} arall rydych chi'n ei ddilyn.",
@@ -539,9 +538,9 @@
   "notification.status": "{name} newydd ei bostio",
   "notification.update": "Golygodd {name} bostiad",
   "notification_requests.accept": "Derbyn",
-  "notification_requests.accept_multiple": "{count, plural, one {Derbyn # cais…} other {Derbyn # cais…}}",
-  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Derbyn cais} other {Derbyn cais}}",
-  "notification_requests.confirm_accept_multiple.message": "Rydych ar fin derbyn {count, plural, one {un cais hysbysiad} other {# cais hysbysiad}}. Ydych chi'n siŵr eich bod am barhau?",
+  "notification_requests.accept_multiple": "{count, plural, one {Accept # request…} other {Accept # requests…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Accept request} other {Accept requests}}",
+  "notification_requests.confirm_accept_multiple.message": "Rydych ar fin derbyn {count, plural, one {one notification request} other {# notification requests}}. Ydych chi'n siŵr eich bod am barhau?",
   "notification_requests.confirm_accept_multiple.title": "Derbyn ceisiadau hysbysu?",
   "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Diystyru cais} other {Diystyru ceisiadau}}",
   "notification_requests.confirm_dismiss_multiple.message": "Rydych ar fin diystyru {count, plural, one {un cais hysbysu} other {# cais hysbysiad}}. Fyddwch chi ddim yn gallu cyrchu {count, plural, one {it} other {them}} yn hawdd eto. Ydych chi'n yn siŵr eich bod am fwrw ymlaen?",
@@ -690,7 +689,7 @@
   "relative_time.minutes": "{number} munud",
   "relative_time.seconds": "{number} eiliad",
   "relative_time.today": "heddiw",
-  "reply_indicator.attachments": "{count, plural, one {# atodiad} other {# atodiad}}",
+  "reply_indicator.attachments": "{count, plural, one {# attachment} arall {# attachments}}",
   "reply_indicator.cancel": "Canslo",
   "reply_indicator.poll": "Arolwg",
   "report.block": "Blocio",
@@ -733,7 +732,7 @@
   "report.thanks.title_actionable": "Diolch am adrodd, byddwn yn ymchwilio i hyn.",
   "report.unfollow": "Dad-ddilyn @{name}",
   "report.unfollow_explanation": "Rydych chi'n dilyn y cyfrif hwn. I beidio â gweld eu postiadau yn eich ffrwd gartref mwyach, dad-ddilynwch nhw.",
-  "report_notification.attached_statuses": "{count, plural, one {{count} postiad} other {{count} postiad}} wedi'i atodi",
+  "report_notification.attached_statuses": "{count, plural, one {{count} postiad} arall {{count} postiad}} atodwyd",
   "report_notification.categories.legal": "Cyfreithiol",
   "report_notification.categories.legal_sentence": "cynnwys anghyfreithlon",
   "report_notification.categories.other": "Arall",
@@ -813,7 +812,7 @@
   "status.reblog": "Hybu",
   "status.reblog_private": "Hybu i'r gynulleidfa wreiddiol",
   "status.reblogged_by": "Hybodd {name}",
-  "status.reblogs": "{count, plural, one {# hwb} other {# hwb}}",
+  "status.reblogs": "{count, plural, one {hwb} other {hwb}}",
   "status.reblogs.empty": "Does neb wedi hybio'r post yma eto. Pan y bydd rhywun yn gwneud, byddent yn ymddangos yma.",
   "status.redraft": "Dileu ac ailddrafftio",
   "status.remove_bookmark": "Tynnu nod tudalen",

app/javascript/mastodon/locales/da.json

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Følg ikke længere bruger?",
   "content_warning.hide": "Skjul indlæg",
   "content_warning.show": "Vis alligevel",
-  "content_warning.show_more": "Vis flere",
   "conversation.delete": "Slet samtale",
   "conversation.mark_as_read": "Markér som læst",
   "conversation.open": "Vis samtale",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Vælg en eksisterende kategori eller opret en ny",
   "filter_modal.select_filter.title": "Filtrér dette indlæg",
   "filter_modal.title.status": "Filtrér et indlæg",
-  "filter_warning.matches_filter": "Matcher filteret “<span>{title}</span>”",
+  "filter_warning.matches_filter": "Matcher filteret “{title}”",
   "filtered_notifications_banner.pending_requests": "Fra {count, plural, =0 {ingen} one {én person} other {# personer}}, man måske kender",
   "filtered_notifications_banner.title": "Filtrerede notifikationer",
   "firehose.all": "Alle",

app/javascript/mastodon/locales/de.json

@@ -19,7 +19,7 @@
   "account.block_domain": "{domain} sperren",
   "account.block_short": "Blockieren",
   "account.blocked": "Blockiert",
-  "account.cancel_follow_request": "Follower-Anfrage zurückziehen",
+  "account.cancel_follow_request": "Folgeanfrage 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",
@@ -94,7 +94,7 @@
   "block_modal.show_more": "Mehr anzeigen",
   "block_modal.they_cant_mention": "Das Profil wird dich nicht erwähnen oder dir folgen können.",
   "block_modal.they_cant_see_posts": "Deine Beiträge können nicht mehr angesehen werden und du wirst deren Beiträge nicht mehr sehen.",
-  "block_modal.they_will_know": "Das Profil wird erkennen können, dass du es blockiert hast.",
+  "block_modal.they_will_know": "Es wird erkennbar sein, dass dieses Profil blockiert wurde.",
   "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",
@@ -157,7 +157,7 @@
   "compose_form.placeholder": "Was gibt’s Neues?",
   "compose_form.poll.duration": "Umfragedauer",
   "compose_form.poll.multiple": "Mehrfachauswahl",
-  "compose_form.poll.option_placeholder": "{number}. Auswahl",
+  "compose_form.poll.option_placeholder": "Option {number}",
   "compose_form.poll.single": "Einfachauswahl",
   "compose_form.poll.switch_to_multiple": "Mehrfachauswahl erlauben",
   "compose_form.poll.switch_to_single": "Nur Einfachauswahl erlauben",
@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Profil entfolgen?",
   "content_warning.hide": "Beitrag ausblenden",
   "content_warning.show": "Trotzdem anzeigen",
-  "content_warning.show_more": "Mehr anzeigen",
   "conversation.delete": "Unterhaltung löschen",
   "conversation.mark_as_read": "Als gelesen markieren",
   "conversation.open": "Unterhaltung anzeigen",
@@ -233,7 +232,7 @@
   "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.username": "Profilname",
-  "domain_pill.whats_in_a_handle": "Woraus besteht eine Adresse?",
+  "domain_pill.whats_in_a_handle": "Was ist Teil der 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_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:",
@@ -306,12 +305,12 @@
   "filter_modal.select_filter.subtitle": "Einem vorhandenen Filter hinzufügen oder einen neuen erstellen",
   "filter_modal.select_filter.title": "Diesen Beitrag filtern",
   "filter_modal.title.status": "Beitrag per Filter ausblenden",
-  "filter_warning.matches_filter": "Übereinstimmend mit dem Filter „<span>{title}</span>“",
+  "filter_warning.matches_filter": "Übereinstimmend mit dem Filter „{title}“",
   "filtered_notifications_banner.pending_requests": "Von {count, plural, =0 {keinem, den} one {einer Person, die} other {# Personen, die}} du möglicherweise kennst",
   "filtered_notifications_banner.title": "Gefilterte Benachrichtigungen",
-  "firehose.all": "Alle Server",
+  "firehose.all": "Alles",
   "firehose.local": "Dieser Server",
-  "firehose.remote": "Externe Server",
+  "firehose.remote": "Andere Server",
   "follow_request.authorize": "Genehmigen",
   "follow_request.reject": "Ablehnen",
   "follow_requests.unlocked_explanation": "Auch wenn dein Konto öffentlich bzw. nicht geschützt ist, haben die Moderator*innen von {domain} gedacht, dass du diesen Follower lieber manuell bestätigen solltest.",
@@ -465,12 +464,12 @@
   "mute_modal.hide_from_notifications": "Benachrichtigungen ausblenden",
   "mute_modal.hide_options": "Einstellungen ausblenden",
   "mute_modal.indefinite": "Bis ich die Stummschaltung aufhebe",
-  "mute_modal.show_options": "Optionen anzeigen",
+  "mute_modal.show_options": "Einstellungen 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.",
+  "mute_modal.they_wont_know": "Es wird nicht erkennbar sein, dass dieses Profil stummgeschaltet wurde.",
   "mute_modal.title": "Profil stummschalten?",
   "mute_modal.you_wont_see_mentions": "Du wirst keine Beiträge sehen, die dieses Profil erwähnen.",
-  "mute_modal.you_wont_see_posts": "Deine Beiträge können von diesem stummgeschalteten Profil weiterhin gesehen werden, aber du wirst dessen Beiträge nicht mehr sehen.",
+  "mute_modal.you_wont_see_posts": "Deine Beiträge können weiterhin angesehen werden, aber du wirst deren Beiträge nicht mehr sehen.",
   "navigation_bar.about": "Über",
   "navigation_bar.administration": "Administration",
   "navigation_bar.advanced_interface": "Im erweiterten Webinterface öffnen",
@@ -505,13 +504,13 @@
   "notification.admin.report_statuses": "{name} meldete {target} wegen {category}",
   "notification.admin.report_statuses_other": "{name} meldete {target}",
   "notification.admin.sign_up": "{name} registrierte sich",
-  "notification.admin.sign_up.name_and_others": "{name} und {count, plural, one {# weiteres Profil} other {# weitere Profile}} registrierten sich",
+  "notification.admin.sign_up.name_and_others": "{name} und {count, plural, one {# weitere Person} other {# weitere Personen}} registrierten sich",
   "notification.favourite": "{name} favorisierte deinen Beitrag",
-  "notification.favourite.name_and_others_with_link": "{name} und <a>{count, plural, one {# weiteres Profil} other {# weitere Profile}}</a> favorisierten deinen Beitrag",
+  "notification.favourite.name_and_others_with_link": "{name} und <a>{count, plural, one {# weitere Person} other {# weitere Personen}}</a> favorisierten deinen Beitrag",
   "notification.follow": "{name} folgt dir",
-  "notification.follow.name_and_others": "{name} und <a>{count, plural, one {# weiteres Profil} other {# weitere Profile}}</a> folgen dir",
+  "notification.follow.name_and_others": "{name} und <a>{count, plural, one {# weitere Person} other {# weitere Personen}}</a> folgen dir",
   "notification.follow_request": "{name} möchte dir folgen",
-  "notification.follow_request.name_and_others": "{name} und {count, plural, one {# weiteres Profil} other {# weitere Profile}} möchten dir folgen",
+  "notification.follow_request.name_and_others": "{name} und {count, plural, one {# weitere Person} other {# weitere Personen}} möchten dir folgen",
   "notification.label.mention": "Erwähnung",
   "notification.label.private_mention": "Private Erwähnung",
   "notification.label.private_reply": "Private Antwort",
@@ -530,7 +529,7 @@
   "notification.own_poll": "Deine Umfrage ist beendet",
   "notification.poll": "Eine Umfrage, an der du teilgenommen hast, ist beendet",
   "notification.reblog": "{name} teilte deinen Beitrag",
-  "notification.reblog.name_and_others_with_link": "{name} und <a>{count, plural, one {# weiteres Profil} other {# weitere Profile}}</a> teilten deinen Beitrag",
+  "notification.reblog.name_and_others_with_link": "{name} und <a>{count, plural, one {# weitere Person} other {# weitere Personen}}</a> teilten deinen Beitrag",
   "notification.relationships_severance_event": "Verbindungen mit {name} verloren",
   "notification.relationships_severance_event.account_suspension": "Ein Admin von {from} hat {target} gesperrt. Du wirst von diesem Profil keine Updates mehr erhalten und auch nicht mit ihm interagieren können.",
   "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.",
@@ -599,15 +598,15 @@
   "notifications.policy.filter": "Filtern",
   "notifications.policy.filter_hint": "An gefilterte Benachrichtigungen im Posteingang senden",
   "notifications.policy.filter_limited_accounts_hint": "Durch Server-Moderator*innen eingeschränkt",
-  "notifications.policy.filter_limited_accounts_title": "moderierten Konten",
+  "notifications.policy.filter_limited_accounts_title": "Moderierte Konten",
   "notifications.policy.filter_new_accounts.hint": "Innerhalb {days, plural, one {des letzten Tages} other {der letzten # Tagen}} erstellt",
-  "notifications.policy.filter_new_accounts_title": "neuen Konten",
+  "notifications.policy.filter_new_accounts_title": "Neuen Konten",
   "notifications.policy.filter_not_followers_hint": "Einschließlich Profilen, die dir seit weniger als {days, plural, one {einem Tag} other {# Tagen}} folgen",
   "notifications.policy.filter_not_followers_title": "Profilen, die mir nicht folgen",
   "notifications.policy.filter_not_following_hint": "Bis du sie manuell genehmigst",
   "notifications.policy.filter_not_following_title": "Profilen, denen ich nicht folge",
   "notifications.policy.filter_private_mentions_hint": "Solange sie keine Antwort auf deine Erwähnung ist oder du dem Profil nicht folgst",
-  "notifications.policy.filter_private_mentions_title": "unerwünschten privaten Erwähnungen",
+  "notifications.policy.filter_private_mentions_title": "Unerwünschten privaten Erwähnungen",
   "notifications.policy.title": "Benachrichtigungen verwalten von …",
   "notifications_permission_banner.enable": "Aktiviere Desktop-Benachrichtigungen",
   "notifications_permission_banner.how_to_control": "Um Benachrichtigungen zu erhalten, wenn Mastodon nicht geöffnet ist, aktiviere die Desktop-Benachrichtigungen. Du kannst genau bestimmen, welche Arten von Interaktionen Desktop-Benachrichtigungen über die {icon} -Taste erzeugen, sobald diese aktiviert sind.",
@@ -665,7 +664,7 @@
   "poll_button.remove_poll": "Umfrage entfernen",
   "privacy.change": "Sichtbarkeit anpassen",
   "privacy.direct.long": "Alle in diesem Beitrag erwähnten Profile",
-  "privacy.direct.short": "Ausgewählte Profile",
+  "privacy.direct.short": "Bestimmte Profile",
   "privacy.private.long": "Nur deine Follower",
   "privacy.private.short": "Follower",
   "privacy.public.long": "Alle in und außerhalb von Mastodon",

app/javascript/mastodon/locales/el.json

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Άρση ακολούθησης;",
   "content_warning.hide": "Απόκρυψη ανάρτησης",
   "content_warning.show": "Εμφάνιση ούτως ή άλλως",
-  "content_warning.show_more": "Εμφάνιση περισσότερων",
   "conversation.delete": "Διαγραφή συζήτησης",
   "conversation.mark_as_read": "Σήμανση ως αναγνωσμένο",
   "conversation.open": "Προβολή συνομιλίας",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Χρησιμοποιήστε μια υπάρχουσα κατηγορία ή δημιουργήστε μια νέα",
   "filter_modal.select_filter.title": "Φιλτράρισμα αυτής της ανάρτησης",
   "filter_modal.title.status": "Φιλτράρισμα μιας ανάρτησης",
-  "filter_warning.matches_filter": "Ταιριάζει με το φίλτρο “<span>{title}</span>”",
+  "filter_warning.matches_filter": "Ταιριάζει με το φίλτρο “{title}”",
   "filtered_notifications_banner.pending_requests": "Από {count, plural, =0 {κανένα} one {ένα άτομο} other {# άτομα}} που μπορεί να ξέρεις",
   "filtered_notifications_banner.title": "Φιλτραρισμένες ειδοποιήσεις",
   "firehose.all": "Όλα",
@@ -386,9 +385,9 @@
   "interaction_modal.description.follow": "Με έναν λογαριασμό Mastodon, μπορείς να ακολουθήσεις τον/την {name} ώστε να λαμβάνεις τις αναρτήσεις του/της στη δική σου ροή.",
   "interaction_modal.description.reblog": "Με ένα λογαριασμό Mastodon, μπορείς να ενισχύσεις αυτή την ανάρτηση για να τη μοιραστείς με τους δικούς σου ακολούθους.",
   "interaction_modal.description.reply": "Με ένα λογαριασμό Mastodon, μπορείς να απαντήσεις σε αυτή την ανάρτηση.",
-  "interaction_modal.login.action": "Πήγαινέ με στην αρχική σελίδα",
+  "interaction_modal.login.action": "Take me home\nΠήγαινέ με στην αρχική σελίδα",
   "interaction_modal.login.prompt": "Τομέας του οικιακού σου διακομιστή, πχ. mastodon.social",
-  "interaction_modal.no_account_yet": "Δεν είστε στο Mastodon;",
+  "interaction_modal.no_account_yet": "Not on Mastodon?\nΔεν είστε στο Mastodon;",
   "interaction_modal.on_another_server": "Σε διαφορετικό διακομιστή",
   "interaction_modal.on_this_server": "Σε αυτόν τον διακομιστή",
   "interaction_modal.sign_in": "Δεν είσαι συνδεδεμένος σε αυτόν το διακομιστή. Πού φιλοξενείται ο λογαριασμός σου;",
@@ -509,7 +508,6 @@
   "notification.favourite": "{name} favorited your post\n{name} προτίμησε την ανάρτηση σου",
   "notification.favourite.name_and_others_with_link": "{name} και <a>{count, plural, one {# ακόμη} other {# ακόμη}}</a> αγάπησαν την ανάρτησή σου",
   "notification.follow": "Ο/Η {name} σε ακολούθησε",
-  "notification.follow.name_and_others": "Ο χρήστης {name} και <a>{count, plural, one {# ακόμη} other {# ακόμη}}</a> σε ακολούθησαν",
   "notification.follow_request": "Ο/H {name} ζήτησε να σε ακολουθήσει",
   "notification.follow_request.name_and_others": "{name} και {count, plural, one {# άλλος} other {# άλλοι}} ζήτησαν να σε ακολουθήσουν",
   "notification.label.mention": "Επισήμανση",
@@ -517,7 +515,6 @@
   "notification.label.private_reply": "Ιδιωτική απάντηση",
   "notification.label.reply": "Απάντηση",
   "notification.mention": "Επισήμανση",
-  "notification.mentioned_you": "Ο χρήστης {name} σε επισήμανε",
   "notification.moderation-warning.learn_more": "Μάθε περισσότερα",
   "notification.moderation_warning": "Έχετε λάβει μία προειδοποίηση συντονισμού",
   "notification.moderation_warning.action_delete_statuses": "Ορισμένες από τις αναρτήσεις σου έχουν αφαιρεθεί.",
@@ -568,7 +565,6 @@
   "notifications.column_settings.filter_bar.category": "Μπάρα γρήγορου φίλτρου",
   "notifications.column_settings.follow": "Νέοι ακόλουθοι:",
   "notifications.column_settings.follow_request": "Νέο αίτημα ακολούθησης:",
-  "notifications.column_settings.group": "Ομάδα",
   "notifications.column_settings.mention": "Επισημάνσεις:",
   "notifications.column_settings.poll": "Αποτελέσματα δημοσκόπησης:",
   "notifications.column_settings.push": "Ειδοποιήσεις Push",

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

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Unfollow user?",
   "content_warning.hide": "Hide post",
   "content_warning.show": "Show post",
-  "content_warning.show_more": "Show more",
   "conversation.delete": "Delete conversation",
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
   "filter_modal.select_filter.title": "Filter this post",
   "filter_modal.title.status": "Filter a post",
-  "filter_warning.matches_filter": "Matches filter \"<span>{title}</span>\"",
+  "filter_warning.matches_filter": "Matches filter “{title}”",
   "filtered_notifications_banner.pending_requests": "From {count, plural, =0 {no one} one {one person} other {# people}} you may know",
   "filtered_notifications_banner.title": "Filtered notifications",
   "firehose.all": "All",
@@ -509,7 +508,6 @@
   "notification.favourite": "{name} favourited your post",
   "notification.favourite.name_and_others_with_link": "{name} and <a>{count, plural, one {# other} other {# others}}</a> favourited your post",
   "notification.follow": "{name} followed you",
-  "notification.follow.name_and_others": "{name} and <a>{count, plural, one {# other} other {# others}}</a> followed you",
   "notification.follow_request": "{name} has requested to follow you",
   "notification.follow_request.name_and_others": "{name} and {count, plural, one {# other} other {# others}} has requested to follow you",
   "notification.label.mention": "Mention",
@@ -517,7 +515,6 @@
   "notification.label.private_reply": "Private reply",
   "notification.label.reply": "Reply",
   "notification.mention": "Mention",
-  "notification.mentioned_you": "{name} mentioned you",
   "notification.moderation-warning.learn_more": "Learn more",
   "notification.moderation_warning": "You have received a moderation warning",
   "notification.moderation_warning.action_delete_statuses": "Some of your posts have been removed.",
@@ -568,7 +565,6 @@
   "notifications.column_settings.filter_bar.category": "Quick filter bar",
   "notifications.column_settings.follow": "New followers:",
   "notifications.column_settings.follow_request": "New follow requests:",
-  "notifications.column_settings.group": "Group",
   "notifications.column_settings.mention": "Mentions:",
   "notifications.column_settings.poll": "Poll results:",
   "notifications.column_settings.push": "Push notifications",

app/javascript/mastodon/locales/en.json

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Unfollow user?",
   "content_warning.hide": "Hide post",
   "content_warning.show": "Show post",
-  "content_warning.show_more": "Show more",
   "conversation.delete": "Delete conversation",
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Use an existing category or create a new one",
   "filter_modal.select_filter.title": "Filter this post",
   "filter_modal.title.status": "Filter a post",
-  "filter_warning.matches_filter": "Matches filter “<span>{title}</span>”",
+  "filter_warning.matches_filter": "Matches filter “{title}”",
   "filtered_notifications_banner.pending_requests": "From {count, plural, =0 {no one} one {one person} other {# people}} you may know",
   "filtered_notifications_banner.title": "Filtered notifications",
   "firehose.all": "All",

app/javascript/mastodon/locales/eo.json

@@ -2,7 +2,7 @@
   "about.blocks": "Administritaj serviloj",
   "about.contact": "Kontakto:",
   "about.disclaimer": "Mastodon estas libera, malfermitkoda programo kaj varmarko de la firmao Mastodon gGmbH.",
-  "about.domain_blocks.no_reason_available": "Kialo ne disponeblas",
+  "about.domain_blocks.no_reason_available": "Kialo ne disponebla",
   "about.domain_blocks.preamble": "Mastodon ĝenerale rajtigas vidi la enhavojn de uzantoj el aliaj serviloj en la fediverso, kaj komuniki kun ili. Jen la limigoj deciditaj de tiu ĉi servilo mem.",
   "about.domain_blocks.silenced.explanation": "Vi ne ĝenerale vidos profilojn kaj enhavojn de ĉi tiu servilo, krom se vi eksplice trovas aŭ estas permesita de via sekvato.",
   "about.domain_blocks.silenced.title": "Limigita",
@@ -45,7 +45,7 @@
   "account.languages": "Ŝanĝi la abonitajn lingvojn",
   "account.link_verified_on": "Propreco de tiu ligilo estis konfirmita je {date}",
   "account.locked_info": "Tiu konto estas privatigita. La posedanto mane akceptas tiun, kiu povas sekvi rin.",
-  "account.media": "Plurmedio",
+  "account.media": "Plurmedioj",
   "account.mention": "Mencii @{name}",
   "account.moved_to": "{name} indikis, ke ria nova konto estas nun:",
   "account.mute": "Silentigi @{name}",
@@ -142,7 +142,7 @@
   "column_header.unpin": "Malfiksi",
   "column_subheading.settings": "Agordoj",
   "community.column_settings.local_only": "Nur loka",
-  "community.column_settings.media_only": "Nur plurmedio",
+  "community.column_settings.media_only": "Nur plurmedioj",
   "community.column_settings.remote_only": "Nur fora",
   "compose.language.change": "Ŝanĝi lingvon",
   "compose.language.search": "Serĉi lingvojn...",
@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Ĉu ĉesi sekvi uzanton?",
   "content_warning.hide": "Kaŝi afiŝon",
   "content_warning.show": "Montri ĉiukaze",
-  "content_warning.show_more": "Montri pli",
   "conversation.delete": "Forigi konversacion",
   "conversation.mark_as_read": "Marku kiel legita",
   "conversation.open": "Vidi konversacion",
@@ -214,7 +213,7 @@
   "dismissable_banner.community_timeline": "Jen la plej novaj publikaj afiŝoj de uzantoj, kies kontojn gastigas {domain}.",
   "dismissable_banner.dismiss": "Eksigi",
   "dismissable_banner.explore_links": "Tiuj novaĵoj estas aktuale priparolataj de uzantoj en tiu ĉi kaj aliaj serviloj, sur la malcentrigita reto.",
-  "dismissable_banner.explore_statuses": "Jen afiŝoj en la socia reto kiuj populariĝis hodiaŭ. Novaj afiŝoj kun pli da diskonigoj kaj stelumoj aperas pli alte.",
+  "dismissable_banner.explore_statuses": "Ĉi tiuj estas afiŝoj de la tuta socia reto, kiuj populariĝas hodiaŭ. Pli novaj afiŝoj kun pli da diskonigoj kaj plej ŝatataj estas rangigitaj pli alte.",
   "dismissable_banner.explore_tags": "Ĉi tiuj kradvostoj populariĝas en ĉi tiu kaj aliaj serviloj en la malcentraliza reto nun.",
   "dismissable_banner.public_timeline": "Ĉi tiuj estas la plej lastatempaj publikaj afiŝoj de homoj en la socia reto, kiujn homoj sur {domain} sekvas.",
   "domain_block_modal.block": "Bloki servilon",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Uzu ekzistantan kategorion aŭ kreu novan",
   "filter_modal.select_filter.title": "Filtri ĉi tiun afiŝon",
   "filter_modal.title.status": "Filtri afiŝon",
-  "filter_warning.matches_filter": "Filtrilo de kongruoj “<span>{title}</span>”",
+  "filter_warning.matches_filter": "Filtrilo de kongruoj “{title}”",
   "filtered_notifications_banner.pending_requests": "El {count, plural, =0 {neniu} one {unu persono} other {# homoj}} vi eble konas",
   "filtered_notifications_banner.title": "Filtritaj sciigoj",
   "firehose.all": "Ĉiuj",
@@ -333,7 +332,7 @@
   "followed_tags": "Sekvataj kradvortoj",
   "footer.about": "Pri",
   "footer.directory": "Profilujo",
-  "footer.get_app": "Akiri la apon",
+  "footer.get_app": "Akiru la Programon",
   "footer.invite": "Inviti homojn",
   "footer.keyboard_shortcuts": "Fulmoklavoj",
   "footer.privacy_policy": "Politiko de privateco",
@@ -382,7 +381,7 @@
   "ignore_notifications_modal.not_followers_title": "Ĉu ignori sciigojn de homoj, kiuj ne sekvas vin?",
   "ignore_notifications_modal.not_following_title": "Ĉu ignori sciigojn de homoj, kiujn vi ne sekvas?",
   "ignore_notifications_modal.private_mentions_title": "Ĉu ignori sciigojn de nepetitaj privataj mencioj?",
-  "interaction_modal.description.favourite": "Per konto ĉe Mastodon, vi povas stelumi ĉi tiun afiŝon por sciigi la afiŝanton ke vi sâtas kaj konservas ĝin por poste.",
+  "interaction_modal.description.favourite": "Per konto ĉe Mastodon, vi povas stelumiti ĉi tiun afiŝon por sciigi la afiŝanton ke vi aprezigas ŝin kaj konservas por la estonteco.",
   "interaction_modal.description.follow": "Kun konto ĉe Mastodon, vi povas sekvi {name} por ricevi iliajn afiŝojn en via hejma fluo.",
   "interaction_modal.description.reblog": "Kun konto ĉe Mastodon, vi povas diskonigi ĉi tiun afiŝon, por ke viaj propraj sekvantoj vidu ĝin.",
   "interaction_modal.description.reply": "Kun konto ĉe Mastodon, vi povos respondi al ĉi tiu afiŝo.",
@@ -527,7 +526,7 @@
   "notification.moderation_warning.action_sensitive": "Viaj afiŝoj estos markitaj kiel sentemaj ekde nun.",
   "notification.moderation_warning.action_silence": "Via konto estis limigita.",
   "notification.moderation_warning.action_suspend": "Via konto estas malakceptita.",
-  "notification.own_poll": "Via balotenketo finiĝitis",
+  "notification.own_poll": "Via enketo finiĝis",
   "notification.poll": "Balotenketo, en kiu vi voĉdonis, finiĝis",
   "notification.reblog": "{name} diskonigis vian afiŝon",
   "notification.reblog.name_and_others_with_link": "{name} kaj <a>{count, plural, one {# alia} other {# aliaj}}</a> diskonigis vian afiŝon",
@@ -568,7 +567,7 @@
   "notifications.column_settings.filter_bar.category": "Rapida filtrila breto",
   "notifications.column_settings.follow": "Novaj sekvantoj:",
   "notifications.column_settings.follow_request": "Novaj petoj de sekvado:",
-  "notifications.column_settings.group": "Grupigi",
+  "notifications.column_settings.group": "Grupo",
   "notifications.column_settings.mention": "Mencioj:",
   "notifications.column_settings.poll": "Balotenketaj rezultoj:",
   "notifications.column_settings.push": "Puŝsciigoj",
@@ -638,7 +637,7 @@
   "onboarding.start.lead": "Vi nun estas parto de Mastodon, unika, malcentralizita socia amaskomunikilara platformo, kie vi—ne algoritmo—zorgas vian propran sperton. Ni komencu vin sur ĉi tiu nova socia limo:",
   "onboarding.start.skip": "Ĉu vi ne bezonas helpon por komenci?",
   "onboarding.start.title": "Vi atingas ĝin!",
-  "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
+  "onboarding.steps.follow_people.body": "Sekvi interesajn homojn estas pri kio Mastodonto temas.",
   "onboarding.steps.follow_people.title": "Agordu vian hejman fluon",
   "onboarding.steps.publish_status.body": "Salutu la mondon per teksto, fotoj, filmetoj aŭ balotenketoj {emoji}",
   "onboarding.steps.publish_status.title": "Fari vian unuan afiŝon",
@@ -659,7 +658,7 @@
   "poll.total_people": "{count, plural, one {# homo} other {# homoj}}",
   "poll.total_votes": "{count, plural, one {# voĉdono} other {# voĉdonoj}}",
   "poll.vote": "Voĉdoni",
-  "poll.voted": "Vi voĉdonis por ĉi tiu respondo",
+  "poll.voted": "Vi elektis por ĉi tiu respondo",
   "poll.votes": "{votes, plural, one {# voĉdono} other {# voĉdonoj}}",
   "poll_button.add_poll": "Aldoni balotenketon",
   "poll_button.remove_poll": "Forigi balotenketon",
@@ -772,9 +771,9 @@
   "server_banner.is_one_of_many": "{domain} estas unu el la multaj sendependaj Mastodon-serviloj, kiujn vi povas uzi por partopreni en la fediverso.",
   "server_banner.server_stats": "Statistikoj de la servilo:",
   "sign_in_banner.create_account": "Krei konton",
-  "sign_in_banner.follow_anyone": "Sekvu iun ajn tra la fediverso kaj vidu ĉion laŭ templinio. Nul algoritmo, reklamo aŭ kliklogilo ĉeestas.",
-  "sign_in_banner.mastodon_is": "Mastodon estas la plej bona maniero resti ĝisdata pri aktualaĵoj.",
-  "sign_in_banner.sign_in": "Ensaluti",
+  "sign_in_banner.follow_anyone": "Sekvi iun ajn tra la fediverso kaj vidi ĉion en kronologia ordo. Neniuj algoritmoj, reklamoj aŭ klakbetoj videblas.",
+  "sign_in_banner.mastodon_is": "Mastodonto estas la plej bona maniero por resti flank-al-flanke kun kio okazas.",
+  "sign_in_banner.sign_in": "Saluti",
   "sign_in_banner.sso_redirect": "Ensalutu aŭ Registriĝi",
   "status.admin_account": "Malfermi fasadon de moderigado por @{name}",
   "status.admin_domain": "Malfermu moderigan interfacon por {domain}",

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

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
   "content_warning.hide": "Ocultar mensaje",
   "content_warning.show": "Mostrar de todos modos",
-  "content_warning.show_more": "Mostrar más",
   "conversation.delete": "Eliminar conversación",
   "conversation.mark_as_read": "Marcar como leída",
   "conversation.open": "Ver conversación",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar este mensaje",
   "filter_modal.title.status": "Filtrar un mensaje",
-  "filter_warning.matches_filter": "Coincide con el filtro “<span>{title}</span>”",
+  "filter_warning.matches_filter": "Coincide con el filtro “{title}”",
   "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {nadie} one {una persona} other {# personas}} que podrías conocer",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todos",
@@ -857,7 +856,7 @@
   "upload_form.description": "Agregá una descripción para personas con dificultades visuales",
   "upload_form.drag_and_drop.instructions": "Para recoger un archivo multimedia, pulsá la barra espaciadora o la tecla Enter. Mientras arrastrás, usá las teclas de flecha para mover el archivo multimedia en cualquier dirección. Volvé a pulsar la barra espaciadora o la tecla Enter para soltar el archivo multimedia en su nueva posición, o pulsá la tecla Escape para cancelar.",
   "upload_form.drag_and_drop.on_drag_cancel": "Se canceló el arrastre. Se eliminó el archivo adjunto {item}.",
-  "upload_form.drag_and_drop.on_drag_end": "El archivo adjunto {item} fue soltado.",
+  "upload_form.drag_and_drop.on_drag_end": "El archivo adjunto {item} ha sido eliminado.",
   "upload_form.drag_and_drop.on_drag_over": "El archivo adjunto {item} fue movido.",
   "upload_form.drag_and_drop.on_drag_start": "Se ha recogido el archivo adjunto {item}.",
   "upload_form.edit": "Editar",

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

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
   "content_warning.hide": "Ocultar publicación",
   "content_warning.show": "Mostrar de todos modos",
-  "content_warning.show_more": "Mostrar más",
   "conversation.delete": "Borrar conversación",
   "conversation.mark_as_read": "Marcar como leído",
   "conversation.open": "Ver conversación",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar una publicación",
-  "filter_warning.matches_filter": "Coincide con el filtro “<span>{title}</span>”",
+  "filter_warning.matches_filter": "Coincide con el filtro “{title}”",
   "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {nadie} one {una persona} other {# people}} que puede que tú conozcas",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todas",

app/javascript/mastodon/locales/es.json

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "¿Dejar de seguir al usuario?",
   "content_warning.hide": "Ocultar publicación",
   "content_warning.show": "Mostrar de todos modos",
-  "content_warning.show_more": "Mostrar más",
   "conversation.delete": "Borrar conversación",
   "conversation.mark_as_read": "Marcar como leído",
   "conversation.open": "Ver conversación",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Usar una categoría existente o crear una nueva",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar una publicación",
-  "filter_warning.matches_filter": "Coincide con el filtro “<span>{title}</span>”",
+  "filter_warning.matches_filter": "Coincide con el filtro “{title}”",
   "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {nadie} one {una persona} other {# personas}} que puede que conozcas",
   "filtered_notifications_banner.title": "Notificaciones filtradas",
   "firehose.all": "Todas",
@@ -383,7 +382,7 @@
   "ignore_notifications_modal.not_following_title": "¿Ignorar notificaciones de personas a las que no sigues?",
   "ignore_notifications_modal.private_mentions_title": "¿Ignorar notificaciones de menciones privadas no solicitadas?",
   "interaction_modal.description.favourite": "Con una cuenta en Mastodon, puedes marcar como favorita esta publicación para que el autor sepa que te gusta, y guardala para más adelante.",
-  "interaction_modal.description.follow": "Con una cuenta en Mastodon, puedes seguir {name} para recibir sus publicaciones en tu página de inicio.",
+  "interaction_modal.description.follow": "Con una cuenta en Mastodon, puedes seguir {name} para recibir sus publicaciones en tu línea temporal de inicio.",
   "interaction_modal.description.reblog": "Con una cuenta en Mastodon, puedes impulsar esta publicación para compartirla con tus propios seguidores.",
   "interaction_modal.description.reply": "Con una cuenta en Mastodon, puedes responder a esta publicación.",
   "interaction_modal.login.action": "Ir a Inicio",
@@ -568,7 +567,7 @@
   "notifications.column_settings.filter_bar.category": "Barra de filtrado rápido",
   "notifications.column_settings.follow": "Nuevos seguidores:",
   "notifications.column_settings.follow_request": "Nuevas solicitudes de seguimiento:",
-  "notifications.column_settings.group": "Agrupar",
+  "notifications.column_settings.group": "Grupo",
   "notifications.column_settings.mention": "Menciones:",
   "notifications.column_settings.poll": "Resultados de la votación:",
   "notifications.column_settings.push": "Notificaciones push",
@@ -615,11 +614,11 @@
   "onboarding.action.back": "Llévame atrás",
   "onboarding.actions.back": "Llévame atrás",
   "onboarding.actions.go_to_explore": "Llévame a tendencias",
-  "onboarding.actions.go_to_home": "Ir a mi página de inicio",
+  "onboarding.actions.go_to_home": "Ir a mi inicio",
   "onboarding.compose.template": "¡Hola #Mastodon!",
   "onboarding.follows.empty": "Desafortunadamente, no se pueden mostrar resultados en este momento. Puedes intentar usar la búsqueda o navegar por la página de exploración para encontrar personas a las que seguir, o inténtalo de nuevo más tarde.",
-  "onboarding.follows.lead": "Tu página de inicio es la forma principal de experimentar Mastodon. Cuanta más personas sigas, más activa e interesante será. Para empezar, aquí hay algunas sugerencias:",
-  "onboarding.follows.title": "Personaliza tu página de inicio",
+  "onboarding.follows.lead": "Tu línea de inicio es la forma principal de experimentar Mastodon. Cuanta más personas sigas, más activa e interesante será. Para empezar, aquí hay algunas sugerencias:",
+  "onboarding.follows.title": "Personaliza tu línea de inicio",
   "onboarding.profile.discoverable": "Hacer que mi perfil aparezca en búsquedas",
   "onboarding.profile.discoverable_hint": "Cuando permites que tu perfil aparezca en búsquedas en Mastodon, tus publicaciones podrán aparecer en los resultados de búsqueda y en tendencias, y tu perfil podrá recomendarse a gente con intereses similares a los tuyos.",
   "onboarding.profile.display_name": "Nombre para mostrar",
@@ -639,7 +638,7 @@
   "onboarding.start.skip": "¿No necesitas ayuda para empezar?",
   "onboarding.start.title": "¡Lo has logrado!",
   "onboarding.steps.follow_people.body": "Seguir personas interesante es de lo que trata Mastodon.",
-  "onboarding.steps.follow_people.title": "Personaliza tu página de inicio",
+  "onboarding.steps.follow_people.title": "Personaliza tu línea de inicio",
   "onboarding.steps.publish_status.body": "Di hola al mundo con texto, fotos, vídeos o encuestas {emoji}",
   "onboarding.steps.publish_status.title": "Escribe tu primera publicación",
   "onboarding.steps.setup_profile.body": "Aumenta tus interacciones con un perfil completo.",
@@ -678,7 +677,7 @@
   "recommended": "Recomendado",
   "refresh": "Actualizar",
   "regeneration_indicator.label": "Cargando…",
-  "regeneration_indicator.sublabel": "¡Tu página de inicio se está preparando!",
+  "regeneration_indicator.sublabel": "¡Tu historia de inicio se está preparando!",
   "relative_time.days": "{number} d",
   "relative_time.full.days": "hace {number, plural, one {# día} other {# días}}",
   "relative_time.full.hours": "hace {number, plural, one {# hora} other {# horas}}",
@@ -732,7 +731,7 @@
   "report.thanks.title": "¿No quieres esto?",
   "report.thanks.title_actionable": "Gracias por informar, estudiaremos esto.",
   "report.unfollow": "Dejar de seguir a @{name}",
-  "report.unfollow_explanation": "Estás siguiendo esta cuenta. Para dejar de ver sus publicaciones en tu página de inicio, deja de seguirla.",
+  "report.unfollow_explanation": "Estás siguiendo esta cuenta. Para no ver sus publicaciones en tu muro de inicio, deja de seguirla.",
   "report_notification.attached_statuses": "{count, plural, one {{count} publicación} other {{count} publicaciones}} adjunta(s)",
   "report_notification.categories.legal": "Legal",
   "report_notification.categories.legal_sentence": "contenido ilegal",

app/javascript/mastodon/locales/et.json

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Ei jälgi enam kasutajat?",
   "content_warning.hide": "Peida postitus",
   "content_warning.show": "Näita ikkagi",
-  "content_warning.show_more": "Näita rohkem",
   "conversation.delete": "Kustuta vestlus",
   "conversation.mark_as_read": "Märgi loetuks",
   "conversation.open": "Vaata vestlust",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Kasuta olemasolevat kategooriat või loo uus",
   "filter_modal.select_filter.title": "Filtreeri seda postitust",
   "filter_modal.title.status": "Postituse filtreerimine",
-  "filter_warning.matches_filter": "Sobib filtriga “<span>{title}</span>”",
+  "filter_warning.matches_filter": "Sobib filtriga “{title}”",
   "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Mitte üheltki inimeselt} one {Ühelt inimeselt} other {# inimeselt}}, keda võid teada",
   "filtered_notifications_banner.title": "Filtreeritud teavitused",
   "firehose.all": "Kõik",
@@ -325,7 +324,7 @@
   "follow_suggestions.hints.most_interactions": "See kasutajaprofiil on viimasel ajal {domain} saanud palju tähelepanu.",
   "follow_suggestions.hints.similar_to_recently_followed": "See kasutajaprofiil sarnaneb neile, mida oled hiljuti jälgima asunud.",
   "follow_suggestions.personalized_suggestion": "Isikupärastatud soovitus",
-  "follow_suggestions.popular_suggestion": "Populaarne soovitus",
+  "follow_suggestions.popular_suggestion": "Popuplaarne soovitus",
   "follow_suggestions.popular_suggestion_longer": "Populaarne kohas {domain}",
   "follow_suggestions.similar_to_recently_followed_longer": "Sarnane profiilile, mida hiljuti jälgima hakkasid",
   "follow_suggestions.view_all": "Vaata kõiki",
@@ -509,7 +508,6 @@
   "notification.favourite": "{name} märkis su postituse lemmikuks",
   "notification.favourite.name_and_others_with_link": "{name} ja <a>{count, plural, one {# veel} other {# teist}}</a> märkis su postituse lemmikuks",
   "notification.follow": "{name} alustas su jälgimist",
-  "notification.follow.name_and_others": "{name} ja veel {count, plural, one {# kasutaja} other {# kasutajat}} hakkas sind jälgima",
   "notification.follow_request": "{name} soovib sind jälgida",
   "notification.follow_request.name_and_others": "{name} ja {count, plural, one {# veel} other {# teist}} taotles sinu jälgimist",
   "notification.label.mention": "Mainimine",
@@ -568,7 +566,6 @@
   "notifications.column_settings.filter_bar.category": "Kiirfiltri riba",
   "notifications.column_settings.follow": "Uued jälgijad:",
   "notifications.column_settings.follow_request": "Uued jälgimistaotlused:",
-  "notifications.column_settings.group": "Grupp",
   "notifications.column_settings.mention": "Mainimised:",
   "notifications.column_settings.poll": "Küsitluse tulemused:",
   "notifications.column_settings.push": "Push teated",

app/javascript/mastodon/locales/eu.json

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

app/javascript/mastodon/locales/fa.json

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

app/javascript/mastodon/locales/fi.json

@@ -12,7 +12,7 @@
   "about.powered_by": "Hajautetun sosiaalisen median tarjoaa {mastodon}",
   "about.rules": "Palvelimen säännöt",
   "account.account_note_header": "Henkilökohtainen muistiinpano",
-  "account.add_or_remove_from_list": "Lisää tai poista listoista",
+  "account.add_or_remove_from_list": "Lisää tai poista listoilta",
   "account.badges.bot": "Botti",
   "account.badges.group": "Ryhmä",
   "account.block": "Estä @{name}",
@@ -38,7 +38,7 @@
   "account.following": "Seuratut",
   "account.following_counter": "{count, plural, one {{counter} seurattu} other {{counter} seurattua}}",
   "account.follows.empty": "Tämä käyttäjä ei vielä seuraa ketään.",
-  "account.go_to_profile": "Siirry profiiliin",
+  "account.go_to_profile": "Mene profiiliin",
   "account.hide_reblogs": "Piilota käyttäjän @{name} tehostukset",
   "account.in_memoriam": "Muistoissamme.",
   "account.joined_short": "Liittynyt",
@@ -110,7 +110,7 @@
   "bundle_column_error.routing.body": "Pyydettyä sivua ei löytynyt. Oletko varma, että osoitepalkin URL-osoite on oikein?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Sulje",
-  "bundle_modal_error.message": "Jotain meni pieleen tätä komponenttia ladattaessa.",
+  "bundle_modal_error.message": "Jotain meni pieleen komponenttia ladattaessa.",
   "bundle_modal_error.retry": "Yritä uudelleen",
   "closed_registrations.other_server_instructions": "Koska Mastodon on hajautettu, voit luoda tilin toiselle palvelimelle ja olla silti vuorovaikutuksessa tämän kanssa.",
   "closed_registrations_modal.description": "Tilin luonti palvelimelle {domain} ei tällä hetkellä ole mahdollista, mutta ota huomioon, ettei Mastodonin käyttö edellytä juuri kyseisen palvelimen tiliä.",
@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Lopetetaanko käyttäjän seuraaminen?",
   "content_warning.hide": "Piilota julkaisu",
   "content_warning.show": "Näytä kuitenkin",
-  "content_warning.show_more": "Näytä lisää",
   "conversation.delete": "Poista keskustelu",
   "conversation.mark_as_read": "Merkitse luetuksi",
   "conversation.open": "Näytä keskustelu",
@@ -272,7 +271,7 @@
   "empty_column.followed_tags": "Et seuraa vielä yhtäkään aihetunnistetta. Kun alat seurata, ne tulevat tähän näkyviin.",
   "empty_column.hashtag": "Tällä aihetunnisteella ei löydy vielä sisältöä.",
   "empty_column.home": "Kotiaikajanasi on tyhjä! Seuraa useampia käyttäjiä, niin näet enemmän sisältöä.",
-  "empty_column.list": "Tässä listassa ei ole vielä mitään. Kun tämän listan jäsenet lähettävät uusia julkaisuja, ne näkyvät tässä.",
+  "empty_column.list": "Tällä listalla ei ole vielä mitään. Kun tämän listan jäsenet lähettävät uusia julkaisuja, ne näkyvät tässä.",
   "empty_column.lists": "Sinulla ei ole vielä yhtään listaa. Kun luot sellaisen, näkyy se tässä.",
   "empty_column.mutes": "Et ole mykistänyt vielä yhtään käyttäjää.",
   "empty_column.notification_requests": "Olet ajan tasalla! Täällä ei ole mitään uutta kerrottavaa. Kun saat uusia ilmoituksia, ne näkyvät täällä asetustesi mukaisesti.",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Käytä olemassa olevaa luokkaa tai luo uusi",
   "filter_modal.select_filter.title": "Suodata tämä julkaisu",
   "filter_modal.title.status": "Suodata julkaisu",
-  "filter_warning.matches_filter": "Vastaa suodatinta ”<span>{title}</span>”",
+  "filter_warning.matches_filter": "Vastaa suodatinta ”{title}”",
   "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Ei keneltäkään, jonka} one {Yhdeltä käyttäjältä, jonka} other {# käyttäjältä, jotka}} saatat tuntea",
   "filtered_notifications_banner.title": "Suodatetut ilmoitukset",
   "firehose.all": "Kaikki",
@@ -437,15 +436,15 @@
   "lightbox.close": "Sulje",
   "lightbox.next": "Seuraava",
   "lightbox.previous": "Edellinen",
-  "lightbox.zoom_in": "Näytä todellisen kokoisena",
-  "lightbox.zoom_out": "Näytä sovitettuna",
+  "lightbox.zoom_in": "Zoomaa todelliseen kokoon",
+  "lightbox.zoom_out": "Zoomaa mahtumaan",
   "limited_account_hint.action": "Näytä profiili joka tapauksessa",
   "limited_account_hint.title": "Palvelimen {domain} moderaattorit ovat piilottaneet tämän profiilin.",
   "link_preview.author": "Tehnyt {name}",
   "link_preview.more_from_author": "Lisää tekijältä {name}",
   "link_preview.shares": "{count, plural, one {{counter} julkaisu} other {{counter} julkaisua}}",
-  "lists.account.add": "Lisää listaan",
-  "lists.account.remove": "Poista listasta",
+  "lists.account.add": "Lisää listalle",
+  "lists.account.remove": "Poista listalta",
   "lists.delete": "Poista lista",
   "lists.edit": "Muokkaa listaa",
   "lists.edit.submit": "Vaihda nimi",

app/javascript/mastodon/locales/fil.json

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

app/javascript/mastodon/locales/fo.json

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Gevst at fylgja brúkara?",
   "content_warning.hide": "Fjal post",
   "content_warning.show": "Vís kortini",
-  "content_warning.show_more": "Vís meiri",
   "conversation.delete": "Strika samrøðu",
   "conversation.mark_as_read": "Merk sum lisið",
   "conversation.open": "Vís samrøðu",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Brúka ein verandi bólk ella skapa ein nýggjan",
   "filter_modal.select_filter.title": "Filtrera hendan postin",
   "filter_modal.title.status": "Filtrera ein post",
-  "filter_warning.matches_filter": "Samsvarar við filtrið “<span>{title}</span>”",
+  "filter_warning.matches_filter": "Samsvarar við filtrið “{title}”",
   "filtered_notifications_banner.pending_requests": "Frá {count, plural, =0 {ongum} one {einum persóni} other {# persónum}}, sum tú kanska kennir",
   "filtered_notifications_banner.title": "Filtreraðar fráboðanir",
   "firehose.all": "Allar",

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

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Se désabonner de l'utilisateur·rice ?",
   "content_warning.hide": "Masquer le message",
   "content_warning.show": "Afficher quand même",
-  "content_warning.show_more": "Déplier",
   "conversation.delete": "Supprimer cette conversation",
   "conversation.mark_as_read": "Marquer comme lu",
   "conversation.open": "Afficher cette conversation",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou en créer une nouvelle",
   "filter_modal.select_filter.title": "Filtrer cette publication",
   "filter_modal.title.status": "Filtrer une publication",
-  "filter_warning.matches_filter": "Correspond au filtre « <span>{title}</span> »",
+  "filter_warning.matches_filter": "Correspond au filtre « {title} »",
   "filtered_notifications_banner.pending_requests": "De la part {count, plural, =0 {d’aucune personne} one {d'une personne} other {de # personnes}} que vous pourriez connaître",
   "filtered_notifications_banner.title": "Notifications filtrées",
   "firehose.all": "Tout",
@@ -857,8 +856,6 @@
   "upload_form.description": "Décrire pour les malvoyants",
   "upload_form.drag_and_drop.instructions": "Pour choisir un média joint, appuyez sur la touche espace ou entrée. Tout en faisant glisser, utilisez les touches fléchées pour déplacer le fichier média dans une direction donnée. Appuyez à nouveau sur la touche espace ou entrée pour déposer le fichier média dans sa nouvelle position, ou appuyez sur la touche Echap pour annuler.",
   "upload_form.drag_and_drop.on_drag_cancel": "Le glissement a été annulé. La pièce jointe {item} n'a pas été ajoutée.",
-  "upload_form.drag_and_drop.on_drag_end": "La pièce jointe du média {item} a été déplacée.",
-  "upload_form.drag_and_drop.on_drag_over": "La pièce jointe du média {item} a été déplacée.",
   "upload_form.edit": "Modifier",
   "upload_form.thumbnail": "Changer la vignette",
   "upload_form.video_description": "Décrire pour les personnes ayant des problèmes de vue ou d'audition",

app/javascript/mastodon/locales/fr.json

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Se désabonner de l'utilisateur·rice ?",
   "content_warning.hide": "Masquer le message",
   "content_warning.show": "Afficher quand même",
-  "content_warning.show_more": "Déplier",
   "conversation.delete": "Supprimer la conversation",
   "conversation.mark_as_read": "Marquer comme lu",
   "conversation.open": "Afficher la conversation",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Utilisez une catégorie existante ou créez-en une nouvelle",
   "filter_modal.select_filter.title": "Filtrer ce message",
   "filter_modal.title.status": "Filtrer un message",
-  "filter_warning.matches_filter": "Correspond au filtre « <span>{title}</span> »",
+  "filter_warning.matches_filter": "Correspond au filtre « {title} »",
   "filtered_notifications_banner.pending_requests": "De la part {count, plural, =0 {d’aucune personne} one {d'une personne} other {de # personnes}} que vous pourriez connaître",
   "filtered_notifications_banner.title": "Notifications filtrées",
   "firehose.all": "Tout",
@@ -857,8 +856,6 @@
   "upload_form.description": "Décrire pour les malvoyant·e·s",
   "upload_form.drag_and_drop.instructions": "Pour choisir un média joint, appuyez sur la touche espace ou entrée. Tout en faisant glisser, utilisez les touches fléchées pour déplacer le fichier média dans une direction donnée. Appuyez à nouveau sur la touche espace ou entrée pour déposer le fichier média dans sa nouvelle position, ou appuyez sur la touche Echap pour annuler.",
   "upload_form.drag_and_drop.on_drag_cancel": "Le glissement a été annulé. La pièce jointe {item} n'a pas été ajoutée.",
-  "upload_form.drag_and_drop.on_drag_end": "La pièce jointe du média {item} a été déplacée.",
-  "upload_form.drag_and_drop.on_drag_over": "La pièce jointe du média {item} a été déplacée.",
   "upload_form.edit": "Modifier",
   "upload_form.thumbnail": "Changer la vignette",
   "upload_form.video_description": "Décrire pour les personnes ayant des problèmes de vue ou d'audition",

app/javascript/mastodon/locales/fy.json

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Brûker net mear folgje?",
   "content_warning.hide": "Berjocht ferstopje",
   "content_warning.show": "Dochs toane",
-  "content_warning.show_more": "Mear toane",
   "conversation.delete": "Petear fuortsmite",
   "conversation.mark_as_read": "As lêzen markearje",
   "conversation.open": "Petear toane",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "In besteande kategory brûke of in nije oanmeitsje",
   "filter_modal.select_filter.title": "Dit berjocht filterje",
   "filter_modal.title.status": "In berjocht filterje",
-  "filter_warning.matches_filter": "Komt oerien mei filter ‘<span>{title}</span>’",
+  "filter_warning.matches_filter": "Komt oerien mei filter ‘{title}’",
   "filtered_notifications_banner.pending_requests": "Fan {count, plural, =0 {net ien} one {ien persoan} other {# persoanen}} dy’t jo mooglik kinne",
   "filtered_notifications_banner.title": "Filtere meldingen",
   "firehose.all": "Alles",
@@ -509,7 +508,6 @@
   "notification.favourite": "{name} hat jo berjocht as favoryt markearre",
   "notification.favourite.name_and_others_with_link": "{name} en <a>{count, plural, one {# oar} other {# oaren}}</a> hawwe jo berjocht as favoryt markearre",
   "notification.follow": "{name} folget dy",
-  "notification.follow.name_and_others": "{name} en <a>{count, plural, one {# oar persoan} other {# oare persoanen}}</a> folgje jo no",
   "notification.follow_request": "{name} hat dy in folchfersyk stjoerd",
   "notification.follow_request.name_and_others": "{name} en {count, plural, one {# oar} other {# oaren}} hawwe frege om jo te folgjen",
   "notification.label.mention": "Fermelding",
@@ -568,7 +566,6 @@
   "notifications.column_settings.filter_bar.category": "Flugge filterbalke",
   "notifications.column_settings.follow": "Nije folgers:",
   "notifications.column_settings.follow_request": "Nij folchfersyk:",
-  "notifications.column_settings.group": "Groepearje",
   "notifications.column_settings.mention": "Fermeldingen:",
   "notifications.column_settings.poll": "Enkêteresultaten:",
   "notifications.column_settings.push": "Pushmeldingen",

app/javascript/mastodon/locales/ga.json

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Dílean ​​an t-úsáideoir?",
   "content_warning.hide": "Folaigh postáil",
   "content_warning.show": "Taispeáin ar aon nós",
-  "content_warning.show_more": "Taispeáin níos mó",
   "conversation.delete": "Scrios comhrá",
   "conversation.mark_as_read": "Marcáil mar léite",
   "conversation.open": "Féach ar comhrá",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Bain úsáid as catagóir reatha nó cruthaigh ceann nua",
   "filter_modal.select_filter.title": "Déan scagadh ar an bpostáil seo",
   "filter_modal.title.status": "Déan scagadh ar phostáil",
-  "filter_warning.matches_filter": "Meaitseálann an scagaire “<span>{title}</span>”",
+  "filter_warning.matches_filter": "Meaitseálann an scagaire “{title}”",
   "filtered_notifications_banner.pending_requests": "Ó {count, plural, =0 {duine ar bith} one {duine amháin} two {# daoine} few {# daoine} many {# daoine} other {# daoine}} b’fhéidir go bhfuil aithne agat orthu",
   "filtered_notifications_banner.title": "Fógraí scagtha",
   "firehose.all": "Gach",

app/javascript/mastodon/locales/gd.json

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "A bheil thu airson sgur de leantainn a chleachdaiche?",
   "content_warning.hide": "Falaich am post",
   "content_warning.show": "Seall e co-dhiù",
-  "content_warning.show_more": "Seall barrachd dheth",
   "conversation.delete": "Sguab às an còmhradh",
   "conversation.mark_as_read": "Cuir comharra gun deach a leughadh",
   "conversation.open": "Seall an còmhradh",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Cleachd roinn-seòrsa a tha ann no cruthaich tè ùr",
   "filter_modal.select_filter.title": "Criathraich am post seo",
   "filter_modal.title.status": "Criathraich post",
-  "filter_warning.matches_filter": "A’ maidseadh na criathraige “<span>{title}</span>”",
+  "filter_warning.matches_filter": "A’ maidseadh na criathraige “{title}”",
   "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Chan eil gin ann} one {O # neach} two {O # neach} few {O # daoine} other {O # duine}} air a bheil thu eòlach ’s dòcha",
   "filtered_notifications_banner.title": "Brathan criathraichte",
   "firehose.all": "Na h-uile",
@@ -463,7 +462,7 @@
   "media_gallery.hide": "Falaich",
   "moved_to_account_banner.text": "Tha an cunntas {disabledAccount} agad à comas on a rinn thu imrich gu {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Falaich o na brathan",
-  "mute_modal.hide_options": "Falaich na roghainnean",
+  "mute_modal.hide_options": "Roghainnean falaich",
   "mute_modal.indefinite": "Gus an dì-mhùch mi iad",
   "mute_modal.show_options": "Seall na roghainnean",
   "mute_modal.they_can_mention_and_follow": "’S urrainn dhaibh iomradh a thoirt ort agus do leantainn ach chan fhaic thu iad-san.",
@@ -509,7 +508,6 @@
   "notification.favourite": "Is annsa le {name} am post agad",
   "notification.favourite.name_and_others_with_link": "Is annsa le {name} ’s <a>{count, plural, one {# eile} two {# eile} few {# eile} other {# eile}}</a> am post agad",
   "notification.follow": "Tha {name} ’gad leantainn a-nis",
-  "notification.follow.name_and_others": "Lean {name} ’s <a>{count, plural, one {# eile} two {# eile} few {# eile} other {# eile}}</a> thu",
   "notification.follow_request": "Dh’iarr {name} ’gad leantainn",
   "notification.follow_request.name_and_others": "Dh’iarr {name} ’s {count, plural, one {# eile} two {# eile} few {# eile} other {# eile}} ’gad leantainn",
   "notification.label.mention": "Iomradh",
@@ -568,7 +566,6 @@
   "notifications.column_settings.filter_bar.category": "Bàr-criathraidh luath",
   "notifications.column_settings.follow": "Luchd-leantainn ùr:",
   "notifications.column_settings.follow_request": "Iarrtasan leantainn ùra:",
-  "notifications.column_settings.group": "Buidheann",
   "notifications.column_settings.mention": "Iomraidhean:",
   "notifications.column_settings.poll": "Toraidhean cunntais-bheachd:",
   "notifications.column_settings.push": "Brathan putaidh",

app/javascript/mastodon/locales/gl.json

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Deixar de seguir á usuaria?",
   "content_warning.hide": "Agochar publicación",
   "content_warning.show": "Mostrar igualmente",
-  "content_warning.show_more": "Mostrar máis",
   "conversation.delete": "Eliminar conversa",
   "conversation.mark_as_read": "Marcar como lido",
   "conversation.open": "Ver conversa",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Usar unha categoría existente ou crear unha nova",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar unha publicación",
-  "filter_warning.matches_filter": "Concorda co filtro «<span>{title}</span>»",
+  "filter_warning.matches_filter": "Debido ao filtro “{title}”",
   "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {ninguén} one {unha persoa} other {# persoas}} que igual coñeces",
   "filtered_notifications_banner.title": "Notificacións filtradas",
   "firehose.all": "Todo",
@@ -452,7 +451,7 @@
   "lists.exclusive": "Agocha estas publicacións no Inicio",
   "lists.new.create": "Engadir listaxe",
   "lists.new.title_placeholder": "Título da nova listaxe",
-  "lists.replies_policy.followed": "Calquera usuaria que siga",
+  "lists.replies_policy.followed": "Toda usuaria seguida",
   "lists.replies_policy.list": "Membros da lista",
   "lists.replies_policy.none": "Ninguén",
   "lists.replies_policy.title": "Mostrar respostas a:",

app/javascript/mastodon/locales/he.json

@@ -1,5 +1,5 @@
 {
-  "about.blocks": "שרתים תחת פיקוח תוכן",
+  "about.blocks": "שרתים מוגבלים",
   "about.contact": "יצירת קשר:",
   "about.disclaimer": "מסטודון היא תוכנת קוד פתוח חינמית וסימן מסחרי של Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "הסיבה אינה זמינה",
@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "לבטל מעקב אחר המשתמש.ת?",
   "content_warning.hide": "הסתרת חיצרוץ",
   "content_warning.show": "להציג בכל זאת",
-  "content_warning.show_more": "הצג עוד",
   "conversation.delete": "מחיקת שיחה",
   "conversation.mark_as_read": "סמן כנקרא",
   "conversation.open": "צפו בשיחה",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "שימוש בקטגורייה קיימת או יצירת אחת חדשה",
   "filter_modal.select_filter.title": "סינון ההודעה הזו",
   "filter_modal.title.status": "סנן הודעה",
-  "filter_warning.matches_filter": "תואם לסנן “<span>{title}</span>”",
+  "filter_warning.matches_filter": "תואם לסנן “{title}”",
   "filtered_notifications_banner.pending_requests": "{count, plural,=0 {אין בקשות ממשתמשים }one {בקשה אחת ממישהו/מישהי }two {יש בקשותיים ממשתמשים }other {יש # בקשות ממשתמשים }}שאולי מוכרים לך",
   "filtered_notifications_banner.title": "התראות מסוננות",
   "firehose.all": "הכל",
@@ -377,7 +376,7 @@
   "ignore_notifications_modal.filter_to_avoid_confusion": "סינון מסייע למניעת בלבולים אפשריים",
   "ignore_notifications_modal.filter_to_review_separately": "ניתן לסקור התראות מפולטרות בנפרד",
   "ignore_notifications_modal.ignore": "להתעלם מהתראות",
-  "ignore_notifications_modal.limited_accounts_title": "להתעלם מהתראות מחשבונות תחת פיקוח דיון?",
+  "ignore_notifications_modal.limited_accounts_title": "להתעלם מהתראות מחשבונות תחת פיקוח?",
   "ignore_notifications_modal.new_accounts_title": "להתעלם מהתראות מחשבונות חדשים?",
   "ignore_notifications_modal.not_followers_title": "להתעלם מהתראות מא.נשים שאינם עוקביך?",
   "ignore_notifications_modal.not_following_title": "להתעלם מהתראות מא.נשים שאינם נעקביך?",
@@ -440,7 +439,7 @@
   "lightbox.zoom_in": "הגדלה לגודל מלא",
   "lightbox.zoom_out": "התאמה לגודל המסך",
   "limited_account_hint.action": "הצג חשבון בכל זאת",
-  "limited_account_hint.title": "פרופיל המשתמש הזה הוסתר על ידי מנחי הדיון של {domain}.",
+  "limited_account_hint.title": "פרופיל המשתמש הזה הוסתר על ידי המנחים של {domain}.",
   "link_preview.author": "מאת {name}",
   "link_preview.more_from_author": "עוד מאת {name}",
   "link_preview.shares": "{count, plural, one {הודעה אחת} two {הודעותיים} many {{counter} הודעות} other {{counter} הודעות}}",
@@ -489,7 +488,7 @@
   "navigation_bar.follows_and_followers": "נעקבים ועוקבים",
   "navigation_bar.lists": "רשימות",
   "navigation_bar.logout": "התנתקות",
-  "navigation_bar.moderation": "הנחיית דיונים",
+  "navigation_bar.moderation": "פיקוח",
   "navigation_bar.mutes": "משתמשים בהשתקה",
   "navigation_bar.opened_in_classic_interface": "הודעות, חשבונות ושאר עמודי רשת יפתחו כברירת מחדל בדפדפן רשת קלאסי.",
   "navigation_bar.personal": "אישי",
@@ -599,7 +598,7 @@
   "notifications.policy.filter": "מסנן",
   "notifications.policy.filter_hint": "שליחה לתיבה נכנסת מסוננת",
   "notifications.policy.filter_limited_accounts_hint": "הוגבל על ידי מנהלי הדיונים",
-  "notifications.policy.filter_limited_accounts_title": "חשבומות תחת ניהול תוכן",
+  "notifications.policy.filter_limited_accounts_title": "חשבון מוגבל",
   "notifications.policy.filter_new_accounts.hint": "נוצר {days, plural,one {ביום האחרון} two {ביומיים האחרונים} other {ב־# הימים האחרונים}}",
   "notifications.policy.filter_new_accounts_title": "חשבונות חדשים",
   "notifications.policy.filter_not_followers_hint": "כולל משתמשים שעקבו אחריך פחות מ{days, plural,one {יום} two {יומיים} other {־# ימים}}",
@@ -776,9 +775,9 @@
   "sign_in_banner.mastodon_is": "מסטודון הוא הדרך הטובה ביותר לעקוב אחרי מה שקורה.",
   "sign_in_banner.sign_in": "התחברות",
   "sign_in_banner.sso_redirect": "התחברות/הרשמה",
-  "status.admin_account": "פתח/י ממשק פיקוח דיון עבור @{name}",
-  "status.admin_domain": "פתיחת ממשק פיקוח דיון עבור {domain}",
-  "status.admin_status": "לפתוח הודעה זו במסך ניהול הדיונים",
+  "status.admin_account": "פתח/י ממשק ניהול עבור @{name}",
+  "status.admin_domain": "פתיחת ממשק ניהול עבור {domain}",
+  "status.admin_status": "Open this status in the moderation interface",
   "status.block": "חסימת @{name}",
   "status.bookmark": "סימניה",
   "status.cancel_reblog_private": "הסרת הדהוד",

app/javascript/mastodon/locales/hu.json

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Megszünteted a felhasználó követését?",
   "content_warning.hide": "Bejegyzés elrejtése",
   "content_warning.show": "Megjelenítés mindenképp",
-  "content_warning.show_more": "Több megjelenítése",
   "conversation.delete": "Beszélgetés törlése",
   "conversation.mark_as_read": "Megjelölés olvasottként",
   "conversation.open": "Beszélgetés megtekintése",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Válassz egy meglévő kategóriát, vagy hozz létre egy újat",
   "filter_modal.select_filter.title": "E bejegyzés szűrése",
   "filter_modal.title.status": "Egy bejegyzés szűrése",
-  "filter_warning.matches_filter": "Megfelel a szűrőnek: „<span>{title}</span>”",
+  "filter_warning.matches_filter": "Megfelel a szűrőnek: „{title}”",
   "filtered_notifications_banner.pending_requests": "{count, plural, =0 {senkitől} one {egy valószínűleg ismerős személytől} other {# valószínűleg ismerős személytől}}",
   "filtered_notifications_banner.title": "Szűrt értesítések",
   "firehose.all": "Összes",
@@ -615,7 +614,7 @@
   "onboarding.action.back": "Vissza",
   "onboarding.actions.back": "Vissza",
   "onboarding.actions.go_to_explore": "Felkapottak megtekintése",
-  "onboarding.actions.go_to_home": "Ugrás a kezdőlapod hírfolyamára",
+  "onboarding.actions.go_to_home": "Ugrás a saját hírfolyamra",
   "onboarding.compose.template": "Üdvözlet, #Mastodon!",
   "onboarding.follows.empty": "Sajnos jelenleg nem jeleníthető meg eredmény. Kipróbálhatod a keresést vagy böngészheted a felfedező oldalon a követni kívánt személyeket, vagy próbáld meg később.",
   "onboarding.follows.lead": "A kezdőlapod a Mastodon használatának elsődleges módja. Minél több embert követsz, annál aktívabbak és érdekesebbek lesznek a dolgok. Az induláshoz itt van néhány javaslat:",
@@ -678,7 +677,7 @@
   "recommended": "Ajánlott",
   "refresh": "Frissítés",
   "regeneration_indicator.label": "Betöltés…",
-  "regeneration_indicator.sublabel": "A kezdőlapod hírfolyama épp készül!",
+  "regeneration_indicator.sublabel": "A saját idővonalad épp készül!",
   "relative_time.days": "{number}n",
   "relative_time.full.days": "{number, plural, one {# napja} other {# napja}}",
   "relative_time.full.hours": "{number, plural, one {# órája} other {# órája}}",
@@ -732,7 +731,7 @@
   "report.thanks.title": "Nem akarod ezt látni?",
   "report.thanks.title_actionable": "Köszönjük, hogy jelentetted, megnézzük.",
   "report.unfollow": "@{name} követésének leállítása",
-  "report.unfollow_explanation": "Követed ezt a fiókot. Hogy ne lásd a bejegyzéseit a kezdőlapi hírfolyamban, szüntesd meg a követését.",
+  "report.unfollow_explanation": "Követed ezt a fiókot. Hogy ne lásd a bejegyzéseit a saját idővonaladon, szüntesd meg a követését.",
   "report_notification.attached_statuses": "{count} bejegyzés mellékelve",
   "report_notification.categories.legal": "Jogi",
   "report_notification.categories.legal_sentence": "illegális tartalom",
@@ -836,7 +835,7 @@
   "subscribed_languages.lead": "A változtatás után csak a kiválasztott nyelvű bejegyzések fognak megjelenni a kezdőlapon és az idővonalakon. Ha egy sincs kiválasztva, akkor minden nyelven megjelennek a bejegyzések.",
   "subscribed_languages.save": "Változások mentése",
   "subscribed_languages.target": "Feliratkozott nyelvek módosítása {target} esetében",
-  "tabs_bar.home": "Kezdőlap",
+  "tabs_bar.home": "Kezdőoldal",
   "tabs_bar.notifications": "Értesítések",
   "time_remaining.days": "{number, plural, one {# nap} other {# nap}} van hátra",
   "time_remaining.hours": "{number, plural, one {# óra} other {# óra}} van hátra",

app/javascript/mastodon/locales/ia.json

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Cessar de sequer le usator?",
   "content_warning.hide": "Celar le message",
   "content_warning.show": "Monstrar in omne caso",
-  "content_warning.show_more": "Monstrar plus",
   "conversation.delete": "Deler conversation",
   "conversation.mark_as_read": "Marcar como legite",
   "conversation.open": "Vider conversation",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Usa un categoria existente o crea un nove",
   "filter_modal.select_filter.title": "Filtrar iste message",
   "filter_modal.title.status": "Filtrar un message",
-  "filter_warning.matches_filter": "Corresponde al filtro “<span>{title}</span>”",
+  "filter_warning.matches_filter": "Corresponde al filtro “{title}”",
   "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {nemo} one {un persona} other {# personas}} que tu pote cognoscer",
   "filtered_notifications_banner.title": "Notificationes filtrate",
   "firehose.all": "Toto",
@@ -509,7 +508,6 @@
   "notification.favourite": "{name} ha marcate tu message como favorite",
   "notification.favourite.name_and_others_with_link": "{name} e <a>{count, plural, one {# altere} other {# alteres}}</a> favoriva tu message",
   "notification.follow": "{name} te ha sequite",
-  "notification.follow.name_and_others": "{name} e <a>{count, plural, one {# other} other {# alteres}}</a> te ha sequite",
   "notification.follow_request": "{name} ha requestate de sequer te",
   "notification.follow_request.name_and_others": "{name} e {count, plural, one {# altere} other {# alteres}} ha demandate de sequer te",
   "notification.label.mention": "Mention",
@@ -568,7 +566,6 @@
   "notifications.column_settings.filter_bar.category": "Barra de filtro rapide",
   "notifications.column_settings.follow": "Nove sequitores:",
   "notifications.column_settings.follow_request": "Nove requestas de sequimento:",
-  "notifications.column_settings.group": "Gruppo",
   "notifications.column_settings.mention": "Mentiones:",
   "notifications.column_settings.poll": "Resultatos del sondage:",
   "notifications.column_settings.push": "Notificationes push",

app/javascript/mastodon/locales/id.json

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

app/javascript/mastodon/locales/ig.json

@@ -6,10 +6,7 @@
   "account.follow": "Soro",
   "account.followers": "Ndị na-eso",
   "account.following": "Na-eso",
-  "account.go_to_profile": "Jee na profaịlụ",
   "account.mute": "Mee ogbi @{name}",
-  "account.posts": "Edemede",
-  "account.posts_with_replies": "Edemede na nzaghachị",
   "account.unfollow": "Kwụsị iso",
   "account_note.placeholder": "Click to add a note",
   "admin.dashboard.retention.cohort_size": "Ojiarụ ọhụrụ",
@@ -50,7 +47,6 @@
   "confirmations.reply.confirm": "Zaa",
   "confirmations.unfollow.confirm": "Kwụsị iso",
   "conversation.delete": "Hichapụ nkata",
-  "conversation.open": "Lelee nkata",
   "disabled_account_banner.account_settings": "Mwube akaụntụ",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
@@ -67,10 +63,8 @@
   "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
   "errors.unexpected_crash.report_issue": "Kpesa nsogbu",
   "explore.trending_links": "Akụkọ",
-  "filter_modal.added.review_and_configure_title": "Mwube myọ",
   "firehose.all": "Ha niine",
   "follow_request.authorize": "Nye ikike",
-  "follow_suggestions.view_all": "Lelee ha ncha",
   "footer.privacy_policy": "Iwu nzuzu",
   "getting_started.heading": "Mbido",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
@@ -92,7 +86,7 @@
   "keyboard_shortcuts.local": "to open local timeline",
   "keyboard_shortcuts.mention": "to mention author",
   "keyboard_shortcuts.muted": "to open muted users list",
-  "keyboard_shortcuts.my_profile": "Mepe profaịlụ gị",
+  "keyboard_shortcuts.my_profile": "to open your profile",
   "keyboard_shortcuts.notifications": "to open notifications column",
   "keyboard_shortcuts.open_media": "to open media",
   "keyboard_shortcuts.pinned": "to open pinned posts list",
@@ -119,7 +113,6 @@
   "navigation_bar.lists": "Ndepụta",
   "not_signed_in_indicator.not_signed_in": "You need to sign in to access this resource.",
   "notification.reblog": "{name} boosted your status",
-  "notifications.column_settings.status": "Edemede ọhụrụ:",
   "onboarding.actions.go_to_explore": "See what's trending",
   "onboarding.actions.go_to_home": "Go to your home feed",
   "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
@@ -132,7 +125,7 @@
   "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
   "onboarding.steps.setup_profile.title": "Customize your profile",
   "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
-  "onboarding.steps.share_profile.title": "Kekọrịta profaịlụ Mastọdọnụ gị",
+  "onboarding.steps.share_profile.title": "Share your profile",
   "privacy.change": "Adjust status privacy",
   "relative_time.full.just_now": "kịta",
   "relative_time.just_now": "kịta",
@@ -140,7 +133,6 @@
   "reply_indicator.cancel": "Kagbuo",
   "report.categories.other": "Ọzọ",
   "report.categories.spam": "Nzipụ Ozièlètrọniìk Nkeāchọghị",
-  "report.category.title_account": "profaịlụ",
   "report.mute": "Mee ogbi",
   "report.placeholder": "Type or paste additional comments",
   "report.submit": "Submit report",
@@ -148,7 +140,6 @@
   "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
   "report_notification.categories.other": "Ọzọ",
   "search.placeholder": "Chọọ",
-  "search_results.accounts": "Profaịlụ",
   "server_banner.active_users": "ojiarụ dị ìrè",
   "sign_in_banner.sign_in": "Sign in",
   "status.admin_status": "Open this status in the moderation interface",

app/javascript/mastodon/locales/io.json

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

app/javascript/mastodon/locales/is.json

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Hætta að fylgjast með viðkomandi?",
   "content_warning.hide": "Fela færslu",
   "content_warning.show": "Birta samt",
-  "content_warning.show_more": "Sýna meira",
   "conversation.delete": "Eyða samtali",
   "conversation.mark_as_read": "Merkja sem lesið",
   "conversation.open": "Skoða samtal",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Notaðu fyrirliggjandi flokk eða útbúðu nýjan",
   "filter_modal.select_filter.title": "Sía þessa færslu",
   "filter_modal.title.status": "Sía færslu",
-  "filter_warning.matches_filter": "Samsvarar síunni “<span>{title}</span>”",
+  "filter_warning.matches_filter": "Samsvarar síunni“{title}”",
   "filtered_notifications_banner.pending_requests": "Frá {count, plural, =0 {engum} one {einum aðila} other {# manns}} sem þú gætir þekkt",
   "filtered_notifications_banner.title": "Síaðar tilkynningar",
   "firehose.all": "Allt",

app/javascript/mastodon/locales/it.json

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Smettere di seguire l'utente?",
   "content_warning.hide": "Nascondi post",
   "content_warning.show": "Mostra comunque",
-  "content_warning.show_more": "Mostra di più",
   "conversation.delete": "Elimina conversazione",
   "conversation.mark_as_read": "Segna come letto",
   "conversation.open": "Visualizza conversazione",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Usa una categoria esistente o creane una nuova",
   "filter_modal.select_filter.title": "Filtra questo post",
   "filter_modal.title.status": "Filtra un post",
-  "filter_warning.matches_filter": "Corrisponde al filtro “<span>{title}</span>”",
+  "filter_warning.matches_filter": "Corrisponde al filtro \"{title}\"",
   "filtered_notifications_banner.pending_requests": "Da {count, plural, =0 {nessuno} one {una persona} other {# persone}} che potresti conoscere",
   "filtered_notifications_banner.title": "Notifiche filtrate",
   "firehose.all": "Tutto",
@@ -640,11 +639,11 @@
   "onboarding.start.title": "Ce l'hai fatta!",
   "onboarding.steps.follow_people.body": "Gestisci la tua cronologia. Riempila di persone interessanti.",
   "onboarding.steps.follow_people.title": "Segui {count, plural, one {una persona} other {# persone}}",
-  "onboarding.steps.publish_status.body": "",
+  "onboarding.steps.publish_status.body": "Dì ciao al mondo.",
   "onboarding.steps.publish_status.title": "Scrivi il tuo primo post",
   "onboarding.steps.setup_profile.body": "Gli altri hanno maggiori probabilità di interagire con te se completi il tuo profilo.",
   "onboarding.steps.setup_profile.title": "Personalizza il tuo profilo",
-  "onboarding.steps.share_profile.body": "Fai sapere ai tuoi amici come trovarti su Mastodonte",
+  "onboarding.steps.share_profile.body": "Fai sapere ai tuoi amici come trovarti su Mastodon!",
   "onboarding.steps.share_profile.title": "Condividi il tuo profilo",
   "onboarding.tips.2fa": "<strong>Lo sapevi?</strong> Puoi proteggere il tuo account impostando l'autenticazione a due fattori nelle impostazioni del tuo account. Funziona con qualsiasi app TOTP di tua scelta, nessun numero di telefono necessario!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Lo sapevi?</strong> Dal momento che Mastodon è decentralizzato, alcuni profili che incontrerai sono ospitati su server diversi dal tuo. Ma puoi interagire con loro senza problemi! Il loro server è nella seconda metà del loro nome utente!",

app/javascript/mastodon/locales/ja.json

@@ -196,8 +196,7 @@
   "confirmations.unfollow.message": "本当に{name}さんのフォローを解除しますか？",
   "confirmations.unfollow.title": "フォローを解除しようとしています",
   "content_warning.hide": "内容を隠す",
-  "content_warning.show": "承知して表示",
-  "content_warning.show_more": "続きを表示",
+  "content_warning.show": "承知の上で表示",
   "conversation.delete": "会話を削除",
   "conversation.mark_as_read": "既読にする",
   "conversation.open": "会話を表示",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "既存のカテゴリーを使用するか新規作成します",
   "filter_modal.select_filter.title": "この投稿をフィルターする",
   "filter_modal.title.status": "投稿をフィルターする",
-  "filter_warning.matches_filter": "フィルター「<span>{title}</span>」に一致する投稿",
+  "filter_warning.matches_filter": "フィルター「{title}」に一致する投稿です",
   "filtered_notifications_banner.pending_requests": "{count, plural,  =0 {すべて完了しました} other {#人の通知がブロックされています}}",
   "filtered_notifications_banner.title": "保留中の通知",
   "firehose.all": "すべて",
@@ -505,13 +504,12 @@
   "notification.admin.report_statuses": "{name}さんが{target}さんを「{category}」として通報しました",
   "notification.admin.report_statuses_other": "{name}さんが{target}さんを通報しました",
   "notification.admin.sign_up": "{name}さんがサインアップしました",
-  "notification.admin.sign_up.name_and_others": "{name}さんとほか{count, plural, other {#人}}がサインアップしました",
+  "notification.admin.sign_up.name_and_others": "{name}さんほか{count, plural, other {#人}}がサインアップしました",
   "notification.favourite": "{name}さんがお気に入りしました",
-  "notification.favourite.name_and_others_with_link": "{name}さんと<a>ほか{count, plural, other {#人}}</a>がお気に入りしました",
+  "notification.favourite.name_and_others_with_link": "{name}さん<a>ほか{count, plural, other {#人}}</a>がお気に入りしました",
   "notification.follow": "{name}さんにフォローされました",
-  "notification.follow.name_and_others": "{name}さんと<a>ほか{count, plural, other {#人}}</a>にフォローされました",
   "notification.follow_request": "{name}さんがあなたにフォローリクエストしました",
-  "notification.follow_request.name_and_others": "{name}さんとほか{count, plural, other {#人}}があなたにフォローリクエストしました",
+  "notification.follow_request.name_and_others": "{name}さんほか{count, plural, other {#人}}があなたにフォローリクエストしました",
   "notification.label.mention": "メンション",
   "notification.label.private_mention": "非公開の返信 (メンション)",
   "notification.label.private_reply": "非公開の返信",
@@ -530,7 +528,7 @@
   "notification.own_poll": "アンケートが終了しました",
   "notification.poll": "投票したアンケートが終了しました",
   "notification.reblog": "{name}さんがあなたの投稿をブーストしました",
-  "notification.reblog.name_and_others_with_link": "{name}さんと<a>ほか{count, plural, other {#人}}</a>がブーストしました",
+  "notification.reblog.name_and_others_with_link": "{name}さん<a>ほか{count, plural, other {#人}}</a>にブーストされました",
   "notification.relationships_severance_event": "{name} との関係が失われました",
   "notification.relationships_severance_event.account_suspension": "{from} の管理者が {target} さんを停止したため、今後このユーザーとの交流や新しい投稿の受け取りができなくなりました。",
   "notification.relationships_severance_event.domain_block": "{from} の管理者が {target} をブロックしました。これにより{followersCount}フォロワーと{followingCount, plural, other {#フォロー}}が失われました。",
@@ -568,7 +566,6 @@
   "notifications.column_settings.filter_bar.category": "クイックフィルターバー:",
   "notifications.column_settings.follow": "新しいフォロワー:",
   "notifications.column_settings.follow_request": "新しいフォローリクエスト:",
-  "notifications.column_settings.group": "グループ",
   "notifications.column_settings.mention": "返信:",
   "notifications.column_settings.poll": "アンケート結果:",
   "notifications.column_settings.push": "プッシュ通知",

app/javascript/mastodon/locales/ko.json

@@ -113,7 +113,7 @@
   "bundle_modal_error.message": "컴포넌트를 불러오는 중 문제가 발생했습니다.",
   "bundle_modal_error.retry": "다시 시도",
   "closed_registrations.other_server_instructions": "마스토돈은 분산화 되어 있기 때문에, 다른 서버에서 계정을 만들더라도 이 서버와 상호작용 할 수 있습니다.",
-  "closed_registrations_modal.description": "{domain}은 현재 가입이 불가능합니다. 하지만 마스토돈을 이용하기 위해 꼭 {domain}을 사용할 필요는 없다는 사실을 인지해 두세요.",
+  "closed_registrations_modal.description": "{domain}은 현재 가입이 막혀있는 상태입니다, 마스토돈을 이용하기 위해 꼭 {domain}을 사용할 필요는 없다는 사실을 인지해 두세요.",
   "closed_registrations_modal.find_another_server": "다른 서버 찾기",
   "closed_registrations_modal.preamble": "마스토돈은 분산화 되어 있습니다, 그렇기 때문에 어디에서 계정을 생성하든, 이 서버에 있는 누구와도 팔로우와 상호작용을 할 수 있습니다. 심지어는 스스로 서버를 만드는 것도 가능합니다!",
   "closed_registrations_modal.title": "마스토돈에서 가입",
@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "사용자를 언팔로우 할까요?",
   "content_warning.hide": "게시물 숨기기",
   "content_warning.show": "무시하고 보기",
-  "content_warning.show_more": "더 보기",
   "conversation.delete": "대화 삭제",
   "conversation.mark_as_read": "읽은 상태로 표시",
   "conversation.open": "대화 보기",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "기존의 카테고리를 사용하거나 새로 하나를 만듧니다",
   "filter_modal.select_filter.title": "이 게시물을 필터",
   "filter_modal.title.status": "게시물 필터",
-  "filter_warning.matches_filter": "\"<span>{title}</span>\" 필터에 걸림",
+  "filter_warning.matches_filter": "\"{title}\" 필터에 걸림",
   "filtered_notifications_banner.pending_requests": "알 수도 있는 {count, plural, =0 {0 명} one {한 명} other {# 명}}의 사람들로부터",
   "filtered_notifications_banner.title": "걸러진 알림",
   "firehose.all": "모두",
@@ -352,7 +351,7 @@
   "hashtag.column_settings.tag_toggle": "추가 해시태그를 이 컬럼에 추가합니다",
   "hashtag.counter_by_accounts": "{count, plural, other {참여자 {counter}명}}",
   "hashtag.counter_by_uses": "{count, plural, other {게시물 {counter}개}}",
-  "hashtag.counter_by_uses_today": "오늘 {count, plural, other {{counter} 개의 게시물}}",
+  "hashtag.counter_by_uses_today": "금일 {count, plural, other {게시물 {counter}개}}",
   "hashtag.follow": "해시태그 팔로우",
   "hashtag.unfollow": "해시태그 팔로우 해제",
   "hashtags.and_other": "…및 {count, plural,other {#개}}",

app/javascript/mastodon/locales/la.json

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

app/javascript/mastodon/locales/lad.json

@@ -97,7 +97,6 @@
   "block_modal.you_wont_see_mentions": "No veras publikasyones ke lo enmentan.",
   "boost_modal.combo": "Puedes klikar {combo} para ometer esto la proksima vez",
   "boost_modal.reblog": "Repartajar puvlikasyon?",
-  "boost_modal.undo_reblog": "Departajar puvlikasyon?",
   "bundle_column_error.copy_stacktrace": "Kopia el raporto de yerro",
   "bundle_column_error.error.body": "La pajina solisitada no pudo ser renderada. Podria ser por un yerro en muestro kodiche o un problem de kompatibilita kon el navigador.",
   "bundle_column_error.error.title": "Atyo, no!",
@@ -193,7 +192,6 @@
   "confirmations.unfollow.title": "Desige utilizador?",
   "content_warning.hide": "Eskonde puvlikasyon",
   "content_warning.show": "Amostra entanto",
-  "content_warning.show_more": "Amostra mas",
   "conversation.delete": "Efasa konversasyon",
   "conversation.mark_as_read": "Marka komo meldado",
   "conversation.open": "Ve konversasyon",
@@ -215,7 +213,6 @@
   "dismissable_banner.public_timeline": "Estas son las publikasyones publikas mas resientes de personas en la red sosyala a las kualas la djente de {domain} sige.",
   "domain_block_modal.block": "Bloka sirvidor",
   "domain_block_modal.block_account_instead": "Bloka @{name} en su lugar",
-  "domain_block_modal.they_can_interact_with_old_posts": "Las personas de este sirvidor pueden enteraktuar kon tus puvlikasyones viejas.",
   "domain_block_modal.they_cant_follow": "Dingun de este sirvidor puede segirte.",
   "domain_block_modal.they_wont_know": "No savra ke tiene sido blokado.",
   "domain_block_modal.title": "Bloka el domeno?",
@@ -310,7 +307,6 @@
   "follow_suggestions.personalized_suggestion": "Sujestion personalizada",
   "follow_suggestions.popular_suggestion": "Sujestion populara",
   "follow_suggestions.popular_suggestion_longer": "Popular en {domain}",
-  "follow_suggestions.similar_to_recently_followed_longer": "Similares a los profils ke tienes segido resyentemente",
   "follow_suggestions.view_all": "Ve todos",
   "follow_suggestions.who_to_follow": "A ken segir",
   "followed_tags": "Etiketas segidas",
@@ -339,9 +335,6 @@
   "hashtag.follow": "Sige etiketa",
   "hashtag.unfollow": "Desige etiketa",
   "hashtags.and_other": "…i {count, plural, one {}other {# mas}}",
-  "hints.profiles.followers_may_be_missing": "Puede ser ke algunos suivantes de este profil no se amostren.",
-  "hints.profiles.follows_may_be_missing": "Puede ser ke algunos kuentos segidos por este profil no se amostren.",
-  "hints.profiles.posts_may_be_missing": "Puede ser ke algunas puvlikasyones de este profil no se amostren.",
   "hints.profiles.see_more_followers": "Ve mas suivantes en {domain}",
   "hints.profiles.see_more_follows": "Ve mas segidos en {domain}",
   "hints.profiles.see_more_posts": "Ve mas puvlikasyones en {domain}",
@@ -359,7 +352,6 @@
   "ignore_notifications_modal.new_accounts_title": "Inyorar avizos de kuentos muevos?",
   "ignore_notifications_modal.not_followers_title": "Inyorar avizos de personas a las kualas no te sigen?",
   "ignore_notifications_modal.not_following_title": "Inyorar avizos de personas a las kualas no siges?",
-  "ignore_notifications_modal.private_mentions_title": "Ignorar avizos de mensyones privadas no solisitadas?",
   "interaction_modal.description.favourite": "Kon un kuento en Mastodon, puedes markar esta publikasyon komo favorita para ke el autor sepa ke te plaze i para guadrarla para dempues.",
   "interaction_modal.description.follow": "Kon un kuento en Mastodon, puedes segir a {name} para risivir sus publikasyones en tu linya temporal prinsipala.",
   "interaction_modal.description.reblog": "Kon un kuento en Mastodon, puedes repartajar esta publikasyon para amostrarla a tus suivantes.",
@@ -474,7 +466,6 @@
   "navigation_bar.security": "Segurita",
   "not_signed_in_indicator.not_signed_in": "Nesesitas konektarse kon tu kuento para akseder este rekurso.",
   "notification.admin.report": "{name} raporto {target}",
-  "notification.admin.report_statuses": "{name} raporto {target} por {category}",
   "notification.admin.report_statuses_other": "{name} raporto {target}",
   "notification.admin.sign_up": "{name} kriyo un konto",
   "notification.favourite": "A {name} le plaze tu publikasyon",
@@ -482,7 +473,6 @@
   "notification.follow_request": "{name} tiene solisitado segirte",
   "notification.label.mention": "Enmenta",
   "notification.label.private_mention": "Enmentadura privada",
-  "notification.label.private_reply": "Repuesta privada",
   "notification.label.reply": "Arisponde",
   "notification.mention": "Enmenta",
   "notification.mentioned_you": "{name} te enmento",
@@ -546,7 +536,6 @@
   "notifications.policy.accept_hint": "Amostra en avizos",
   "notifications.policy.drop": "Inyora",
   "notifications.policy.filter": "Filtra",
-  "notifications.policy.filter_limited_accounts_hint": "Limitadas por moderadores del sirvidor",
   "notifications.policy.filter_limited_accounts_title": "Kuentos moderados",
   "notifications.policy.filter_new_accounts.hint": "Kriyadas durante {days, plural, one {el ultimo diya} other {los ultimos # diyas}}",
   "notifications.policy.filter_new_accounts_title": "Muevos kuentos",

app/javascript/mastodon/locales/lt.json

@@ -69,7 +69,7 @@
   "account.unendorse": "Nerodyti profilyje",
   "account.unfollow": "Nebesekti",
   "account.unmute": "Atšaukti nutildymą @{name}",
-  "account.unmute_notifications_short": "Atšaukti pranešimų nutildymą",
+  "account.unmute_notifications_short": "Atšaukti nutildymą pranešimams",
   "account.unmute_short": "Atšaukti nutildymą",
   "account_note.placeholder": "Spustelėk, kad pridėtum pastabą.",
   "admin.dashboard.daily_retention": "Naudotojų pasilikimo rodiklis pagal dieną po registracijos",
@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Nebesekti naudotoją?",
   "content_warning.hide": "Slėpti įrašą",
   "content_warning.show": "Rodyti vis tiek",
-  "content_warning.show_more": "Rodyti daugiau",
   "conversation.delete": "Ištrinti pokalbį",
   "conversation.mark_as_read": "Žymėti kaip skaitytą",
   "conversation.open": "Peržiūrėti pokalbį",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Naudok esamą kategoriją arba sukurk naują.",
   "filter_modal.select_filter.title": "Filtruoti šį įrašą",
   "filter_modal.title.status": "Filtruoti įrašą",
-  "filter_warning.matches_filter": "Atitinka filtrą „<span>{title}</span>“",
+  "filter_warning.matches_filter": "Atitinka filtrą „{title}“",
   "filtered_notifications_banner.pending_requests": "Iš {count, plural, =0 {nė vieno} one {žmogaus} few {# žmonių} many {# žmonių} other {# žmonių}}, kuriuos galbūt pažįsti",
   "filtered_notifications_banner.title": "Filtruojami pranešimai",
   "firehose.all": "Visi",
@@ -505,7 +504,6 @@
   "notification.admin.report_statuses": "{name} pranešė {target} kategorijai {category}",
   "notification.admin.report_statuses_other": "{name} pranešė {target}",
   "notification.admin.sign_up": "{name} užsiregistravo",
-  "notification.admin.sign_up.name_and_others": "{name} ir {count, plural, one {# kitas} few {# kiti} many {# kito} other {# kitų}} užsiregistravo",
   "notification.favourite": "{name} pamėgo tavo įrašą",
   "notification.follow": "{name} seka tave",
   "notification.follow.name_and_others": "{name} ir <a>{count, plural, one {# kitas} few {# kiti} many {# kito} other {# kitų}}</a> seka tave",
@@ -515,7 +513,6 @@
   "notification.label.private_reply": "Privatus atsakymas",
   "notification.label.reply": "Atsakymas",
   "notification.mention": "Paminėjimas",
-  "notification.mentioned_you": "{name} paminėjo jus",
   "notification.moderation-warning.learn_more": "Sužinoti daugiau",
   "notification.moderation_warning": "Gavai prižiūrėjimo įspėjimą",
   "notification.moderation_warning.action_delete_statuses": "Kai kurie tavo įrašai buvo pašalintos.",

app/javascript/mastodon/locales/lv.json

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

app/javascript/mastodon/locales/nl.json

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Gebruiker ontvolgen?",
   "content_warning.hide": "Bericht verbergen",
   "content_warning.show": "Alsnog tonen",
-  "content_warning.show_more": "Meer tonen",
   "conversation.delete": "Gesprek verwijderen",
   "conversation.mark_as_read": "Als gelezen markeren",
   "conversation.open": "Gesprek tonen",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Een bestaande categorie gebruiken of een nieuwe aanmaken",
   "filter_modal.select_filter.title": "Dit bericht filteren",
   "filter_modal.title.status": "Een bericht filteren",
-  "filter_warning.matches_filter": "Komt overeen met filter \"<span>{title}</span>\"",
+  "filter_warning.matches_filter": "Komt overeen met filter “{title}”",
   "filtered_notifications_banner.pending_requests": "Van {count, plural, =0 {niemand} one {een persoon} other {# personen}} die je mogelijk kent",
   "filtered_notifications_banner.title": "Gefilterde meldingen",
   "firehose.all": "Alles",

app/javascript/mastodon/locales/nn.json

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Slutt å fylgja brukaren?",
   "content_warning.hide": "Gøym innlegg",
   "content_warning.show": "Vis likevel",
-  "content_warning.show_more": "Vis meir",
   "conversation.delete": "Slett samtale",
   "conversation.mark_as_read": "Marker som lesen",
   "conversation.open": "Sjå samtale",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Bruk ein eksisterande kategori eller opprett ein ny",
   "filter_modal.select_filter.title": "Filtrer dette innlegget",
   "filter_modal.title.status": "Filtrer eit innlegg",
-  "filter_warning.matches_filter": "Passar med filteret «<span>{title}</span>»",
+  "filter_warning.matches_filter": "Passar med filteret «{title}»",
   "filtered_notifications_banner.pending_requests": "Frå {count, plural, =0 {ingen} one {éin person} other {# personar}} du kanskje kjenner",
   "filtered_notifications_banner.title": "Filtrerte varslingar",
   "firehose.all": "Alle",

app/javascript/mastodon/locales/no.json

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

app/javascript/mastodon/locales/pa.json

@@ -4,7 +4,6 @@
   "about.domain_blocks.silenced.title": "ਸੀਮਿਤ",
   "about.domain_blocks.suspended.title": "ਮੁਅੱਤਲ ਕੀਤੀ",
   "about.rules": "ਸਰਵਰ ਨਿਯਮ",
-  "account.account_note_header": "ਨਿੱਜੀ ਨੋਟ",
   "account.add_or_remove_from_list": "ਸੂਚੀ ਵਿੱਚ ਜੋੜੋ ਜਾਂ ਹਟਾਓ",
   "account.badges.bot": "ਆਟੋਮੇਟ ਕੀਤਾ",
   "account.badges.group": "ਗਰੁੱਪ",
@@ -28,9 +27,7 @@
   "account.following": "ਫ਼ਾਲੋ ਕੀਤਾ",
   "account.follows.empty": "ਇਹ ਵਰਤੋਂਕਾਰ ਹਾਲੇ ਕਿਸੇ ਨੂੰ ਫ਼ਾਲੋ ਨਹੀਂ ਕਰਦਾ ਹੈ।",
   "account.go_to_profile": "ਪਰੋਫਾਇਲ ਉੱਤੇ ਜਾਓ",
-  "account.joined_short": "ਜੁਆਇਨ ਕੀਤਾ",
   "account.media": "ਮੀਡੀਆ",
-  "account.mention": "@{name} ਦਾ ਜ਼ਿਕਰ",
   "account.mute": "{name} ਨੂੰ ਮੌਨ ਕਰੋ",
   "account.mute_notifications_short": "ਨੋਟਫਿਕੇਸ਼ਨਾਂ ਨੂੰ ਮੌਨ ਕਰੋ",
   "account.mute_short": "ਮੌਨ ਕਰੋ",
@@ -47,22 +44,16 @@
   "account.unblock": "@{name} ਤੋਂ ਪਾਬੰਦੀ ਹਟਾਓ",
   "account.unblock_domain": "{domain} ਡੋਮੇਨ ਤੋਂ ਪਾਬੰਦੀ ਹਟਾਓ",
   "account.unblock_short": "ਪਾਬੰਦੀ ਹਟਾਓ",
-  "account.unendorse": "ਪਰੋਫਾਇਲ ਉੱਤੇ ਫ਼ੀਚਰ ਨਾ ਕਰੋ",
   "account.unfollow": "ਅਣ-ਫ਼ਾਲੋ",
-  "account.unmute": "@{name} ਲਈ ਮੌਨ ਹਟਾਓ",
-  "account.unmute_notifications_short": "ਨੋਟਫਿਕੇਸ਼ਨਾਂ ਨੂੰ ਅਣ-ਮੌਨ ਕਰੋ",
   "account.unmute_short": "ਮੌਨ-ਰਹਿਤ ਕਰੋ",
   "account_note.placeholder": "Click to add a note",
   "admin.dashboard.retention.average": "ਔਸਤ",
   "admin.dashboard.retention.cohort_size": "ਨਵੇਂ ਵਰਤੋਂਕਾਰ",
   "alert.unexpected.title": "ਓਹੋ!",
-  "alt_text_badge.title": "ਬਦਲੀ ਲਿਖਤ",
   "announcement.announcement": "ਹੋਕਾ",
-  "audio.hide": "ਆਡੀਓ ਨੂੰ ਲੁਕਾਓ",
   "block_modal.show_less": "ਘੱਟ ਦਿਖਾਓ",
   "block_modal.show_more": "ਵੱਧ ਦਿਖਾਓ",
   "block_modal.title": "ਵਰਤੋਂਕਾਰ ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਉਣੀ ਹੈ?",
-  "boost_modal.reblog": "ਪੋਸਟ ਨੂੰ ਬੂਸਟ ਕਰਨਾ ਹੈ?",
   "bundle_column_error.error.title": "ਓਹ ਹੋ!",
   "bundle_column_error.network.title": "ਨੈੱਟਵਰਕ ਦੀ ਸਮੱਸਿਆ",
   "bundle_column_error.retry": "ਮੁੜ-ਕੋਸ਼ਿਸ਼ ਕਰੋ",
@@ -71,26 +62,18 @@
   "bundle_modal_error.close": "ਬੰਦ ਕਰੋ",
   "bundle_modal_error.message": "ਭਾਗ ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਕੁਝ ਗਲਤ ਵਾਪਰਿਆ ਹੈ।",
   "bundle_modal_error.retry": "ਮੁੜ-ਕੋਸ਼ਿਸ਼ ਕਰੋ",
-  "closed_registrations_modal.title": "Mastodon ਲਈ ਸਾਈਨ ਅੱਪ ਕਰੋ",
   "column.about": "ਸਾਡੇ ਬਾਰੇ",
   "column.blocks": "ਪਾਬੰਦੀ ਲਾਏ ਵਰਤੋਂਕਾਰ",
   "column.bookmarks": "ਬੁੱਕਮਾਰਕ",
   "column.community": "ਲੋਕਲ ਸਮਾਂ-ਲਾਈਨ",
   "column.direct": "ਨਿੱਜੀ ਜ਼ਿਕਰ",
-  "column.directory": "ਪ੍ਰੋਫਾਈਲਾਂ ਨੂੰ ਦੇਖੋ",
-  "column.domain_blocks": "ਪਾਬੰਦੀ ਲਾਏ ਡੋਮੇਨ",
   "column.favourites": "ਮਨਪਸੰਦ",
-  "column.firehose": "ਲਾਈਵ ਫੀਡ",
   "column.follow_requests": "ਫ਼ਾਲੋ ਦੀਆਂ ਬੇਨਤੀਆਂ",
   "column.home": "ਮੁੱਖ ਸਫ਼ਾ",
   "column.lists": "ਸੂਚੀਆਂ",
-  "column.mutes": "ਮੌਨ ਕੀਤੇ ਵਰਤੋਂਕਾਰ",
   "column.notifications": "ਸੂਚਨਾਵਾਂ",
   "column.pins": "ਟੰਗੀਆਂ ਪੋਸਟਾਂ",
   "column_back_button.label": "ਪਿੱਛੇ",
-  "column_header.hide_settings": "ਸੈਟਿੰਗਾਂ ਨੂੰ ਲੁਕਾਓ",
-  "column_header.moveLeft_settings": "ਕਾਲਮ ਨੂੰ ਖੱਬੇ ਪਾਸੇ ਭੇਜੋ",
-  "column_header.moveRight_settings": "ਕਾਲਮ ਨੂੰ ਸੱਜੇ ਪਾਸੇ ਭੇਜੋ",
   "column_header.pin": "ਟੰਗੋ",
   "column_header.show_settings": "ਸੈਟਿੰਗਾਂ ਦਿਖਾਓ",
   "column_header.unpin": "ਲਾਹੋ",
@@ -100,19 +83,16 @@
   "community.column_settings.remote_only": "ਸਿਰਫ਼ ਰਿਮੋਟ ਹੀ",
   "compose.language.change": "ਭਾਸ਼ਾ ਬਦਲੋ",
   "compose.language.search": "ਭਾਸ਼ਾਵਾਂ ਦੀ ਖੋਜ...",
-  "compose.published.body": "ਪੋਸਟ ਪ੍ਰਕਾਸ਼ਿਤ ਕੀਤੀ।",
   "compose.published.open": "ਖੋਲ੍ਹੋ",
   "compose.saved.body": "ਪੋਸਟ ਸੰਭਾਲੀ ਗਈ।",
   "compose_form.direct_message_warning_learn_more": "ਹੋਰ ਜਾਣੋ",
   "compose_form.encryption_warning": "Posts on Mastodon are not end-to-end encrypted. Do not share any dangerous information over Mastodon.",
   "compose_form.hashtag_warning": "This post won't be listed under any hashtag as it is unlisted. Only public posts can be searched by hashtag.",
-  "compose_form.lock_disclaimer": "ਤੁਹਾਡਾ ਖਾਤਾ {locked} ਨਹੀਂ ਹੈ। ਕੋਈ ਵੀ ਤੁਹਾਡੀਆਂ ਸਿਰਫ਼-ਫ਼ਾਲੋਅਰ ਪੋਸਟਾਂ ਵੇਖਣ ਵਾਸਤੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕਰ ਸਕਦਾ ਹੈ।",
   "compose_form.lock_disclaimer.lock": "ਲਾਕ ਹੈ",
-  "compose_form.placeholder": "ਤੁਹਾਡੇ ਮਨ ਵਿੱਚ ਕੀ ਹੈ?",
-  "compose_form.poll.option_placeholder": "{number} ਚੋਣ",
+  "compose_form.placeholder": "What is on your mind?",
   "compose_form.poll.type": "ਸਟਾਈਲ",
   "compose_form.publish": "ਪੋਸਟ",
-  "compose_form.publish_form": "ਨਵੀਂ ਪੋਸਟ",
+  "compose_form.publish_form": "Publish",
   "compose_form.reply": "ਜਵਾਬ ਦਿਓ",
   "compose_form.save_changes": "ਅੱਪਡੇਟ",
   "compose_form.spoiler.marked": "ਸਮੱਗਰੀ ਚੇਤਾਵਨੀ ਨੂੰ ਹਟਾਓ",
@@ -122,49 +102,20 @@
   "confirmations.block.confirm": "ਪਾਬੰਦੀ",
   "confirmations.delete.confirm": "ਹਟਾਓ",
   "confirmations.delete.message": "ਕੀ ਤੁਸੀਂ ਇਹ ਪੋਸਟ ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?",
-  "confirmations.delete.title": "ਪੋਸਟ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?",
   "confirmations.delete_list.confirm": "ਹਟਾਓ",
-  "confirmations.delete_list.message": "ਕੀ ਤੁਸੀਂ ਇਸ ਸੂਚੀ ਨੂੰ ਪੱਕੇ ਤੌਰ ਉੱਤੇ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?",
-  "confirmations.delete_list.title": "ਸੂਚੀ ਨੂੰ ਹਟਾਉਣਾ ਹੈ?",
   "confirmations.discard_edit_media.confirm": "ਰੱਦ ਕਰੋ",
   "confirmations.edit.confirm": "ਸੋਧ",
   "confirmations.logout.confirm": "ਬਾਹਰ ਹੋਵੋ",
-  "confirmations.logout.message": "ਕੀ ਤੁਸੀਂ ਲਾਗ ਆਉਟ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?",
-  "confirmations.logout.title": "ਲਾਗ ਆਉਟ ਕਰਨਾ ਹੈ?",
   "confirmations.mute.confirm": "ਮੌਨ ਕਰੋ",
-  "confirmations.redraft.confirm": "ਹਟਾਓ ਤੇ ਮੁੜ-ਡਰਾਫਟ",
   "confirmations.reply.confirm": "ਜਵਾਬ ਦੇਵੋ",
   "confirmations.unfollow.confirm": "ਅਣ-ਫ਼ਾਲੋ",
-  "confirmations.unfollow.message": "ਕੀ ਤੁਸੀਂ {name} ਨੂੰ ਅਣ-ਫ਼ਾਲੋ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?",
-  "confirmations.unfollow.title": "ਵਰਤੋਂਕਾਰ ਨੂੰ ਅਣ-ਫ਼ਾਲੋ ਕਰਨਾ ਹੈ?",
-  "content_warning.hide": "ਪੋਸਟ ਨੂੰ ਲੁਕਾਓ",
-  "content_warning.show": "ਕਿਵੇਂ ਵੀ ਵੇਖਾਓ",
-  "content_warning.show_more": "ਹੋਰ ਵੇਖਾਓ",
-  "conversation.delete": "ਗੱਲਬਾਤ ਨੂੰ ਹਟਾਓ",
-  "conversation.mark_as_read": "ਪੜ੍ਹੇ ਵਜੋਂ ਨਿਸ਼ਾਨੀ ਲਾਓ",
-  "conversation.open": "ਗੱਲਬਾਤ ਨੂੰ ਵੇਖੋ",
-  "conversation.with": "{names} ਨਾਲ",
-  "copy_icon_button.copied": "ਕਲਿੱਪਬੋਰਡ 'ਤੇ ਕਾਪੀ ਕਰੋ",
   "copypaste.copied": "ਕਾਪੀ ਕੀਤਾ",
   "copypaste.copy_to_clipboard": "ਕਲਿੱਪਬੋਰਡ 'ਤੇ ਕਾਪੀ ਕਰੋ",
-  "directory.local": "ਸਿਰਫ਼ {domain} ਤੋਂ",
-  "directory.new_arrivals": "ਨਵੇਂ ਆਉਣ ਵਾਲੇ",
-  "directory.recently_active": "ਸੱਜਰੇ ਸਰਗਰਮ",
   "disabled_account_banner.account_settings": "ਖਾਤੇ ਦੀਆਂ ਸੈਟਿੰਗਾਂ",
-  "disabled_account_banner.text": "ਤੁਹਾਡਾ ਖਾਤਾ {disabledAccount} ਇਸ ਵੇਲੇ ਅਸਮਰੱਥ ਕੀਤਾ ਹੈ।",
   "dismissable_banner.dismiss": "ਰੱਦ ਕਰੋ",
   "dismissable_banner.explore_links": "These news stories are being talked about by people on this and other servers of the decentralized network right now.",
   "dismissable_banner.explore_tags": "These hashtags are gaining traction among people on this and other servers of the decentralized network right now.",
-  "domain_block_modal.block": "ਸਰਵਰ ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਓ",
-  "domain_block_modal.block_account_instead": "ਇਸ ਦੀ ਬਜਾਏ @{name} ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਓ",
-  "domain_block_modal.title": "ਡੋਮੇਨ ਉੱਤੇ ਪਾਬੰਦੀ ਲਾਉਣੀ ਹੈ?",
-  "domain_pill.server": "ਸਰਵਰ",
-  "domain_pill.their_handle": "ਇਹ ਹੈਂਡਲ:",
-  "domain_pill.their_server": "ਉਹਨਾਂ ਦਾ ਡਿਜ਼ਿਟਲ ਘਰ, ਜਿੱਥੇ ਉਹਨਾਂ ਦੀਆਂ ਸਾਰੀਆਂ ਪੋਸਟਾਂ ਹੁੰਦੀਆਂ ਹਨ।",
-  "domain_pill.username": "ਵਰਤੋਂਕਾਰ-ਨਾਂ",
-  "domain_pill.whats_in_a_handle": "ਹੈਂਡਲ ਕੀ ਹੁੰਦਾ ਹੈ?",
-  "domain_pill.your_handle": "ਤੁਹਾਡਾ ਹੈਂਡਲ:",
-  "embed.instructions": "ਹੇਠਲੇ ਕੋਡ ਨੂੰ ਕਾਪੀ ਕਰਕੇ ਆਪਣੀ ਵੈੱਬਸਾਈਟ ਉੱਤੇ ਇਸ ਪੋਸਟ ਨੂੰ ਇੰਬੈੱਡ ਕਰੋ।",
+  "embed.instructions": "Embed this status on your website by copying the code below.",
   "emoji_button.activity": "ਗਤੀਵਿਧੀ",
   "emoji_button.clear": "ਮਿਟਾਓ",
   "emoji_button.custom": "ਕਸਟਮ",
@@ -173,43 +124,27 @@
   "emoji_button.nature": "ਕੁਦਰਤ",
   "emoji_button.objects": "ਇਕਾਈ",
   "emoji_button.people": "ਲੋਕ",
-  "emoji_button.recent": "ਅਕਸਰ ਵਰਤੇ",
   "emoji_button.search": "ਖੋਜ ਕਰੋ...",
   "emoji_button.search_results": "ਖੋਜ ਨਤੀਜੇ",
   "emoji_button.symbols": "ਚਿੰਨ੍ਹ",
   "emoji_button.travel": "ਸੈਰ ਸਪਾਟਾ ਤੇ ਥਾਵਾਂ",
-  "empty_column.account_suspended": "ਖਾਤਾ ਸਸਪੈਂਡ ਕੀਤਾ",
   "empty_column.account_timeline": "ਇੱਥੇ ਕੋਈ ਪੋਸਟ ਨਹੀਂ ਹੈ!",
-  "empty_column.account_unavailable": "ਪ੍ਰੋਫਾਈਲ ਅਣ-ਉਪਲਬਧ ਹੈ",
-  "empty_column.blocks": "ਤੁਸੀਂ ਹਾਲੇ ਕਿਸੇ ਵਰਤੋਂਕਾਰ ਉੱਤੇ ਪਾਬੰਦੀ ਨਹੀਂ ਲਾਈ ਹੈ।",
-  "empty_column.bookmarked_statuses": "ਤੁਸੀਂ ਹਾਲੇ ਕਿਸੇ ਵੀ ਪੋਸਟ ਨੂੰ ਬੁੱਕਮਾਰਕ ਨਹੀਂ ਕੀਤਾ ਹੈ। ਜਦੋਂ ਤੁਸੀਂ ਬੁੱਕਮਾਰਕ ਕੀਤਾ ਤਾਂ ਉਹ ਇੱਥੇ ਦਿਖਾਈ ਦਾਵੇਗਾ।",
+  "empty_column.bookmarked_statuses": "You don't have any bookmarked toots yet. When you bookmark one, it will show up here.",
   "empty_column.home": "ਤੁਹਾਡੀ ਟਾਈਮ-ਲਾਈਨ ਖਾਲੀ ਹੈ! ਇਸ ਨੂੰ ਭਰਨ ਲਈ ਹੋਰ ਲੋਕਾਂ ਨੂੰ ਫ਼ਾਲੋ ਕਰੋ।",
-  "empty_column.list": "ਇਸ ਸੂਚੀ ਵਿੱਚ ਹਾਲੇ ਕੁਝ ਵੀ ਨਹੀਂ ਹੈ। ਜਦੋਂ ਇਸ ਸੂਚੀ ਦੇ ਮੈਂਬਰ ਨਵੀਆਂ ਪੋਸਟਾਂ ਪਾਉਂਦੇ ਹਨ ਤਾਂ ਉਹ ਇੱਥੇ ਦਿਖਾਈ ਦੇਣਗੀਆਂ।",
+  "empty_column.list": "There is nothing in this list yet. When members of this list post new statuses, they will appear here.",
   "errors.unexpected_crash.report_issue": "ਮੁੱਦੇ ਦੀ ਰਿਪੋਰਟ ਕਰੋ",
-  "explore.search_results": "ਖੋਜ ਦੇ ਨਤੀਜੇ",
   "explore.suggested_follows": "ਲੋਕ",
   "explore.title": "ਪੜਚੋਲ ਕਰੋ",
   "explore.trending_links": "ਖ਼ਬਰਾਂ",
   "explore.trending_statuses": "ਪੋਸਟਾਂ",
   "explore.trending_tags": "ਹੈਸ਼ਟੈਗ",
-  "filter_modal.added.expired_title": "ਫਿਲਟਰ ਦੀ ਮਿਆਦ ਪੁੱਗੀ!",
-  "filter_modal.added.review_and_configure_title": "ਫਿਲਟਰ ਸੈਟਿੰਗਾਂ",
   "filter_modal.added.settings_link": "ਸੈਟਿੰਗਾਂ ਸਫ਼ਾ",
-  "filter_modal.added.title": "ਫਿਲਟਰ ਨੂੰ ਜੋੜਿਆ!",
-  "filter_modal.select_filter.expired": "ਮਿਆਦ ਪੁੱਗੀ",
-  "filter_modal.select_filter.prompt_new": "ਨਵੀਂ ਕੈਟਾਗਰੀ: {name}",
-  "filter_modal.select_filter.search": "ਖੋਜੋ ਜਾਂ ਬਣਾਓ",
   "firehose.all": "ਸਭ",
   "firehose.local": "ਇਹ ਸਰਵਰ",
   "firehose.remote": "ਹੋਰ ਸਰਵਰ",
   "follow_request.reject": "ਰੱਦ ਕਰੋ",
   "follow_suggestions.dismiss": "ਮੁੜ ਨਾ ਵੇਖਾਓ",
-  "follow_suggestions.personalized_suggestion": "ਨਿੱਜੀ ਸੁਝਾਅ",
-  "follow_suggestions.popular_suggestion": "ਹਰਮਨਪਿਆਰੇ ਸੁਝਾਅ",
-  "follow_suggestions.popular_suggestion_longer": "{domain} ਉੱਤੇ ਹਰਮਨਪਿਆਰੇ",
   "follow_suggestions.view_all": "ਸਭ ਵੇਖੋ",
-  "follow_suggestions.who_to_follow": "ਕਿਸ ਨੂੰ ਫ਼ਾਲੋ ਕਰੀਏ",
-  "followed_tags": "ਫ਼ਾਲੋ ਕੀਤੇ ਹੈਸ਼ਟੈਗ",
   "footer.about": "ਸਾਡੇ ਬਾਰੇ",
   "footer.directory": "ਪਰੋਫਾਇਲ ਡਾਇਰੈਕਟਰੀ",
   "footer.get_app": "ਐਪ ਲਵੋ",
@@ -224,82 +159,55 @@
   "hashtag.column_header.tag_mode.any": "ਜਾਂ {additional}",
   "hashtag.column_header.tag_mode.none": "{additional} ਬਿਨਾਂ",
   "hashtag.column_settings.select.no_options_message": "ਕੋਈ ਸੁਝਾਅ ਨਹੀਂ ਲੱਭਾ",
-  "hashtag.column_settings.select.placeholder": "ਹੈਸ਼ਟੈਗ ਦਿਓ…",
-  "hashtag.column_settings.tag_mode.all": "ਇਹ ਸਭ",
   "hashtag.column_settings.tag_mode.any": "ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ",
   "hashtag.column_settings.tag_mode.none": "ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ ਨਹੀਂ",
   "hashtag.column_settings.tag_toggle": "Include additional tags in this column",
   "hashtag.follow": "ਹੈਸ਼ਟੈਗ ਨੂੰ ਫ਼ਾਲੋ ਕਰੋ",
   "hashtag.unfollow": "ਹੈਸ਼ਟੈਗ ਨੂੰ ਅਣ-ਫ਼ਾਲੋ ਕਰੋ",
-  "hints.profiles.see_more_followers": "{domain} ਉੱਤੇ ਹੋਰ ਫ਼ਾਲੋਅਰ ਵੇਖੋ",
-  "hints.profiles.see_more_follows": "{domain} ਉੱਤੇ ਹੋਰ ਫ਼ਾਲੋ ਨੂੰ ਵੇਖੋ",
-  "hints.profiles.see_more_posts": "{domain} ਉੱਤੇ ਹੋਰ ਪੋਸਟਾਂ ਨੂੰ ਵੇਖੋ",
-  "home.column_settings.show_reblogs": "ਬੂਸਟਾਂ ਨੂੰ ਵੇਖੋ",
-  "home.column_settings.show_replies": "ਜਵਾਬਾਂ ਨੂੰ ਵੇਖੋ",
-  "home.hide_announcements": "ਐਲਾਨਾਂ ਨੂੰ ਓਹਲੇ ਕਰੋ",
   "home.pending_critical_update.link": "ਅੱਪਡੇਟ ਵੇਖੋ",
-  "ignore_notifications_modal.ignore": "ਨੋਟਫਿਕੇਸ਼ਨਾਂ ਨੂੰ ਅਣਡਿੱਠਾ ਕਰੋ",
-  "interaction_modal.login.action": "ਮੈਨੂੰ ਮੁੱਖ ਸਫ਼ੇ ਉੱਤੇ ਲੈ ਜਾਓ",
-  "interaction_modal.no_account_yet": "Mastodon ਉੱਤੇ ਨਹੀਂ ਹੋ?",
-  "interaction_modal.on_another_server": "ਵੱਖਰੇ ਸਰਵਰ ਉੱਤੇ",
-  "interaction_modal.on_this_server": "ਇਸ ਸਰਵਰ ਉੱਤੇ",
-  "interaction_modal.title.favourite": "{name} ਦੀ ਪੋਸਟ ਨੂੰ ਪਸੰਦ ਕਰੋ",
   "interaction_modal.title.follow": "{name} ਨੂੰ ਫ਼ਾਲੋ ਕਰੋ",
-  "interaction_modal.title.reblog": "{name} ਦੀ ਪੋਸਟ ਨੂੰ ਬੂਸਟ ਕਰੋ",
-  "interaction_modal.title.reply": "{name} ਦੀ ਪੋਸਟ ਦਾ ਜਵਾਬ ਦਿਓ",
-  "intervals.full.days": "{number, plural, one {# ਦਿਨ} other {# ਦਿਨ}}",
-  "intervals.full.hours": "{number, plural, one {# ਘੰਟਾ} other {# ਘੰਟੇ}}",
-  "intervals.full.minutes": "{number, plural, one {# ਮਿੰਟ} other {# ਮਿੰਟ}}",
   "keyboard_shortcuts.back": "ਪਿੱਛੇ ਜਾਓ",
   "keyboard_shortcuts.blocked": "ਪਾਬੰਦੀ ਲਾਏ ਵਰਤੋਂਕਾਰਾਂ ਦੀ ਸੂਚੀ ਖੋਲ੍ਹੋ",
   "keyboard_shortcuts.boost": "ਪੋਸਟ ਨੂੰ ਬੂਸਟ ਕਰੋ",
   "keyboard_shortcuts.column": "ਫੋਕਸ ਕਾਲਮ",
   "keyboard_shortcuts.compose": "to focus the compose textarea",
   "keyboard_shortcuts.description": "ਵਰਣਨ",
-  "keyboard_shortcuts.direct": "ਪ੍ਰਾਈਵੇਟ ਜ਼ਿਕਰ ਕੀਤੇ ਕਾਲਮ ਨੂੰ ਖੋਲ੍ਹਣ ਲਈ",
-  "keyboard_shortcuts.down": "ਸੂਚੀ ਵਿੱਚ ਹੇਠਾਂ ਭੇਜੋ",
-  "keyboard_shortcuts.enter": "ਪੋਸਟ ਨੂੰ ਖੋਲ੍ਹੋ",
-  "keyboard_shortcuts.favourite": "ਪੋਸਟ ਨੂੰ ਪਸੰਦ ਕਰੋ",
-  "keyboard_shortcuts.federated": "",
+  "keyboard_shortcuts.direct": "to open direct messages column",
+  "keyboard_shortcuts.down": "to move down in the list",
+  "keyboard_shortcuts.enter": "to open status",
+  "keyboard_shortcuts.federated": "to open federated timeline",
   "keyboard_shortcuts.heading": "ਕੀਬੋਰਡ ਸ਼ਾਰਟਕੱਟ",
-  "keyboard_shortcuts.home": "ਮੁੱਖ-ਸਫ਼ਾ ਟਾਈਮ-ਲਾਈਨ ਨੂੰ ਖੋਲ੍ਹੋ",
-  "keyboard_shortcuts.legend": "ਇਸ ਸੰਕੇਤ ਨੂੰ ਵੇਖਾਓ",
-  "keyboard_shortcuts.local": "ਲੋਕਲ ਸਮਾਂ-ਲਾਈਨ ਨੂੰ ਖੋਲ੍ਹੋ",
-  "keyboard_shortcuts.mention": "ਲੇਖਕ ਦਾ ਜ਼ਿਕਰ",
-  "keyboard_shortcuts.muted": "ਮੌਨ ਕੀਤੇ ਵਰਤੋਂਕਾਰ ਦੀ ਸੂਚੀ ਨੂੰ ਖੋਲ੍ਹੋ",
-  "keyboard_shortcuts.my_profile": "ਆਪਣੇ ਪਰੋਫਾਈਲ ਨੂੰ ਖੋਲ੍ਹੋ",
+  "keyboard_shortcuts.home": "to open home timeline",
+  "keyboard_shortcuts.legend": "to display this legend",
+  "keyboard_shortcuts.local": "to open local timeline",
+  "keyboard_shortcuts.mention": "to mention author",
+  "keyboard_shortcuts.muted": "to open muted users list",
+  "keyboard_shortcuts.my_profile": "to open your profile",
   "keyboard_shortcuts.notifications": "ਨੋਟੀਫਿਕੇਸ਼ਨ ਕਾਲਮ ਖੋਲ੍ਹੋ",
-  "keyboard_shortcuts.open_media": "ਮੀਡੀਏ ਨੂੰ ਖੋਲ੍ਹੋ",
-  "keyboard_shortcuts.pinned": "ਪਿੰਨ ਕੀਤੀਆਂ ਪੋਸਟਾਂ ਦੀ ਸੂਚੀ ਨੂੰ ਖੋਲ੍ਹੋ",
+  "keyboard_shortcuts.open_media": "to open media",
+  "keyboard_shortcuts.pinned": "to open pinned toots list",
   "keyboard_shortcuts.profile": "ਲੇਖਕ ਦਾ ਪਰੋਫਾਈਲ ਖੋਲ੍ਹੋ",
   "keyboard_shortcuts.reply": "ਪੋਸਟ ਨੂੰ ਜਵਾਬ ਦਿਓ",
-  "keyboard_shortcuts.requests": "ਫ਼ਾਲੋ ਦੀਆਂ ਬੇਨਤੀਆਂ ਦੀ ਸੂਚੀ ਨੂੰ ਖੋਲ੍ਹੋ",
-  "keyboard_shortcuts.search": "ਖੋਜ ਪੱਟੀ ਨੂੰ ਫੋਕਸ ਕਰੋ",
-  "keyboard_shortcuts.spoilers": "CW ਖੇਤਰ ਨੂੰ ਵੇਖਾਓ/ਓਹਲੇ ਕਰੋ",
+  "keyboard_shortcuts.requests": "to open follow requests list",
+  "keyboard_shortcuts.search": "to focus search",
+  "keyboard_shortcuts.spoilers": "to show/hide CW field",
   "keyboard_shortcuts.start": "to open \"get started\" column",
   "keyboard_shortcuts.toggle_hidden": "to show/hide text behind CW",
   "keyboard_shortcuts.toggle_sensitivity": "ਮੀਡੀਆ ਦਿਖਾਉਣ/ਲੁਕਾਉਣ ਲਈ",
   "keyboard_shortcuts.toot": "ਨਵੀਂ ਪੋਸਟ ਸ਼ੁਰੂ ਕਰੋ",
   "keyboard_shortcuts.unfocus": "to un-focus compose textarea/search",
-  "keyboard_shortcuts.up": "ਸੂਚੀ ਵਿੱਚ ਉੱਤੇ ਭੇਜੋ",
+  "keyboard_shortcuts.up": "to move up in the list",
   "lightbox.close": "ਬੰਦ ਕਰੋ",
   "lightbox.next": "ਅਗਲੀ",
   "lightbox.previous": "ਪਿਛਲੀ",
   "link_preview.author": "{name} ਵਲੋਂ",
-  "link_preview.more_from_author": "{name} ਵਲੋਂ ਹੋਰ",
-  "link_preview.shares": "{count, plural, one {{counter} ਪੋਸਟ} other {{counter} ਪੋਸਟਾਂ}}",
   "lists.account.add": "ਸੂਚੀ ਵਿੱਚ ਜੋੜੋ",
   "lists.account.remove": "ਸੂਚੀ ਵਿਚੋਂ ਹਟਾਓ",
   "lists.delete": "ਸੂਚੀ ਹਟਾਓ",
-  "lists.edit": "ਸੂਚੀ ਨੂੰ ਸੋਧੋ",
   "lists.replies_policy.followed": "ਕੋਈ ਵੀ ਫ਼ਾਲੋ ਕੀਤਾ ਵਰਤੋਂਕਾਰ",
-  "lists.replies_policy.list": "ਸੂਚੀ ਦੇ ਮੈਂਬਰ",
   "lists.replies_policy.none": "ਕੋਈ ਨਹੀਂ",
   "loading_indicator.label": "ਲੋਡ ਹੋ ਰਿਹਾ ਹੈ…",
-  "media_gallery.hide": "ਲੁਕਾਓ",
-  "mute_modal.show_options": "ਚੋਣਾਂ ਨੂੰ ਵੇਖਾਓ",
   "navigation_bar.about": "ਇਸ ਬਾਰੇ",
-  "navigation_bar.administration": "ਪਰਸ਼ਾਸ਼ਨ",
   "navigation_bar.advanced_interface": "ਤਕਨੀਕੀ ਵੈੱਬ ਇੰਟਰਫੇਸ ਵਿੱਚ ਖੋਲ੍ਹੋ",
   "navigation_bar.blocks": "ਪਾਬੰਦੀ ਲਾਏ ਵਰਤੋਂਕਾਰ",
   "navigation_bar.bookmarks": "ਬੁੱਕਮਾਰਕ",
@@ -323,57 +231,20 @@
   "navigation_bar.search": "ਖੋਜੋ",
   "navigation_bar.security": "ਸੁਰੱਖਿਆ",
   "not_signed_in_indicator.not_signed_in": "ਇਹ ਸਰੋਤ ਵਰਤਣ ਲਈ ਤੁਹਾਨੂੰ ਲਾਗਇਨ ਕਰਨ ਦੀ ਲੋੜ ਹੈ।",
-  "notification.admin.sign_up": "{name} ਨੇ ਸਾਈਨ ਅੱਪ ਕੀਤਾ",
   "notification.follow": "{name} ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕੀਤਾ",
-  "notification.follow.name_and_others": "{name} ਅਤੇ <a>{count, plural, one {# ਹੋਰ} other {# ਹੋਰਾਂ}}</a> ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕੀਤਾ",
   "notification.follow_request": "{name} ਨੇ ਤੁਹਾਨੂੰ ਫ਼ਾਲੋ ਕਰਨ ਦੀ ਬੇਨਤੀ ਕੀਤੀ ਹੈ",
-  "notification.label.mention": "ਜ਼ਿਕਰ",
-  "notification.label.private_mention": "ਨਿੱਜੀ ਜ਼ਿਕਰ",
-  "notification.label.private_reply": "ਪ੍ਰਾਈਵੇਟ ਜਵਾਬ",
-  "notification.label.reply": "ਜਵਾਬ",
-  "notification.mention": "ਜ਼ਿਕਰ",
-  "notification.mentioned_you": "{name} ਨੇ ਤੁਹਾਡਾ ਜ਼ਿਕਰ ਕੀਤਾ",
-  "notification.moderation-warning.learn_more": "ਹੋਰ ਜਾਣੋ",
-  "notification.moderation_warning.action_disable": "ਤੁਹਾਡੇ ਖਾਤੇ ਨੂੰਅਸਮਰੱਥ ਕੀਤਾ ਹੈ।",
   "notification.reblog": "{name} boosted your status",
-  "notification.relationships_severance_event.learn_more": "ਹੋਰ ਜਾਣੋ",
-  "notification.status": "{name} ਨੇ ਹੁਣੇ ਪੋਸਟ ਕੀਤਾ",
-  "notification.update": "{name} ਨੋ ਪੋਸਟ ਨੂੰ ਸੋਧਿਆ",
-  "notification_requests.accept": "ਮਨਜ਼ੂਰ",
-  "notification_requests.confirm_accept_multiple.title": "ਨੋਟੀਫਿਕੇਸ਼ਨ ਬੇਨਤੀਆਂ ਨੂੰ ਮਨਜ਼ੂਰ ਕਰਨਾ ਹੈ?",
-  "notification_requests.confirm_dismiss_multiple.title": "ਨੋਟੀਫਿਕੇਸ਼ਨ ਬੇਨਤੀਆਂ ਨੂੰ ਖ਼ਾਰਜ ਕਰਨਾ ਹੈ?",
-  "notification_requests.dismiss": "ਖ਼ਾਰਜ ਕਰੋ",
-  "notification_requests.edit_selection": "ਸੋਧੋ",
-  "notification_requests.exit_selection": "ਮੁਕੰਮਲ",
-  "notification_requests.notifications_from": "{name} ਵਲੋਂ ਨੋਟੀਫਿਕੇਸ਼ਨ",
-  "notifications.clear_title": "ਨੋਟਫਿਕੇਸ਼ਨਾਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?",
-  "notifications.column_settings.admin.report": "ਨਵੀਆਂ ਰਿਪੋਰਟਾਂ:",
   "notifications.column_settings.alert": "ਡੈਸਕਟਾਪ ਸੂਚਨਾਵਾਂ",
   "notifications.column_settings.favourite": "ਮਨਪਸੰਦ:",
-  "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.reblog": "ਬੂਸਟ:",
-  "notifications.column_settings.show": "ਕਾਲਮ ਵਿੱਚ ਵੇਖਾਓ",
-  "notifications.column_settings.sound": "ਆਵਾਜ਼ ਚਲਾਓ",
   "notifications.column_settings.status": "ਨਵੀਆਂ ਪੋਸਟਾਂ:",
-  "notifications.column_settings.unread_notifications.category": "ਨਾ-ਪੜ੍ਹੇ ਨੋਟੀਫਿਕੇਸ਼ਨ",
-  "notifications.column_settings.unread_notifications.highlight": "ਨਾ-ਪੜ੍ਹੇ ਨੋਟੀਫਿਕੇਸ਼ਨਾਂ ਨੂੰ ਉਘਾੜੋ",
   "notifications.column_settings.update": "ਸੋਧ:",
   "notifications.filter.all": "ਸਭ",
   "notifications.filter.boosts": "ਬੂਸਟ",
   "notifications.filter.favourites": "ਮਨਪਸੰਦ",
   "notifications.filter.follows": "ਫ਼ਾਲੋ",
   "notifications.filter.mentions": "ਜ਼ਿਕਰ",
-  "notifications.filter.polls": "ਪੋਲ ਦੇ ਨਤੀਜੇ",
-  "notifications.grant_permission": "ਇਜਾਜ਼ਤ ਦਿਓ।",
-  "notifications.group": "{count} ਨੋਟੀਫਿਕੇਸ਼ਨ",
-  "notifications.policy.accept": "ਮਨਜ਼ੂਰ",
-  "notifications.policy.accept_hint": "ਨੋਟੀਫਿਕੇਸ਼ਨਾਂ ਵਿੱਚ ਵੇਖਾਓ",
-  "notifications.policy.drop": "ਅਣਡਿੱਠਾ",
   "onboarding.actions.go_to_explore": "ਮੈਨੂੰ ਰੁਝਾਨ ਵੇਖਾਓ",
   "onboarding.actions.go_to_home": "ਮੇਰੀ ਮੁੱਖ ਫੀਡ ਉੱਤੇ ਲੈ ਜਾਓ",
   "onboarding.follows.lead": "",
@@ -396,23 +267,13 @@
   "onboarding.steps.share_profile.title": "ਆਪਣੇ ਮਸਟਾਡੋਨ ਪਰੋਫਾਈਲ ਨੂੰ ਸਾਂਝਾ ਕਰੋ",
   "poll.closed": "ਬੰਦ ਹੈ",
   "poll.refresh": "ਤਾਜ਼ਾ ਕਰੋ",
-  "poll.reveal": "ਨਤੀਜਿਆਂ ਨੂੰ ਵੇਖੋ",
   "poll.vote": "ਵੋਟ ਪਾਓ",
-  "poll.voted": "ਤੁਸੀਂ ਇਸ ਜਵਾਬ ਲਈ ਵੋਟ ਕੀਤਾ",
   "privacy.change": "ਪੋਸਟ ਦੀ ਪਰਦੇਦਾਰੀ ਨੂੰ ਬਦਲੋ",
-  "privacy.private.short": "ਫ਼ਾਲੋਅਰ",
   "privacy.public.short": "ਜਨਤਕ",
   "privacy_policy.title": "ਪਰਦੇਦਾਰੀ ਨੀਤੀ",
-  "recommended": "ਸਿਫ਼ਾਰਸ਼ੀ",
   "refresh": "ਤਾਜ਼ਾ ਕਰੋ",
   "regeneration_indicator.label": "ਲੋਡ ਹੋ ਰਿਹਾ ਹੈ...",
-  "relative_time.days": "{number}ਦਿਨ",
-  "relative_time.full.days": "{number, plural, one {# ਦਿਨ} other {# ਦਿਨ}} ਪਹਿਲਾਂ",
-  "relative_time.full.hours": "{number, plural, one {# ਘੰਟਾ} other {# ਘੰਟੇ}} ਪਹਿਲਾਂ",
   "relative_time.full.just_now": "ਹੁਣੇ ਹੀ",
-  "relative_time.full.minutes": "{number, plural, one {# ਮਿੰਟ} other {# ਮਿੰਟ}} ਪਹਿਲਾਂ",
-  "relative_time.full.seconds": "{number, plural, one {# ਸਕਿੰਟ} other {# ਸਕਿੰਟ}} ਪਹਿਲਾਂ",
-  "relative_time.hours": "{number}ਘੰ",
   "relative_time.just_now": "ਹੁਣੇ",
   "relative_time.minutes": "{number}ਮਿੰ",
   "relative_time.seconds": "{number}ਸ",
@@ -436,19 +297,11 @@
   "report_notification.attached_statuses": "{count, plural, one {# post} other {# posts}} attached",
   "report_notification.categories.legal": "ਕਨੂੰਨੀ",
   "report_notification.categories.other": "ਬਾਕੀ",
-  "report_notification.categories.other_sentence": "ਹੋਰ",
   "report_notification.categories.spam": "ਸਪੈਮ",
-  "report_notification.categories.spam_sentence": "ਸਪੈਮ",
   "report_notification.categories.violation": "ਨਿਯਮ ਦੀ ਉਲੰਘਣਾ",
-  "report_notification.categories.violation_sentence": "ਨਿਯਮ ਦੀ ਉਲੰਘਣਾ",
   "report_notification.open": "ਰਿਪੋਰਟ ਨੂੰ ਖੋਲ੍ਹੋ",
   "search.placeholder": "ਖੋਜੋ",
-  "search.quick_action.go_to_account": "ਪਰੋਫਾਈਲ {x} ਉੱਤੇ ਜਾਓ",
-  "search.quick_action.go_to_hashtag": "ਹੈਸ਼ਟੈਗ {x} ਉੱਤੇ ਜਾਓ",
-  "search_popout.language_code": "ISO ਭਾਸ਼ਾ ਕੋਡ",
-  "search_popout.options": "ਖੋਜ ਲਈ ਚੋਣਾਂ",
   "search_popout.quick_actions": "ਫੌਰੀ ਕਾਰਵਾਈਆਂ",
-  "search_popout.recent": "ਸੱਜਰੀਆਂ ਖੋਜੋ",
   "search_popout.specific_date": "ਖਾਸ ਤਾਰੀਖ",
   "search_popout.user": "ਵਰਤੋਂਕਾਰ",
   "search_results.accounts": "ਪਰੋਫਾਈਲ",
@@ -457,7 +310,6 @@
   "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": "ਲਾਗਇਨ",
   "sign_in_banner.sso_redirect": "ਲਾਗਇਨ ਜਾਂ ਰਜਿਸਟਰ ਕਰੋ",
@@ -466,10 +318,7 @@
   "status.bookmark": "ਬੁੱਕਮਾਰਕ",
   "status.copy": "ਪੋਸਟ ਲਈ ਲਿੰਕ ਕਾਪੀ ਕਰੋ",
   "status.delete": "ਹਟਾਓ",
-  "status.direct": "{name} ਪ੍ਰਾਈਵੇਟ ਜ਼ਿਕਰ",
-  "status.direct_indicator": "ਪ੍ਰਾਈਵੇਟ ਜ਼ਿਕਰ",
   "status.edit": "ਸੋਧ",
-  "status.edited": "ਆਖਰੀ ਸੋਧ ਦੀ ਤਾਰੀਖ {date}",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.favourite": "ਪਸੰਦ",
   "status.history.created": "{name} ਨੇ {date} ਨੂੰ ਬਣਾਇਆ",
@@ -493,12 +342,10 @@
   "status.share": "ਸਾਂਝਾ ਕਰੋ",
   "status.title.with_attachments": "{user} ਨੇ {attachmentCount, plural,one {ਅਟੈਚਮੈਂਟ} other {{attachmentCount}ਅਟੈਚਮੈਂਟਾਂ}} ਪੋਸਟ ਕੀਤੀਆਂ",
   "status.translate": "ਉਲੱਥਾ ਕਰੋ",
-  "status.unpin": "ਪਰੋਫਾਈਲ ਤੋਂ ਲਾਹੋ",
   "subscribed_languages.save": "ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੋ",
   "tabs_bar.home": "ਘਰ",
   "tabs_bar.notifications": "ਸੂਚਨਾਵਾਂ",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
-  "trends.trending_now": "ਹੁਣ ਰੁਝਾਨ ਵਿੱਚ",
   "units.short.billion": "{count}ਿਬ",
   "units.short.million": "{count}ਮਿ",
   "units.short.thousand": "{count}ਹਜ਼ਾਰ",
@@ -512,13 +359,8 @@
   "upload_modal.edit_media": "ਮੀਡੀਆ ਸੋਧੋ",
   "upload_progress.label": "ਅੱਪਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...",
   "upload_progress.processing": "ਕਾਰਵਾਈ ਚੱਲ ਰਹੀ ਹੈ…",
-  "username.taken": "ਉਹ ਵਰਤੋਂਕਾਰ ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਲੈ ਲਿਆ ਹੈ। ਹੋਰ ਅਜ਼ਮਾਓ",
-  "video.close": "ਵੀਡੀਓ ਨੂੰ ਬੰਦ ਕਰੋ",
-  "video.download": "ਫ਼ਾਈਲ ਨੂੰ ਡਾਊਨਲੋਡ ਕਰੋ",
   "video.exit_fullscreen": "ਪੂਰੀ ਸਕਰੀਨ ਵਿੱਚੋਂ ਬਾਹਰ ਨਿਕਲੋ",
-  "video.expand": "ਵੀਡੀਓ ਨੂੰ ਫੈਲਾਓ",
   "video.fullscreen": "ਪੂਰੀ ਸਕਰੀਨ",
-  "video.hide": "ਵੀਡੀਓ ਨੂੰ ਲੁਕਾਓ",
   "video.pause": "ਠਹਿਰੋ",
   "video.play": "ਚਲਾਓ"
 }

app/javascript/mastodon/locales/pl.json

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Przestać obserwować?",
   "content_warning.hide": "Ukryj wpis",
   "content_warning.show": "Pokaż mimo to",
-  "content_warning.show_more": "Rozwiń",
   "conversation.delete": "Usuń konwersację",
   "conversation.mark_as_read": "Oznacz jako przeczytane",
   "conversation.open": "Zobacz konwersację",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Użyj istniejącej kategorii lub utwórz nową",
   "filter_modal.select_filter.title": "Filtruj ten wpis",
   "filter_modal.title.status": "Filtruj wpis",
-  "filter_warning.matches_filter": "Pasuje do filtra \"<span>{title}</span>\"",
+  "filter_warning.matches_filter": "Pasuje do filtra \"{title}\"",
   "filtered_notifications_banner.pending_requests": "Od {count, plural, =0 {żadnej osoby którą możesz znać} one {# osoby którą możesz znać} other {# osób które możesz znać}}",
   "filtered_notifications_banner.title": "Powiadomienia filtrowane",
   "firehose.all": "Wszystko",

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

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Deixar de seguir o usuário?",
   "content_warning.hide": "Ocultar post",
   "content_warning.show": "Mostrar mesmo assim",
-  "content_warning.show_more": "Mostrar mais",
   "conversation.delete": "Excluir conversa",
   "conversation.mark_as_read": "Marcar como lida",
   "conversation.open": "Ver conversa",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Use uma categoria existente ou crie uma nova",
   "filter_modal.select_filter.title": "Filtrar esta publicação",
   "filter_modal.title.status": "Filtrar uma publicação",
-  "filter_warning.matches_filter": "Corresponder filtro “<span>{title}</span>”",
+  "filter_warning.matches_filter": "Correspondente ao filtro “{title}”",
   "filtered_notifications_banner.pending_requests": "Por {count, plural, =0 {no one} one {one person} other {# people}} que você talvez conheça",
   "filtered_notifications_banner.title": "Notificações filtradas",
   "firehose.all": "Tudo",

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

@@ -85,7 +85,6 @@
   "alert.rate_limited.title": "Limite de tentativas",
   "alert.unexpected.message": "Ocorreu um erro inesperado.",
   "alert.unexpected.title": "Bolas!",
-  "alt_text_badge.title": "Texto alternativo",
   "announcement.announcement": "Anúncio",
   "attachments_list.unprocessed": "(não processado)",
   "audio.hide": "Ocultar áudio",
@@ -303,6 +302,7 @@
   "filter_modal.select_filter.subtitle": "Utilize uma categoria existente ou crie uma nova",
   "filter_modal.select_filter.title": "Filtrar esta publicação",
   "filter_modal.title.status": "Filtrar uma publicação",
+  "filter_warning.matches_filter": "Corresponde ao filtro “{title}”",
   "filtered_notifications_banner.pending_requests": "De {count, plural, =0 {ninguém} one {uma pessoa} other {# pessoas}} que pode conhecer",
   "filtered_notifications_banner.title": "Notificações filtradas",
   "firehose.all": "Todas",
@@ -774,7 +774,7 @@
   "status.bookmark": "Guardar nos marcadores",
   "status.cancel_reblog_private": "Deixar de reforçar",
   "status.cannot_reblog": "Não é possível partilhar esta publicação",
-  "status.continued_thread": "Continuação da conversa",
+  "status.continued_thread": "Continuação da conserva",
   "status.copy": "Copiar hiperligação para a publicação",
   "status.delete": "Eliminar",
   "status.detailed_status": "Vista pormenorizada da conversa",

app/javascript/mastodon/locales/ru.json

@@ -1,10 +1,10 @@
 {
   "about.blocks": "Модерируемые серверы",
   "about.contact": "Связаться:",
-  "about.disclaimer": "Открытое программное обеспечениеMastodon — свободное программное обеспечение с открытым исходным кодом и торговая марка Mastodon gGmbH.",
+  "about.disclaimer": "Mastodon — свободное программное обеспечение с открытым исходным кодом и торговая марка Mastodon gGmbH.",
   "about.domain_blocks.no_reason_available": "Причина не указана",
   "about.domain_blocks.preamble": "Mastodon обычно позволяет просматривать содержимое и взаимодействовать с другими пользователями любых серверов в Федиверсе. Вот исключения, сделанные конкретно для этого сервера.",
-  "about.domain_blocks.silenced.explanation": "Как правило, вы не увидите профили и контент с этого сервера, если вы специально не будете их искать или не подпишетесь на них.",
+  "about.domain_blocks.silenced.explanation": "Как правило, вы не увидите профили и контент с этого сервера, если вы явно не будете их искать или не подпишетесь на них.",
   "about.domain_blocks.silenced.title": "Ограничивается",
   "about.domain_blocks.suspended.explanation": "Никакие данные с этого сервера не будут обрабатываться, храниться или обмениваться, что делает невозможным любое взаимодействие или связь с пользователями с этого сервера.",
   "about.domain_blocks.suspended.title": "Заблокирован",
@@ -17,11 +17,11 @@
   "account.badges.group": "Группа",
   "account.block": "Заблокировать @{name}",
   "account.block_domain": "Заблокировать {domain}",
-  "account.block_short": "Заблокировать",
+  "account.block_short": "Блокировать",
   "account.blocked": "Заблокировано",
   "account.cancel_follow_request": "Отозвать запрос на подписку",
   "account.copy": "Скопировать ссылку на профиль",
-  "account.direct": "Упомянуть @{name} лично",
+  "account.direct": "Лично упоминать @{name}",
   "account.disable_notifications": "Не уведомлять о постах от @{name}",
   "account.domain_blocked": "Домен заблокирован",
   "account.edit_profile": "Редактировать профиль",
@@ -36,12 +36,12 @@
   "account.followers.empty": "На этого пользователя пока никто не подписан.",
   "account.followers_counter": "{count, plural, one {{counter} подписчик} few {{counter} подписчика} other {{counter} подписчиков}}",
   "account.following": "Подписки",
-  "account.following_counter": "{count, plural, one {# подписка} many {# подписок} other {# подписки}}",
+  "account.following_counter": "{count, plural, one {{counter} последующий} other {{counter} последующие}}",
   "account.follows.empty": "Этот пользователь пока ни на кого не подписался.",
   "account.go_to_profile": "Перейти к профилю",
   "account.hide_reblogs": "Скрыть продвижения от @{name}",
-  "account.in_memoriam": "Вечная память.",
-  "account.joined_short": "Дата регистрации",
+  "account.in_memoriam": "В Памяти.",
+  "account.joined_short": "Присоединился",
   "account.languages": "Изменить языки подписки",
   "account.link_verified_on": "Владение этой ссылкой было проверено {date}",
   "account.locked_info": "Это закрытый аккаунт. Его владелец вручную одобряет подписчиков.",
@@ -62,19 +62,19 @@
   "account.requested_follow": "{name} отправил(а) вам запрос на подписку",
   "account.share": "Поделиться профилем @{name}",
   "account.show_reblogs": "Показывать продвижения от @{name}",
-  "account.statuses_counter": "{count, plural, one {{counter} пост} few {{counter} поста} other {{counter} постов}}",
+  "account.statuses_counter": "{count, plural, one {# пост} few {# поста} many {# постов} other {# постов}}",
   "account.unblock": "Разблокировать @{name}",
   "account.unblock_domain": "Разблокировать {domain}",
   "account.unblock_short": "Разблокировать",
   "account.unendorse": "Не рекомендовать в профиле",
   "account.unfollow": "Отписаться",
-  "account.unmute": "Перестать игнорировать @{name}",
+  "account.unmute": "Убрать {name} из игнорируемых",
   "account.unmute_notifications_short": "Включить уведомления",
   "account.unmute_short": "Не игнорировать",
   "account_note.placeholder": "Текст заметки",
   "admin.dashboard.daily_retention": "Уровень удержания пользователей после регистрации, в днях",
   "admin.dashboard.monthly_retention": "Уровень удержания пользователей после регистрации, в месяцах",
-  "admin.dashboard.retention.average": "В среднем за всё время",
+  "admin.dashboard.retention.average": "Среднее",
   "admin.dashboard.retention.cohort": "Месяц регистрации",
   "admin.dashboard.retention.cohort_size": "Новые пользователи",
   "admin.impact_report.instance_accounts": "Профили учетных записей, которые будут удалены",
@@ -84,7 +84,7 @@
   "alert.rate_limited.message": "Пожалуйста, повторите после {retry_time, time, medium}.",
   "alert.rate_limited.title": "Ограничение количества запросов",
   "alert.unexpected.message": "Произошла непредвиденная ошибка.",
-  "alert.unexpected.title": "Ой!",
+  "alert.unexpected.title": "Упс!",
   "alt_text_badge.title": "Альтернативный текст",
   "announcement.announcement": "Объявление",
   "attachments_list.unprocessed": "(не обработан)",
@@ -98,8 +98,8 @@
   "block_modal.title": "Заблокировать пользователя?",
   "block_modal.you_wont_see_mentions": "Вы не увидите записи, которые упоминают его.",
   "boost_modal.combo": "{combo}, чтобы пропустить это в следующий раз",
-  "boost_modal.reblog": "Продвинуть пост?",
-  "boost_modal.undo_reblog": "Убрать продвижение?",
+  "boost_modal.reblog": "Повысить пост?",
+  "boost_modal.undo_reblog": "Разгрузить пост?",
   "bundle_column_error.copy_stacktrace": "Скопировать отчет об ошибке",
   "bundle_column_error.error.body": "Запрошенная страница не может быть отображена. Это может быть вызвано ошибкой в нашем коде или проблемой совместимости браузера.",
   "bundle_column_error.error.title": "О нет!",
@@ -113,7 +113,7 @@
   "bundle_modal_error.message": "Что-то пошло не так при загрузке этого компонента.",
   "bundle_modal_error.retry": "Попробовать снова",
   "closed_registrations.other_server_instructions": "Поскольку Mastodon децентрализован, вы можете создать учетную запись на другом сервере и всё ещё взаимодействовать с этим сервером.",
-  "closed_registrations_modal.description": "Создать учётную запись на {domain} сейчас не выйдет, но имейте в виду, что вам не нужна учётная запись именно на {domain}, чтобы использовать Mastodon.",
+  "closed_registrations_modal.description": "Создание учетной записи на {domain} в настоящее время невозможно, но имейте в виду, что для использования Mastodon вам не нужен аккаунт именно на {domain}.",
   "closed_registrations_modal.find_another_server": "Найти другой сервер",
   "closed_registrations_modal.preamble": "Mastodon децентрализован, поэтому независимо от того, где вы создадите свою учетную запись, вы сможете следить и взаимодействовать с кем угодно на этом сервере. Вы даже можете разместить свой собственный сервер!",
   "closed_registrations_modal.title": "Регистрация в Mastodon",
@@ -146,10 +146,10 @@
   "community.column_settings.remote_only": "Только удалённые",
   "compose.language.change": "Изменить язык",
   "compose.language.search": "Поиск языков...",
-  "compose.published.body": "Пост опубликован.",
+  "compose.published.body": "Запись опубликована.",
   "compose.published.open": "Открыть",
-  "compose.saved.body": "Пост отредактирован.",
-  "compose_form.direct_message_warning_learn_more": "Узнать больше",
+  "compose.saved.body": "Запись сохранена.",
+  "compose_form.direct_message_warning_learn_more": "Подробнее",
   "compose_form.encryption_warning": "Посты в Mastodon не защищены сквозным шифрованием. Не делитесь конфиденциальной информацией через Mastodon.",
   "compose_form.hashtag_warning": "Этот пост не будет виден ни под одним из хэштегов, так как он не публичный. Только публичные посты можно найти по хэштегу.",
   "compose_form.lock_disclaimer": "Ваша учётная запись {locked}. Любой пользователь сможет подписаться на вас и просматривать посты для подписчиков.",
@@ -161,14 +161,14 @@
   "compose_form.poll.single": "Выберите один",
   "compose_form.poll.switch_to_multiple": "Разрешить выбор нескольких вариантов",
   "compose_form.poll.switch_to_single": "Переключить в режим выбора одного ответа",
-  "compose_form.poll.type": "Тип",
+  "compose_form.poll.type": "Стиль",
   "compose_form.publish": "Опубликовать",
   "compose_form.publish_form": "Опубликовать",
   "compose_form.reply": "Ответить",
   "compose_form.save_changes": "Сохранить",
   "compose_form.spoiler.marked": "Текст скрыт за предупреждением",
   "compose_form.spoiler.unmarked": "Текст не скрыт",
-  "compose_form.spoiler_placeholder": "Предупреждение о содержимом (необязательно)",
+  "compose_form.spoiler_placeholder": "Предупреждение о контенте (опционально)",
   "confirmation_modal.cancel": "Отмена",
   "confirmations.block.confirm": "Заблокировать",
   "confirmations.delete.confirm": "Удалить",
@@ -178,17 +178,17 @@
   "confirmations.delete_list.message": "Вы действительно хотите навсегда удалить этот список?",
   "confirmations.delete_list.title": "Удалить список?",
   "confirmations.discard_edit_media.confirm": "Отменить",
-  "confirmations.discard_edit_media.message": "У вас имеются несохранённые изменения превью и описания медиафайла, отменить их?",
+  "confirmations.discard_edit_media.message": "У вас есть несохранённые изменения описания мультимедиа или предпросмотра, отменить их?",
   "confirmations.edit.confirm": "Редактировать",
-  "confirmations.edit.message": "При редактировании, текст набираемого поста будет очищен. Продолжить?",
+  "confirmations.edit.message": "В данный момент, редактирование перезапишет составляемое вами сообщение. Вы уверены, что хотите продолжить?",
   "confirmations.edit.title": "Переписать сообщение?",
   "confirmations.logout.confirm": "Выйти",
   "confirmations.logout.message": "Вы уверены, что хотите выйти?",
   "confirmations.logout.title": "Выйти?",
   "confirmations.mute.confirm": "Игнорировать",
   "confirmations.redraft.confirm": "Удалить и исправить",
-  "confirmations.redraft.message": "Вы уверены, что хотите удалить и переписать этот пост? Отметки «избранного», продвижения и ответы к оригинальному посту будут потеряны.",
-  "confirmations.redraft.title": "Создать пост заново?",
+  "confirmations.redraft.message": "Вы уверены, что хотите удалить и переписать этот пост? Отметки «избранного», продвижения и ответы к оригинальному посту будут удалены.",
+  "confirmations.redraft.title": "Удалим и исправим пост?",
   "confirmations.reply.confirm": "Ответить",
   "confirmations.reply.message": "При ответе, текст набираемого поста будет очищен. Продолжить?",
   "confirmations.reply.title": "Перепишем пост?",
@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Отписаться?",
   "content_warning.hide": "Скрыть пост",
   "content_warning.show": "Всё равно показать",
-  "content_warning.show_more": "Развернуть",
   "conversation.delete": "Удалить беседу",
   "conversation.mark_as_read": "Отметить как прочитанное",
   "conversation.open": "Просмотр беседы",
@@ -211,19 +210,18 @@
   "directory.recently_active": "Недавно активные",
   "disabled_account_banner.account_settings": "Настройки учётной записи",
   "disabled_account_banner.text": "Ваша учётная запись {disabledAccount} в настоящее время отключена.",
-  "dismissable_banner.community_timeline": "Это самые новые публичные посты от тех пользователей, чьи учётные записи находятся на сервере {domain}.",
+  "dismissable_banner.community_timeline": "Это самые последние публичные сообщения от людей, чьи учетные записи размещены в {domain}.",
   "dismissable_banner.dismiss": "Закрыть",
   "dismissable_banner.explore_links": "Об этих новостях прямо сейчас говорят люди на этом и других серверах децентрализованной сети.",
-  "dismissable_banner.explore_statuses": "Эти посты привлекают людей на этом и других серверах децентрализованной сети прямо сейчас.",
+  "dismissable_banner.explore_statuses": "Эти сообщения со связанных серверов сети сейчас набирают популярность.",
   "dismissable_banner.explore_tags": "Эти хэштеги привлекают людей на этом и других серверах децентрализованной сети прямо сейчас.",
-  "dismissable_banner.public_timeline": "Это самые новые публичные посты от тех пользователей этого и других серверов децентрализованной сети, на которых подписываются пользователи {domain}.",
+  "dismissable_banner.public_timeline": "Это самые последние публичные сообщения от людей в социальной сети, за которыми подписались пользователи {domain}.",
   "domain_block_modal.block": "Заблокировать сервер",
   "domain_block_modal.block_account_instead": "Заблокировать @{name} вместо",
   "domain_block_modal.they_can_interact_with_old_posts": "Люди с этого сервера могут взаимодействовать с вашими старыми записями.",
   "domain_block_modal.they_cant_follow": "Никто из этого сервера не может подписываться на вас.",
   "domain_block_modal.they_wont_know": "Он не будет знать, что его заблокировали.",
   "domain_block_modal.title": "Заблокировать домен?",
-  "domain_block_modal.you_will_lose_num_followers": "Вы потеряете {followersCount, plural, one {{followersCountDisplay} подписчика} other {{followersCountDisplay} подписчиков}} и {followingCount, plural, one {{followingCountDisplay} подписку} other {{followingCountDisplay} подписок}}.",
   "domain_block_modal.you_will_lose_relationships": "Вы потеряете всех подписчиков и людей, на которых вы подписаны, на этом сервере.",
   "domain_block_modal.you_wont_see_posts": "Вы не будете видеть записи или уведомления от пользователей на этом сервере.",
   "domain_pill.activitypub_lets_connect": "Это позволяет вам общаться и взаимодействовать с людьми не только на Mastodon, но и в различных социальных приложениях.",
@@ -243,7 +241,7 @@
   "embed.preview": "Так это будет выглядеть:",
   "emoji_button.activity": "Занятия",
   "emoji_button.clear": "Очистить",
-  "emoji_button.custom": "С этого сервера",
+  "emoji_button.custom": "С этого узла",
   "emoji_button.flags": "Флаги",
   "emoji_button.food": "Еда и напитки",
   "emoji_button.label": "Вставить эмодзи",
@@ -306,8 +304,8 @@
   "filter_modal.select_filter.subtitle": "Используйте существующую категорию или создайте новую",
   "filter_modal.select_filter.title": "Фильтровать этот пост",
   "filter_modal.title.status": "Фильтровать пост",
-  "filter_warning.matches_filter": "Соответствует фильтру \"<span>{title}</span>\"",
-  "filtered_notifications_banner.pending_requests": "Вы можете знать {count, plural, =0 {ни одного человека} one {одного человека} other {# человек}}",
+  "filter_warning.matches_filter": "Соответствует фильтру \"{title}\"",
+  "filtered_notifications_banner.pending_requests": "Вы можете знать {count, plural, =0 {ни один} one {один человек} other {# люди}}",
   "filtered_notifications_banner.title": "Отфильтрованные уведомления",
   "firehose.all": "Все",
   "firehose.local": "Текущий сервер",
@@ -350,12 +348,12 @@
   "hashtag.column_settings.tag_mode.any": "Любой из списка",
   "hashtag.column_settings.tag_mode.none": "Ни один из списка",
   "hashtag.column_settings.tag_toggle": "Включить дополнительные теги для этой колонки",
-  "hashtag.counter_by_accounts": "{count, plural, one {{counter} пользователь} few {{counter} пользователя} other {{counter} пользователей}}",
-  "hashtag.counter_by_uses": "{count, plural, one {{counter} пост} few {{counter} поста} other {{counter} постов}}",
-  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} пост} few {{counter} поста} other {{counter} постов}} сегодня",
+  "hashtag.counter_by_accounts": "{count, plural, one {{counter} участник} few {{counter} участников} many {{counter} участников} other {{counter} участников}}",
+  "hashtag.counter_by_uses": "{count, plural, one {{counter} сообщение} few {{counter} сообщения} many {{counter} сообщения} other {{counter} сообщения}}",
+  "hashtag.counter_by_uses_today": "{count, plural, one {{counter} сообщение} other {{counter} сообщений}} сегодня",
   "hashtag.follow": "Подписаться на новые посты",
   "hashtag.unfollow": "Отписаться",
-  "hashtags.and_other": "…и {count, plural, other {ещё #}}",
+  "hashtags.and_other": "...и {count, plural, other {# ещё}}",
   "hints.profiles.followers_may_be_missing": "Подписчики у этого профиля могут отсутствовать.",
   "hints.profiles.follows_may_be_missing": "Фолловеры для этого профиля могут отсутствовать.",
   "hints.profiles.posts_may_be_missing": "Некоторые сообщения из этого профиля могут отсутствовать.",
@@ -409,8 +407,8 @@
   "keyboard_shortcuts.direct": "чтобы открыть столбец личных упоминаний",
   "keyboard_shortcuts.down": "вниз по списку",
   "keyboard_shortcuts.enter": "открыть пост",
-  "keyboard_shortcuts.favourite": "добавить пост в избранное",
-  "keyboard_shortcuts.favourites": "открыть «Избранные»",
+  "keyboard_shortcuts.favourite": "Добавить пост в избранное",
+  "keyboard_shortcuts.favourites": "Открыть «Избранное»",
   "keyboard_shortcuts.federated": "перейти к глобальной ленте",
   "keyboard_shortcuts.heading": "Сочетания клавиш",
   "keyboard_shortcuts.home": "перейти к домашней ленте",
@@ -418,7 +416,7 @@
   "keyboard_shortcuts.legend": "показать это окно",
   "keyboard_shortcuts.local": "перейти к локальной ленте",
   "keyboard_shortcuts.mention": "упомянуть автора поста",
-  "keyboard_shortcuts.muted": "открыть список игнорируемых",
+  "keyboard_shortcuts.muted": "Открыть список игнорируемых",
   "keyboard_shortcuts.my_profile": "перейти к своему профилю",
   "keyboard_shortcuts.notifications": "перейти к уведомлениям",
   "keyboard_shortcuts.open_media": "открыть вложение",
@@ -430,7 +428,7 @@
   "keyboard_shortcuts.spoilers": "показать/скрыть поле предупреждения о содержании",
   "keyboard_shortcuts.start": "Перейти к разделу \"Начать\"",
   "keyboard_shortcuts.toggle_hidden": "показать/скрыть текст за предупреждением",
-  "keyboard_shortcuts.toggle_sensitivity": "показать/скрыть медиафайлы",
+  "keyboard_shortcuts.toggle_sensitivity": "Показать/скрыть медиафайлы",
   "keyboard_shortcuts.toot": "начать писать новый пост",
   "keyboard_shortcuts.unfocus": "убрать фокус с поля ввода/поиска",
   "keyboard_shortcuts.up": "вверх по списку",
@@ -449,10 +447,10 @@
   "lists.delete": "Удалить список",
   "lists.edit": "Изменить список",
   "lists.edit.submit": "Изменить название",
-  "lists.exclusive": "Не показывать посты из этого списка в домашней ленте",
+  "lists.exclusive": "Скрыть эти сообщения из дома",
   "lists.new.create": "Создать список",
   "lists.new.title_placeholder": "Название для нового списка",
-  "lists.replies_policy.followed": "Пользователи, на которых вы подписаны",
+  "lists.replies_policy.followed": "Любой подписанный пользователь",
   "lists.replies_policy.list": "Пользователи в списке",
   "lists.replies_policy.none": "Никого",
   "lists.replies_policy.title": "Показать ответы только:",
@@ -472,8 +470,8 @@
   "mute_modal.you_wont_see_mentions": "Вы не увидите постов, которые их упоминают.",
   "mute_modal.you_wont_see_posts": "Они по-прежнему смогут видеть ваши посты, но вы не сможете видеть их посты.",
   "navigation_bar.about": "О проекте",
-  "navigation_bar.administration": "Администрирование",
-  "navigation_bar.advanced_interface": "Открыть в многоколоночном интерфейсе",
+  "navigation_bar.administration": "Администрация",
+  "navigation_bar.advanced_interface": "Включить многоколоночный интерфейс",
   "navigation_bar.blocks": "Заблокированные пользователи",
   "navigation_bar.bookmarks": "Закладки",
   "navigation_bar.community_timeline": "Локальная лента",
@@ -499,27 +497,26 @@
   "navigation_bar.search": "Поиск",
   "navigation_bar.security": "Безопасность",
   "not_signed_in_indicator.not_signed_in": "Вам нужно войти, чтобы иметь доступ к этому ресурсу.",
-  "notification.admin.report": "{name} пожаловался на {target}",
-  "notification.admin.report_account": "{name} пожаловался на {count, plural, one {# пост} few {# поста} other {# постов}} от пользователя {target} по причине: {category}",
-  "notification.admin.report_account_other": "{name} пожаловался на {count, plural, one {# пост} few {# поста} other {# постов}} от пользователя {target}",
-  "notification.admin.report_statuses": "{name} пожаловался на {target} по причине: {category}",
-  "notification.admin.report_statuses_other": "{name} пожаловался на {target}",
-  "notification.admin.sign_up": "{name} зарегистрировался",
-  "notification.admin.sign_up.name_and_others": "{name} и ещё {count, plural, one {# пользователь} few {# пользователя} other {# пользователей}} зарегистрировались",
+  "notification.admin.report": "{name} сообщил о {target}",
+  "notification.admin.report_account": "{name} сообщил {count, plural, one {один пост} other {# постов}} от {target} для {category}",
+  "notification.admin.report_account_other": "{name} сообщил {count, plural, one {одно сообщение} other {# сообщений}} от {target}",
+  "notification.admin.report_statuses": "{name} сообщил {target} для {category}",
+  "notification.admin.report_statuses_other": "{name} сообщает {target}",
+  "notification.admin.sign_up": "{name} зарегистрирован",
+  "notification.admin.sign_up.name_and_others": "{name} и {count, plural, one {# другой} other {# другие}} подписались",
   "notification.favourite": "{name} добавил(а) ваш пост в избранное",
-  "notification.favourite.name_and_others_with_link": "{name} и ещё <a>{count, plural, one {# пользователь} few {# пользователя} other {# пользователей}}</a> добавили ваш пост в избранное",
+  "notification.favourite.name_and_others_with_link": "{name} и <a>{count, plural, one {# другие} other {# другие}}</a> отдали предпочтение вашему посту",
   "notification.follow": "{name} подписался (-лась) на вас",
-  "notification.follow.name_and_others": "{name} и ещё <a>{count, plural, one {# пользователь} few {# пользователя} other {# пользователей}}</a> подписались на вас",
   "notification.follow_request": "{name} отправил запрос на подписку",
   "notification.follow_request.name_and_others": "{name} и ещё {count, plural, one {#} other {# других}} подписались на вас",
   "notification.label.mention": "Упоминание",
-  "notification.label.private_mention": "Личное упоминание",
-  "notification.label.private_reply": "Приватный ответ",
-  "notification.label.reply": "Ответ",
+  "notification.label.private_mention": "Частное упоминание",
+  "notification.label.private_reply": "Частный ответ",
+  "notification.label.reply": "Ответить",
   "notification.mention": "Упоминание",
   "notification.mentioned_you": "{name} упомянул(а) вас",
   "notification.moderation-warning.learn_more": "Узнать больше",
-  "notification.moderation_warning": "Модераторы вынесли вам предупреждение",
+  "notification.moderation_warning": "Вы получили предупреждение от модерации",
   "notification.moderation_warning.action_delete_statuses": "Некоторые из ваших публикаций были удалены.",
   "notification.moderation_warning.action_disable": "Ваша учётная запись была отключена.",
   "notification.moderation_warning.action_mark_statuses_as_sensitive": "Некоторые из ваших сообщений были отмечены как деликатные.",
@@ -530,7 +527,7 @@
   "notification.own_poll": "Ваш опрос закончился",
   "notification.poll": "Голосование, в котором вы приняли участие, завершилось",
   "notification.reblog": "{name} продвинул(а) ваш пост",
-  "notification.reblog.name_and_others_with_link": "{name} и ещё <a>{count, plural, one {# пользователь} few {# пользователя} other {# пользователей}}</a> продвинули ваш пост",
+  "notification.reblog.name_and_others_with_link": "{name} и <a>{count, plural, one {# other} other {# others}}</a> увеличили ваш пост",
   "notification.relationships_severance_event": "Потеряно соединение с {name}",
   "notification.relationships_severance_event.account_suspension": "Администратор {from} заблокировал {target}, что означает, что вы больше не сможете получать обновления от них или взаймодествовать с ними.",
   "notification.relationships_severance_event.domain_block": "Администратор {from} заблокировал {target} включая {followersCount} ваших подписчиков и {followingCount, plural, one {# аккаунт} few {# аккаунта} other {# аккаунтов}}, на которые вы подписаны.",
@@ -539,15 +536,10 @@
   "notification.status": "{name} только что запостил",
   "notification.update": "{name} изменил(а) пост",
   "notification_requests.accept": "Принять",
-  "notification_requests.accept_multiple": "{count, plural, one {Принять # запрос…} few {Принять # запроса…} other {Принять # запросов…}}",
   "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Принять запрос} other {Принять запросы}}",
-  "notification_requests.confirm_accept_multiple.message": "Вы собираетесь принять {count, plural, one {# запрос на показ уведомлений} few {# запроса на показ уведомлений} other {# запросов на показ уведомлений}}. Продолжить?",
   "notification_requests.confirm_accept_multiple.title": "Принимать запросы на уведомления?",
-  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Отклонить запрос} other {Отклонить запросы}}",
-  "notification_requests.confirm_dismiss_multiple.message": "Вы собираетесь отклонить {count, plural, one {# запрос на показ уведомлений} few {# запроса на показ уведомлений} other {# запросов на показ уведомлений}}. Вы не сможете просмотреть {count, plural, other {их}} потом. Продолжить?",
   "notification_requests.confirm_dismiss_multiple.title": "Отклонять запросы на уведомления?",
   "notification_requests.dismiss": "Отклонить",
-  "notification_requests.dismiss_multiple": "{count, plural, one {Отклонить # запрос…} few {Отклонить # запроса…} other {Отклонить # запросов…}}",
   "notification_requests.edit_selection": "Редактировать",
   "notification_requests.exit_selection": "Готово",
   "notification_requests.explainer_for_limited_account": "Уведомления от этой учетной записи были отфильтрованы, поскольку учетная запись была ограничена модератором.",
@@ -559,16 +551,15 @@
   "notification_requests.view": "Просмотр уведомлений",
   "notifications.clear": "Очистить уведомления",
   "notifications.clear_confirmation": "Вы уверены, что хотите очистить все уведомления?",
-  "notifications.clear_title": "Очистить уведомления?",
+  "notifications.clear_title": "Сбросить уведомления?",
   "notifications.column_settings.admin.report": "Новые жалобы:",
   "notifications.column_settings.admin.sign_up": "Новые регистрации:",
   "notifications.column_settings.alert": "Уведомления на рабочем столе",
-  "notifications.column_settings.favourite": "Ваш пост добавили в избранные:",
-  "notifications.column_settings.filter_bar.advanced": "Показать все категории",
+  "notifications.column_settings.favourite": "Избранные:",
+  "notifications.column_settings.filter_bar.advanced": "Отображать все категории",
   "notifications.column_settings.filter_bar.category": "Панель сортировки",
   "notifications.column_settings.follow": "У вас новый подписчик:",
   "notifications.column_settings.follow_request": "Новые запросы на подписку:",
-  "notifications.column_settings.group": "Группировать",
   "notifications.column_settings.mention": "Вас упомянули в посте:",
   "notifications.column_settings.poll": "Опрос, в котором вы приняли участие, завершился:",
   "notifications.column_settings.push": "Пуш-уведомления",
@@ -588,32 +579,31 @@
   "notifications.filter.statuses": "Обновления от людей, на которых вы подписаны",
   "notifications.grant_permission": "Предоставить разрешение.",
   "notifications.group": "{count} уведомл.",
-  "notifications.mark_as_read": "Отметить все уведомления прочитанными",
+  "notifications.mark_as_read": "Отмечать все уведомления прочитанными",
   "notifications.permission_denied": "Уведомления на рабочем столе недоступны, так как вы запретили их отправку в браузере. Проверьте настройки для сайта, чтобы включить их обратно.",
   "notifications.permission_denied_alert": "Уведомления на рабочем столе недоступны, так как вы ранее отклонили запрос на их отправку.",
   "notifications.permission_required": "Чтобы включить уведомления на рабочем столе, необходимо разрешить их в браузере.",
-  "notifications.policy.accept": "Принимать",
-  "notifications.policy.accept_hint": "Показывать в уведомлениях",
-  "notifications.policy.drop": "Игнорировать",
-  "notifications.policy.drop_hint": "Отправлять в пустоту, чтобы никогда больше не увидеть",
-  "notifications.policy.filter": "Фильтровать",
-  "notifications.policy.filter_hint": "Отправлять в раздел отфильтрованных уведомлений",
-  "notifications.policy.filter_limited_accounts_hint": "Ограниченные модераторами сервера",
-  "notifications.policy.filter_limited_accounts_title": "Модерируемые учётные записи",
-  "notifications.policy.filter_new_accounts.hint": "Созданные в течение {days, plural, one {последнего # дня} other {последних # дней}}",
+  "notifications.policy.accept": "Принять",
+  "notifications.policy.accept_hint": "Показать в уведомлениях",
+  "notifications.policy.drop": "Игнорируем",
+  "notifications.policy.drop_hint": "Отправить в пустоту, чтобы никогда больше не увидеть",
+  "notifications.policy.filter": "Фильтр",
+  "notifications.policy.filter_hint": "Отправка в папку фильтрованных уведомлений",
+  "notifications.policy.filter_limited_accounts_hint": "Ограничено модераторами сервера",
+  "notifications.policy.filter_limited_accounts_title": "Модерируемые аккаунты",
+  "notifications.policy.filter_new_accounts.hint": "Создано в течение последних {days, plural, one {один день} few {# дней} many {# дней} other {# дня}}",
   "notifications.policy.filter_new_accounts_title": "Новые учётные записи",
-  "notifications.policy.filter_not_followers_hint": "Включая людей, которые подписаны на вас меньше чем {days, plural, one {# день} few {# дня} other {# дней}}",
   "notifications.policy.filter_not_followers_title": "Люди, не подписанные на вас",
   "notifications.policy.filter_not_following_hint": "Пока вы не одобрите их вручную",
   "notifications.policy.filter_not_following_title": "Люди, на которых вы не подписаны",
-  "notifications.policy.filter_private_mentions_hint": "Фильтруются, если только это не ответ на ваше собственное упоминание или если вы подписаны на отправителя",
+  "notifications.policy.filter_private_mentions_hint": "Фильтруется, если только это не ответ на ваше собственное упоминание или если вы подписаны на отправителя",
   "notifications.policy.filter_private_mentions_title": "Нежелательные личные упоминания",
-  "notifications.policy.title": "Управление уведомлениями",
+  "notifications.policy.title": "………Управлять уведомлениями от…",
   "notifications_permission_banner.enable": "Включить уведомления",
   "notifications_permission_banner.how_to_control": "Получайте уведомления даже когда Mastodon закрыт, включив уведомления на рабочем столе. А чтобы лишний шум не отвлекал, вы можете настроить какие уведомления вы хотите получать, нажав на кнопку {icon} выше.",
   "notifications_permission_banner.title": "Будьте в курсе происходящего",
-  "onboarding.action.back": "Верните меня",
-  "onboarding.actions.back": "Верните меня",
+  "onboarding.action.back": "Вернуть меня",
+  "onboarding.actions.back": "Вернуть меня",
   "onboarding.actions.go_to_explore": "Посмотреть, что актуально",
   "onboarding.actions.go_to_home": "Перейти к домашней ленте новостей",
   "onboarding.compose.template": "Привет, #Mastodon!",
@@ -631,7 +621,7 @@
   "onboarding.profile.title": "Настройка профиля",
   "onboarding.profile.upload_avatar": "Загрузить фотографию профиля",
   "onboarding.profile.upload_header": "Загрузить заголовок профиля",
-  "onboarding.share.lead": "Расскажите людям, как найти вас на Mastodon!",
+  "onboarding.share.lead": "Расскажите людям, как они могут найти вас на Mastodon!",
   "onboarding.share.message": "Я {username} на #Mastodon! Следуйте за мной по адресу {url}",
   "onboarding.share.next_steps": "Возможные дальнейшие шаги:",
   "onboarding.share.title": "Поделиться вашим профилем",
@@ -646,7 +636,7 @@
   "onboarding.steps.setup_profile.title": "Настройте свой профиль",
   "onboarding.steps.share_profile.body": "Расскажите своим друзьям как найти вас на Mastodon!",
   "onboarding.steps.share_profile.title": "Поделитесь вашим профилем",
-  "onboarding.tips.2fa": "<strong>А вы знали? </strong> Можно защитить свой аккаунт, настроив двухфакторную аутентификацию в настройках аккаунта. Она работает с любым приложением TOTP по вашему выбору, номер телефона не нужен!",
+  "onboarding.tips.2fa": "<strong>Знаете ли вы? </strong> Вы можете защитить свой аккаунт, настроив двухфакторную аутентификацию в настройках аккаунта. Она работает с любым приложением TOTP по вашему выбору, номер телефона не требуется!",
   "onboarding.tips.accounts_from_other_servers": "<strong>Знали ли вы? </strong> Поскольку Mastodon децентрализован, некоторые профили, с которыми вы столкнетесь, будут размещены на серверах, отличных от вашего. И все же вы можете взаимодействовать с ними без проблем! Их сервер находится во второй половине имени пользователя!",
   "onboarding.tips.migration": "<strong>Знаете ли вы? </strong> Если вы чувствуете, что {domain} не подходит вам в качестве сервера в будущем, вы можете переехать на другой сервер Mastodon без потери своих подписчиков. Вы даже можете разместить свой собственный сервер!",
   "onboarding.tips.verification": "<strong>Знали ли вы? </strong> Вы можете подтвердить свою учетную запись, разместив ссылку на свой профиль Mastodon на собственном сайте и добавив сайт в свой профиль. Никаких сборов или документов не требуется!",
@@ -690,15 +680,15 @@
   "relative_time.minutes": "{number} мин",
   "relative_time.seconds": "{number} с",
   "relative_time.today": "сегодня",
-  "reply_indicator.attachments": "{count, plural, one {# вложение} few {# вложения} other {# вложений}}",
+  "reply_indicator.attachments": "{count, plural, one {# вложение} other {# вложения}}",
   "reply_indicator.cancel": "Отмена",
   "reply_indicator.poll": "Опрос",
   "report.block": "Заблокировать",
   "report.block_explanation": "Вы перестанете видеть посты этого пользователя, и он(а) больше не сможет подписаться на вас и читать ваши посты. Он(а) сможет понять, что вы заблокировали его/её.",
-  "report.categories.legal": "Нарушение закона",
+  "report.categories.legal": "Правовая информация",
   "report.categories.other": "Другое",
   "report.categories.spam": "Спам",
-  "report.categories.violation": "Содержимое нарушает одно или несколько правил сервера",
+  "report.categories.violation": "Содержимое нарушает одно или несколько правил узла",
   "report.category.subtitle": "Выберите наиболее подходящее",
   "report.category.title": "Расскажите нам, что не так с {type}",
   "report.category.title_account": "этим профилем",
@@ -769,32 +759,31 @@
   "server_banner.about_active_users": "Люди, заходившие на этот сервер за последние 30 дней (ежемесячные активные пользователи)",
   "server_banner.active_users": "активные пользователи",
   "server_banner.administered_by": "Управляется:",
-  "server_banner.is_one_of_many": "{domain} — это один из многих независимых серверов Mastodon, которые вы можете использовать для участия в сети Fediverse.",
+  "server_banner.is_one_of_many": "{domain} - это один из многих независимых серверов Mastodon, которые вы можете использовать для участия в fediverse.",
   "server_banner.server_stats": "Статистика сервера:",
   "sign_in_banner.create_account": "Зарегистрироваться",
-  "sign_in_banner.follow_anyone": "Подписывайтесь на кого угодно в федивёрсе и смотрите ленту в хронологическом порядке. Никаких алгоритмов, рекламы или кликбейта.",
-  "sign_in_banner.mastodon_is": "Mastodon — лучший способ быть в курсе всего происходящего.",
+  "sign_in_banner.follow_anyone": "Следите за любым человеком в федеральной вселенной и смотрите все в хронологическом порядке. Никаких алгоритмов, рекламы или клик бейта.",
+  "sign_in_banner.mastodon_is": "Mastodon - лучший способ быть в курсе всего происходящего.",
   "sign_in_banner.sign_in": "Войти",
   "sign_in_banner.sso_redirect": "Войдите или Зарегистрируйтесь",
   "status.admin_account": "Открыть интерфейс модератора для @{name}",
-  "status.admin_domain": "Открыть интерфейс модератора для {domain}",
+  "status.admin_domain": "Открыть интерфейс модерации {domain}",
   "status.admin_status": "Открыть этот пост в интерфейсе модератора",
   "status.block": "Заблокировать @{name}",
-  "status.bookmark": "Добавить в закладки",
+  "status.bookmark": "Сохранить в закладки",
   "status.cancel_reblog_private": "Не продвигать",
   "status.cannot_reblog": "Этот пост не может быть продвинут",
   "status.continued_thread": "Продолжение темы",
   "status.copy": "Скопировать ссылку на пост",
   "status.delete": "Удалить",
   "status.detailed_status": "Подробный просмотр обсуждения",
-  "status.direct": "Упомянуть @{name} лично",
-  "status.direct_indicator": "Личное упоминание",
+  "status.direct": "Лично упоминать @{name}",
+  "status.direct_indicator": "Личные упоминания",
   "status.edit": "Изменить",
   "status.edited": "Дата последнего изменения: {date}",
   "status.edited_x_times": "{count, plural, one {{count} изменение} many {{count} изменений} other {{count} изменения}}",
   "status.embed": "Получить код для встраивания",
-  "status.favourite": "Добавить в избранное",
-  "status.favourites": "{count, plural, other {в избранном}}",
+  "status.favourite": "Избранное",
   "status.filter": "Фильтровать этот пост",
   "status.history.created": "{name} создал {date}",
   "status.history.edited": "{name} отредактировал(а) {date}",
@@ -813,7 +802,6 @@
   "status.reblog": "Продвинуть",
   "status.reblog_private": "Продвинуть для своей аудитории",
   "status.reblogged_by": "{name} продвинул(а)",
-  "status.reblogs": "{count, plural, one {boost} few {boosts} many {boosts} other {boosts}}",
   "status.reblogs.empty": "Никто ещё не продвинул этот пост. Как только кто-то это сделает, они появятся здесь.",
   "status.redraft": "Создать заново",
   "status.remove_bookmark": "Убрать из закладок",
@@ -827,13 +815,13 @@
   "status.show_less_all": "Свернуть все спойлеры в ветке",
   "status.show_more_all": "Развернуть все спойлеры в ветке",
   "status.show_original": "Показать оригинал",
-  "status.title.with_attachments": "{user} опубликовал {attachmentCount, plural, one {{attachmentCount} вложение} few {{attachmentCount} вложения} other {{attachmentCount} вложений}}",
+  "status.title.with_attachments": "{user} размещено {attachmentCount, plural, one {вложение} other {{attachmentCount} вложений}}",
   "status.translate": "Перевод",
-  "status.translated_from_with": "Переведено с {lang} с помощью {provider}",
-  "status.uncached_media_warning": "Предварительный просмотр недоступен",
+  "status.translated_from_with": "Переведено с {lang}, используя {provider}",
+  "status.uncached_media_warning": "Прослушивание недоступно",
   "status.unmute_conversation": "Не игнорировать обсуждение",
   "status.unpin": "Открепить от профиля",
-  "subscribed_languages.lead": "Посты лишь на выбранных языках будут появляться в вашей домашней ленте и в списках после изменения. Снимите выбор, чтобы получать посты на всех языках.",
+  "subscribed_languages.lead": "Посты только на выбранных языках будут отображаться на вашей домашней странице и в списке лент после изменения. Выберите «Нет», чтобы получать посты на всех языках.",
   "subscribed_languages.save": "Сохранить изменения",
   "subscribed_languages.target": "Изменить языки подписки для {target}",
   "tabs_bar.home": "Главная",
@@ -843,7 +831,7 @@
   "time_remaining.minutes": "{number, plural, one {осталась # минута} few {осталось # минуты} many {осталось # минут} other {осталось # минут}}",
   "time_remaining.moments": "остались считанные мгновения",
   "time_remaining.seconds": "{number, plural, one {# секунда} many {# секунд} other {# секунды}}",
-  "trends.counter_by_accounts": "{count, plural, few {{counter} человека} other {{counter} человек}} за {days, plural, one {последний {days} день} few {последние {days} дня} other {последние {days} дней}}",
+  "trends.counter_by_accounts": "{count, plural, few {{counter} человека} other {{counter} человек}} за {days, plural, one {последний день} few {последние {days} дня} other {последние {days} дней}}",
   "trends.trending_now": "Самое актуальное",
   "ui.beforeunload": "Ваш черновик будет утерян, если вы покинете Mastodon.",
   "units.short.billion": "{count} млрд",
@@ -859,7 +847,6 @@
   "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} было перемещено.",
-  "upload_form.drag_and_drop.on_drag_start": ".",
   "upload_form.edit": "Изменить",
   "upload_form.thumbnail": "Изменить обложку",
   "upload_form.video_description": "Опишите видео для людей с нарушением слуха или зрения",
@@ -871,11 +858,11 @@
   "upload_modal.detect_text": "Найти текст на картинке",
   "upload_modal.edit_media": "Изменить файл",
   "upload_modal.hint": "Нажмите и перетащите круг в предпросмотре в точку фокуса, которая всегда будет видна на эскизах.",
-  "upload_modal.preparing_ocr": "Подготовка распознавания…",
+  "upload_modal.preparing_ocr": "Подготовка распознования…",
   "upload_modal.preview_label": "Предпросмотр ({ratio})",
   "upload_progress.label": "Загрузка...",
   "upload_progress.processing": "Обработка…",
-  "username.taken": "Это имя пользователя уже занято. Выберите другое",
+  "username.taken": "Данное имя пользователя уже занято. Выберите другое.",
   "video.close": "Закрыть видео",
   "video.download": "Загрузить файл",
   "video.exit_fullscreen": "Покинуть полноэкранный режим",

app/javascript/mastodon/locales/sk.json

@@ -92,7 +92,6 @@
   "block_modal.show_less": "Zobraziť menej",
   "block_modal.show_more": "Zobraziť viac",
   "block_modal.they_cant_mention": "Nemôžu ťa spomenúť, alebo nasledovať.",
-  "block_modal.they_cant_see_posts": "On/a nemôže vidieť tvoje príspevky a ty neuvidíš jej/ho.",
   "block_modal.they_will_know": "Môžu vidieť, že sú zablokovaní/ý.",
   "block_modal.title": "Blokovať užívateľa?",
   "block_modal.you_wont_see_mentions": "Neuvidíš príspevky, ktoré ich spomínajú.",
@@ -195,7 +194,6 @@
   "confirmations.unfollow.title": "Prestať sledovať užívateľa?",
   "content_warning.hide": "Skryť príspevok",
   "content_warning.show": "Aj tak zobraziť",
-  "content_warning.show_more": "Ukázať viac",
   "conversation.delete": "Vymazať konverzáciu",
   "conversation.mark_as_read": "Označiť ako prečítanú",
   "conversation.open": "Zobraziť konverzáciu",
@@ -293,6 +291,7 @@
   "filter_modal.select_filter.subtitle": "Použite existujúcu kategóriu alebo vytvorte novú",
   "filter_modal.select_filter.title": "Filtrovanie tohto príspevku",
   "filter_modal.title.status": "Filtrovanie príspevku",
+  "filter_warning.matches_filter": "Zhody triedenia “{title}”",
   "filtered_notifications_banner.title": "Filtrované oznámenia",
   "firehose.all": "Všetko",
   "firehose.local": "Tento server",
@@ -339,9 +338,6 @@
   "hashtag.follow": "Sledovať hashtag",
   "hashtag.unfollow": "Prestať sledovať hashtag",
   "hashtags.and_other": "…a {count, plural, other {# ďalších}}",
-  "hints.profiles.see_more_posts": "Pozri viac príspevkov na {domain}",
-  "hints.threads.replies_may_be_missing": "Odpovede z ostatných serverov môžu chýbať.",
-  "hints.threads.see_more": "Pozri viac odpovedí na {domain}",
   "home.column_settings.show_reblogs": "Zobraziť zdieľania",
   "home.column_settings.show_replies": "Zobraziť odpovede",
   "home.hide_announcements": "Skryť oznámenia",
@@ -349,14 +345,7 @@
   "home.pending_critical_update.link": "Zobraziť aktualizácie",
   "home.pending_critical_update.title": "Je dostupná kritická bezpečnostná aktualizácia.",
   "home.show_announcements": "Zobraziť oznámenia",
-  "ignore_notifications_modal.filter_instead": "Radšej triediť",
-  "ignore_notifications_modal.filter_to_act_users": "Stále budeš môcť akceptovať, odmietnuť, alebo nahlásiť užívateľov",
-  "ignore_notifications_modal.filter_to_avoid_confusion": "Triedenie pomáha vyvarovať sa možnému zmäteniu",
   "ignore_notifications_modal.ignore": "Ignoruj upozornenia",
-  "ignore_notifications_modal.new_accounts_title": "Nevšímať si oznámenia z nových účtov?",
-  "ignore_notifications_modal.not_followers_title": "Nevšímať si oznámenia od ľudí, ktorí ťa nenasledujú?",
-  "ignore_notifications_modal.not_following_title": "Nevšímať si oznámenia od ľudí, ktorých nenasleduješ?",
-  "ignore_notifications_modal.private_mentions_title": "Nevšímať si oznámenia o nevyžiadaných súkromných spomínaniach?",
   "interaction_modal.description.favourite": "S účtom na Mastodone môžete tento príspevok ohviezdičkovať, tak dať autorovi vedieť, že sa vám páči, a uložiť si ho na neskôr.",
   "interaction_modal.description.follow": "S účtom na Mastodone môžete {name} sledovať a vidieť ich príspevky vo svojom domovskom kanáli.",
   "interaction_modal.description.reblog": "S účtom na Mastodone môžete tento príspevok zdeľať so svojimi sledovateľmi.",
@@ -412,12 +401,10 @@
   "lightbox.close": "Zatvoriť",
   "lightbox.next": "Ďalej",
   "lightbox.previous": "Späť",
-  "lightbox.zoom_out": "Priblížiť na mieru",
   "limited_account_hint.action": "Aj tak zobraziť profil",
   "limited_account_hint.title": "Tento profil bol skrytý správcami servera {domain}.",
   "link_preview.author": "Autor: {name}",
   "link_preview.more_from_author": "Viac od {name}",
-  "link_preview.shares": "{count, plural, one {{counter} príspevok} other {{counter} príspevkov}}",
   "lists.account.add": "Pridať do zoznamu",
   "lists.account.remove": "Odstrániť zo zoznamu",
   "lists.delete": "Vymazať zoznam",
@@ -440,11 +427,7 @@
   "mute_modal.hide_options": "Skryť možnosti",
   "mute_modal.indefinite": "Pokiaľ ich neodtíšim",
   "mute_modal.show_options": "Zobraziť možnosti",
-  "mute_modal.they_can_mention_and_follow": "Môže ťa spomenúť a nasledovať, ale ty ho/ju neuvidíš.",
-  "mute_modal.they_wont_know": "Nebude vedieť, že bol/a stíšený/á.",
   "mute_modal.title": "Stíšiť užívateľa?",
-  "mute_modal.you_wont_see_mentions": "Neuvidíš príspevky, ktoré ho/ju spomínajú.",
-  "mute_modal.you_wont_see_posts": "Stále uvidí tvoje príspevky, ale ty neuvidíš jeho/jej.",
   "navigation_bar.about": "O tomto serveri",
   "navigation_bar.administration": "Spravovanie",
   "navigation_bar.advanced_interface": "Otvoriť v pokročilom webovom rozhraní",
@@ -484,15 +467,12 @@
   "notification.label.private_reply": "Súkromná odpoveď",
   "notification.label.reply": "Odpoveď",
   "notification.mention": "Zmienka",
-  "notification.mentioned_you": "{name} ťa spomenul/a",
   "notification.moderation-warning.learn_more": "Zisti viac",
-  "notification.moderation_warning": "Dostal/a si varovanie od moderátora",
   "notification.moderation_warning.action_delete_statuses": "Niektoré z tvojich príspevkov boli odstránené.",
   "notification.moderation_warning.action_disable": "Tvoj účet bol vypnutý.",
   "notification.moderation_warning.action_silence": "Tvoj účet bol obmedzený.",
   "notification.moderation_warning.action_suspend": "Tvoj účet bol pozastavený.",
   "notification.own_poll": "Vaša anketa sa skončila",
-  "notification.poll": "Anketa, v ktorej si hlasoval/a, skončila",
   "notification.reblog": "{name} zdieľa váš príspevok",
   "notification.relationships_severance_event": "Stratené prepojenia s {name}",
   "notification.relationships_severance_event.account_suspension": "Správca z {from} pozastavil/a {target}, čo znamená, že od nich viac nemôžeš dostávať aktualizácie, alebo s nimi interaktovať.",
@@ -504,7 +484,7 @@
   "notification_requests.edit_selection": "Uprav",
   "notification_requests.exit_selection": "Hotovo",
   "notification_requests.notifications_from": "Oboznámenia od {name}",
-  "notification_requests.title": "Filtrované oznámenia",
+  "notification_requests.title": "Filtrované oboznámenia",
   "notification_requests.view": "Zobraz upozornenia",
   "notifications.clear": "Vyčistiť upozornenia",
   "notifications.clear_confirmation": "Určite chcete nenávratne odstrániť všetky svoje upozornenia?",
@@ -516,7 +496,6 @@
   "notifications.column_settings.filter_bar.advanced": "Zobraziť všetky kategórie",
   "notifications.column_settings.follow": "Nové sledovania od:",
   "notifications.column_settings.follow_request": "Nové žiadosti o sledovanie od:",
-  "notifications.column_settings.group": "Skupina",
   "notifications.column_settings.mention": "Označenia:",
   "notifications.column_settings.poll": "Výsledky ankety:",
   "notifications.column_settings.push": "Upozornenia push",
@@ -540,8 +519,6 @@
   "notifications.permission_denied": "Upozornenia na ploche sú nedostupné pre už skôr zamietnutú požiadavku prehliadača",
   "notifications.permission_denied_alert": "Upozornenia na ploche nemôžu byť zapnuté, pretože požiadavka prehliadača bola už skôr zamietnutá",
   "notifications.permission_required": "Upozornenia na ploche sú nedostupné, pretože neboli udelené potrebné povolenia.",
-  "notifications.policy.accept": "Prijať",
-  "notifications.policy.accept_hint": "Ukáž v oznámeniach",
   "notifications.policy.drop": "Ignoruj",
   "notifications.policy.filter": "Triediť",
   "notifications.policy.filter_limited_accounts_title": "Moderované účty",
@@ -549,7 +526,6 @@
   "notifications.policy.filter_not_followers_title": "Ľudia, ktorí ťa nenasledujú",
   "notifications.policy.filter_not_following_title": "Ľudia, ktorých nenasleduješ",
   "notifications.policy.filter_private_mentions_title": "Nevyžiadané priame spomenutia",
-  "notifications.policy.title": "Spravuj oznámenia od…",
   "notifications_permission_banner.enable": "Povoliť upozornenia na ploche",
   "notifications_permission_banner.how_to_control": "Ak chcete dostávať upozornenia, keď Mastodon nie je otvorený, povoľte upozornenia na ploche. Po ich zapnutí môžete presne kontrolovať, ktoré typy interakcií generujú upozornenia na ploche, a to prostredníctvom tlačidla {icon} vyššie.",
   "notifications_permission_banner.title": "Nenechajte si nič ujsť",
@@ -720,7 +696,6 @@
   "status.bookmark": "Pridať záložku",
   "status.cancel_reblog_private": "Zrušiť zdieľanie",
   "status.cannot_reblog": "Tento príspevok nie je možné zdieľať",
-  "status.continued_thread": "Pokračujúce vlákno",
   "status.copy": "Kopírovať odkaz na príspevok",
   "status.delete": "Vymazať",
   "status.detailed_status": "Podrobný náhľad celej konverzácie",

app/javascript/mastodon/locales/sl.json

@@ -85,7 +85,6 @@
   "alert.rate_limited.title": "Hitrost omejena",
   "alert.unexpected.message": "Zgodila se je nepričakovana napaka.",
   "alert.unexpected.title": "Ojoj!",
-  "alt_text_badge.title": "Nadomestno besedilo",
   "announcement.announcement": "Obvestilo",
   "attachments_list.unprocessed": "(neobdelano)",
   "audio.hide": "Skrij zvok",
@@ -98,8 +97,6 @@
   "block_modal.title": "Blokiraj uporabnika?",
   "block_modal.you_wont_see_mentions": "Objav, ki jih omenjajo, ne boste videli.",
   "boost_modal.combo": "Če želite preskočiti to, lahko pritisnete {combo}",
-  "boost_modal.reblog": "Izpostavi objavo?",
-  "boost_modal.undo_reblog": "Ali želite preklicati izpostavitev objave?",
   "bundle_column_error.copy_stacktrace": "Kopiraj poročilo o napaki",
   "bundle_column_error.error.body": "Zahtevane strani ni mogoče upodobiti. Vzrok težave je morda hrošč v naši kodi ali pa nezdružljivost z brskalnikom.",
   "bundle_column_error.error.title": "Oh, ne!",
@@ -195,9 +192,6 @@
   "confirmations.unfollow.confirm": "Ne sledi več",
   "confirmations.unfollow.message": "Ali ste prepričani, da ne želite več slediti {name}?",
   "confirmations.unfollow.title": "Želite nehati spremljati uporabnika?",
-  "content_warning.hide": "Skrij objavo",
-  "content_warning.show": "Vseeno pokaži",
-  "content_warning.show_more": "Pokaži več",
   "conversation.delete": "Izbriši pogovor",
   "conversation.mark_as_read": "Označi kot prebrano",
   "conversation.open": "Pokaži pogovor",
@@ -353,10 +347,7 @@
   "hashtag.unfollow": "Nehaj slediti ključniku",
   "hashtags.and_other": "…in še {count, plural, other {#}}",
   "hints.profiles.posts_may_be_missing": "Nekatere objave s tega profila morda manjkajo.",
-  "hints.profiles.see_more_followers": "Pokaži več sledilcev na {domain}",
-  "hints.profiles.see_more_posts": "Pokaži več objav na {domain}",
   "hints.threads.replies_may_be_missing": "Odgovori z drugih strežnikov morda manjkajo.",
-  "hints.threads.see_more": "Pokaži več odgovorov na {domain}",
   "home.column_settings.show_reblogs": "Pokaži izpostavitve",
   "home.column_settings.show_replies": "Pokaži odgovore",
   "home.hide_announcements": "Skrij obvestila",
@@ -443,7 +434,6 @@
   "lists.subheading": "Vaši seznami",
   "load_pending": "{count, plural, one {# nov element} two {# nova elementa} few {# novi elementi} other {# novih elementov}}",
   "loading_indicator.label": "Nalaganje …",
-  "media_gallery.hide": "Skrij",
   "moved_to_account_banner.text": "Vaš račun {disabledAccount} je trenutno onemogočen, ker ste se prestavili na {movedToAccount}.",
   "mute_modal.hide_from_notifications": "Skrijte se pred obvestili",
   "mute_modal.hide_options": "Skrij možnosti",
@@ -455,7 +445,6 @@
   "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.administration": "Upravljanje",
   "navigation_bar.advanced_interface": "Odpri v naprednem spletnem vmesniku",
   "navigation_bar.blocks": "Blokirani uporabniki",
   "navigation_bar.bookmarks": "Zaznamki",
@@ -472,7 +461,6 @@
   "navigation_bar.follows_and_followers": "Sledenja in sledilci",
   "navigation_bar.lists": "Seznami",
   "navigation_bar.logout": "Odjava",
-  "navigation_bar.moderation": "Moderiranje",
   "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.personal": "Osebno",
@@ -491,12 +479,10 @@
   "notification.favourite": "{name} je vzljubil/a vašo objavo",
   "notification.follow": "{name} vam sledi",
   "notification.follow_request": "{name} vam želi slediti",
-  "notification.label.mention": "Omemba",
   "notification.label.private_mention": "Zasebna omemba",
   "notification.label.private_reply": "Zasebni odgovor",
   "notification.label.reply": "Odgovori",
   "notification.mention": "Omemba",
-  "notification.mentioned_you": "{name} vas je omenil/a",
   "notification.moderation-warning.learn_more": "Več o tem",
   "notification.moderation_warning": "Prejeli ste opozorilo moderatorjev",
   "notification.moderation_warning.action_delete_statuses": "Nekatere vaše objave so odstranjene.",
@@ -517,7 +503,6 @@
   "notification.status": "{name} je pravkar objavil/a",
   "notification.update": "{name} je uredil(a) objavo",
   "notification_requests.accept": "Sprejmi",
-  "notification_requests.confirm_accept_multiple.title": "Ali želite sprejeti zahteve za obvestila?",
   "notification_requests.confirm_dismiss_multiple.title": "Želite opustiti zahteve za obvestila?",
   "notification_requests.dismiss": "Zavrni",
   "notification_requests.edit_selection": "Uredi",
@@ -756,7 +741,6 @@
   "status.edit": "Uredi",
   "status.edited": "Zadnje urejanje {date}",
   "status.edited_x_times": "Urejeno {count, plural, one {#-krat} two {#-krat} few {#-krat} other {#-krat}}",
-  "status.embed": "Pridobite kodo za vgradnjo",
   "status.favourite": "Priljubljen_a",
   "status.favourites": "{count, plural, one {priljubitev} two {priljubitvi} few {priljubitve} other {priljubitev}}",
   "status.filter": "Filtriraj to objavo",

app/javascript/mastodon/locales/sq.json

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Të ndalet ndjekja e përdoruesit?",
   "content_warning.hide": "Fshihe postimin",
   "content_warning.show": "Shfaqe, sido qoftë",
-  "content_warning.show_more": "Shfaq më tepër",
   "conversation.delete": "Fshije bisedën",
   "conversation.mark_as_read": "Vëri shenjë si të lexuar",
   "conversation.open": "Shfaq bisedën",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Përdorni një kategori ekzistuese, ose krijoni një të re",
   "filter_modal.select_filter.title": "Filtroje këtë postim",
   "filter_modal.title.status": "Filtroni një postim",
-  "filter_warning.matches_filter": "Ka përkim me filtrin “<span>{title}</span>”",
+  "filter_warning.matches_filter": "Ka përkim me filtrin “{title}”",
   "filtered_notifications_banner.pending_requests": "Nga {count, plural, =0 {askush} one {një person} other {# vetë}} që mund të njihni",
   "filtered_notifications_banner.title": "Njoftime të filtruar",
   "firehose.all": "Krejt",
@@ -509,7 +508,6 @@
   "notification.favourite": "{name} i vuri shenjë postimit tuaj si të parapëlqyer",
   "notification.favourite.name_and_others_with_link": "{name} dhe <a>{count, plural, one {# tjetër} other {# të tjerë}}</a> i vunë shenjë postimit tuaj si të parapëlqyer",
   "notification.follow": "{name} zuri t’ju ndjekë",
-  "notification.follow.name_and_others": "Ju ndoqi {name} dhe <a>{count, plural, one {# tjetër} other {# të tjerë}}</a>",
   "notification.follow_request": "{name} ka kërkuar t’ju ndjekë",
   "notification.follow_request.name_and_others": "Ka kërkuar t’ju ndjekë {name} dhe {count, plural, one {# tjetër} other {# të tjerë}}",
   "notification.label.mention": "Përmendje",
@@ -568,7 +566,6 @@
   "notifications.column_settings.filter_bar.category": "Shtyllë filtrimesh të shpejta",
   "notifications.column_settings.follow": "Ndjekës të rinj:",
   "notifications.column_settings.follow_request": "Kërkesa të reja për ndjekje:",
-  "notifications.column_settings.group": "Grupoji",
   "notifications.column_settings.mention": "Përmendje:",
   "notifications.column_settings.poll": "Përfundime pyetësori:",
   "notifications.column_settings.push": "Njoftime Push",

app/javascript/mastodon/locales/sv.json

@@ -22,7 +22,7 @@
   "account.cancel_follow_request": "Återkalla din begäran om att få följa",
   "account.copy": "Kopiera länk till profil",
   "account.direct": "Nämn @{name} privat",
-  "account.disable_notifications": "Sluta meddela mig när @{name} skriver ett inlägg",
+  "account.disable_notifications": "Sluta notifiera mig när @{name} gör inlägg",
   "account.domain_blocked": "Domän blockerad",
   "account.edit_profile": "Redigera profil",
   "account.enable_notifications": "Notifiera mig när @{name} gör inlägg",
@@ -44,7 +44,7 @@
   "account.joined_short": "Gick med",
   "account.languages": "Ändra vilka språk du helst vill se i ditt flöde",
   "account.link_verified_on": "Ägarskap för denna länk kontrollerades den {date}",
-  "account.locked_info": "Detta konto har låst integritetsstatus. Ägaren väljer manuellt vem som kan följa det.",
+  "account.locked_info": "För detta konto har ägaren valt att manuellt godkänna vem som kan följa hen.",
   "account.media": "Media",
   "account.mention": "Nämn @{name}",
   "account.moved_to": "{name} har indikerat att hen har ett nytt konto:",
@@ -82,7 +82,7 @@
   "admin.impact_report.instance_follows": "Följare som deras användare skulle förlora",
   "admin.impact_report.title": "Sammanfattning av påverkan",
   "alert.rate_limited.message": "Vänligen försök igen efter {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Hastighetsbegränsad",
+  "alert.rate_limited.title": "Mängd begränsad",
   "alert.unexpected.message": "Ett oväntat fel uppstod.",
   "alert.unexpected.title": "Hoppsan!",
   "alt_text_badge.title": "Alt-Text",
@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Avfölj %s?",
   "content_warning.hide": "Dölj inlägg",
   "content_warning.show": "Visa ändå",
-  "content_warning.show_more": "Visa mer",
   "conversation.delete": "Radera konversation",
   "conversation.mark_as_read": "Markera som läst",
   "conversation.open": "Visa konversation",
@@ -271,7 +270,7 @@
   "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.",
   "empty_column.hashtag": "Det finns inget i denna hashtag ännu.",
-  "empty_column.home": "Din hemma-tidslinje är tom! Följ fler användare för att fylla den.",
+  "empty_column.home": "Din hemma-tidslinje är tom! Följ fler användare för att fylla den. {suggestions}",
   "empty_column.list": "Det finns inget i denna lista än. När listmedlemmar publicerar nya inlägg kommer de synas här.",
   "empty_column.lists": "Du har inga listor än. När skapar en kommer den dyka upp här.",
   "empty_column.mutes": "Du har ännu inte tystat några användare.",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Använd en befintlig kategori eller skapa en ny",
   "filter_modal.select_filter.title": "Filtrera detta inlägg",
   "filter_modal.title.status": "Filtrera ett inlägg",
-  "filter_warning.matches_filter": "Matchar filtret \"<span>{title}</span>\"",
+  "filter_warning.matches_filter": "Matchar filtret \"{title}\"",
   "filtered_notifications_banner.pending_requests": "Från {count, plural, =0 {ingen} one {en person} other {# personer}} du kanske känner",
   "filtered_notifications_banner.title": "Filtrerade aviseringar",
   "firehose.all": "Allt",
@@ -383,7 +382,7 @@
   "ignore_notifications_modal.not_following_title": "Vill du blockera aviseringar från personer som du inte följer dig?",
   "ignore_notifications_modal.private_mentions_title": "Vill du ignorera aviseringar från oönskade privata omnämningar?",
   "interaction_modal.description.favourite": "Med ett Mastodon-konto kan du favoritmarkera detta inlägg för att visa författaren att du gillar det och för att spara det till senare.",
-  "interaction_modal.description.follow": "Med ett Mastodon-konto kan du följa {name} för att se deras inlägg i ditt hemflöde.",
+  "interaction_modal.description.follow": "Med ett Mastodon-konto kan du följa {name} för att se hens inlägg i ditt hemflöde.",
   "interaction_modal.description.reblog": "Med ett Mastodon-konto kan du boosta detta inlägg för att dela den med dina egna följare.",
   "interaction_modal.description.reply": "Med ett Mastodon-konto kan du svara på detta inlägg.",
   "interaction_modal.login.action": "Ta hem mig",
@@ -403,37 +402,37 @@
   "keyboard_shortcuts.back": "Gå bakåt",
   "keyboard_shortcuts.blocked": "Öppna listan över blockerade användare",
   "keyboard_shortcuts.boost": "Boosta inlägg",
-  "keyboard_shortcuts.column": "Fokusera kolumn",
-  "keyboard_shortcuts.compose": "Fokusera skrivfältet",
+  "keyboard_shortcuts.column": "för att fokusera en status i en av kolumnerna",
+  "keyboard_shortcuts.compose": "för att fokusera skrivfältet",
   "keyboard_shortcuts.description": "Beskrivning",
   "keyboard_shortcuts.direct": "för att öppna privata nämningskolumnen",
-  "keyboard_shortcuts.down": "Flytta ner i listan",
+  "keyboard_shortcuts.down": "för att flytta nedåt i listan",
   "keyboard_shortcuts.enter": "Öppna inlägg",
   "keyboard_shortcuts.favourite": "Favoritmarkera inlägg",
   "keyboard_shortcuts.favourites": "Öppna favoritlistan",
   "keyboard_shortcuts.federated": "Öppna federerad tidslinje",
   "keyboard_shortcuts.heading": "Tangentbordsgenvägar",
-  "keyboard_shortcuts.home": "Öppna Hemtidslinjen",
+  "keyboard_shortcuts.home": "för att öppna Hem-tidslinjen",
   "keyboard_shortcuts.hotkey": "Kommando",
-  "keyboard_shortcuts.legend": "Visa denna översikt",
-  "keyboard_shortcuts.local": "Öppna lokal tidslinje",
-  "keyboard_shortcuts.mention": "Nämna skaparen",
+  "keyboard_shortcuts.legend": "för att visa denna översikt",
+  "keyboard_shortcuts.local": "för att öppna Lokal tidslinje",
+  "keyboard_shortcuts.mention": "för att nämna skaparen",
   "keyboard_shortcuts.muted": "Öppna listan över tystade användare",
-  "keyboard_shortcuts.my_profile": "Öppna din profil",
-  "keyboard_shortcuts.notifications": "Öppna meddelanden",
-  "keyboard_shortcuts.open_media": "Öppna media",
+  "keyboard_shortcuts.my_profile": "för att öppna din profil",
+  "keyboard_shortcuts.notifications": "för att öppna Meddelanden",
+  "keyboard_shortcuts.open_media": "öppna media",
   "keyboard_shortcuts.pinned": "Öppna listan över fästa inlägg",
-  "keyboard_shortcuts.profile": "Öppna författarens profil",
+  "keyboard_shortcuts.profile": "för att öppna skaparens profil",
   "keyboard_shortcuts.reply": "Svara på inlägg",
-  "keyboard_shortcuts.requests": "Öppna följförfrågningar",
-  "keyboard_shortcuts.search": "Fokusera sökfältet",
-  "keyboard_shortcuts.spoilers": "Visa/dölja CW-fält",
-  "keyboard_shortcuts.start": "Öppna \"Kom igång\"-kolumnen",
-  "keyboard_shortcuts.toggle_hidden": "Visa/gömma text bakom CW",
-  "keyboard_shortcuts.toggle_sensitivity": "Visa/gömma media",
+  "keyboard_shortcuts.requests": "för att öppna Följförfrågningar",
+  "keyboard_shortcuts.search": "för att fokusera sökfältet",
+  "keyboard_shortcuts.spoilers": "visa/dölja CW-fält",
+  "keyboard_shortcuts.start": "för att öppna \"Kom igång\"-kolumnen",
+  "keyboard_shortcuts.toggle_hidden": "för att visa/gömma text bakom CW",
+  "keyboard_shortcuts.toggle_sensitivity": "för att visa/gömma media",
   "keyboard_shortcuts.toot": "Starta nytt inlägg",
-  "keyboard_shortcuts.unfocus": "Avfokusera skrivfält/sökfält",
-  "keyboard_shortcuts.up": "Flytta uppåt i listan",
+  "keyboard_shortcuts.unfocus": "för att avfokusera skrivfält/sökfält",
+  "keyboard_shortcuts.up": "för att flytta uppåt i listan",
   "lightbox.close": "Stäng",
   "lightbox.next": "Nästa",
   "lightbox.previous": "Tidigare",
@@ -509,7 +508,6 @@
   "notification.favourite": "{name} favoritmarkerade ditt inlägg",
   "notification.favourite.name_and_others_with_link": "{name} och <a>{count, plural, one {# annan} other {# andra}}</a> har favoritmarkerat ditt inlägg",
   "notification.follow": "{name} följer dig",
-  "notification.follow.name_and_others": "{name} och <a>{count, plural, one {# annan} other {# andra}}</a> följer dig",
   "notification.follow_request": "{name} har begärt att följa dig",
   "notification.follow_request.name_and_others": "{name} och {count, plural, one {# en annan} other {# andra}} har bett att följa dig",
   "notification.label.mention": "Nämn",
@@ -568,7 +566,6 @@
   "notifications.column_settings.filter_bar.category": "Snabbfilter",
   "notifications.column_settings.follow": "Nya följare:",
   "notifications.column_settings.follow_request": "Ny följ-förfrågan:",
-  "notifications.column_settings.group": "Gruppera",
   "notifications.column_settings.mention": "Omnämningar:",
   "notifications.column_settings.poll": "Omröstningsresultat:",
   "notifications.column_settings.push": "Push-aviseringar",
@@ -615,11 +612,11 @@
   "onboarding.action.back": "Ta mig tillbaka",
   "onboarding.actions.back": "Ta mig tillbaka",
   "onboarding.actions.go_to_explore": "See what's trending",
-  "onboarding.actions.go_to_home": "Ta mig till mitt hemflöde",
+  "onboarding.actions.go_to_home": "Go to your home feed",
   "onboarding.compose.template": "Hallå #Mastodon!",
   "onboarding.follows.empty": "Tyvärr kan inga resultat visas just nu. Du kan prova att använda sökfunktionen eller utforska sidan för att hitta personer att följa, eller försök igen senare.",
-  "onboarding.follows.lead": "Ditt hemflöde är det primära sättet att uppleva Mastodon. Ju fler människor du följer, desto mer aktiv och intressant blir det. För att komma igång, är här några förslag:",
-  "onboarding.follows.title": "Anpassa ditt hemflöde",
+  "onboarding.follows.lead": "You curate your own home feed. The more people you follow, the more active and interesting it will be. These profiles may be a good starting point—you can always unfollow them later!",
+  "onboarding.follows.title": "Popular on Mastodon",
   "onboarding.profile.discoverable": "Gör min profil upptäckbar",
   "onboarding.profile.discoverable_hint": "När du väljer att vara upptäckbar på Mastodon kan dina inlägg visas i sök- och trendresultat, och din profil kan föreslås för personer med liknande intressen som du.",
   "onboarding.profile.display_name": "Visningsnamn",
@@ -640,7 +637,7 @@
   "onboarding.start.title": "Du klarade det!",
   "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
   "onboarding.steps.follow_people.title": "Follow {count, plural, one {one person} other {# people}}",
-  "onboarding.steps.publish_status.body": "Säg hej till världen med text, foton, videor eller omröstningar {emoji}",
+  "onboarding.steps.publish_status.body": "Say hello to the world.",
   "onboarding.steps.publish_status.title": "Gör ditt första inlägg",
   "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
   "onboarding.steps.setup_profile.title": "Customize your profile",
@@ -731,8 +728,8 @@
   "report.thanks.take_action_actionable": "Medan vi granskar detta kan du vidta åtgärder mot {name}:",
   "report.thanks.title": "Vill du inte se det här?",
   "report.thanks.title_actionable": "Tack för att du rapporterar, vi kommer att titta på detta.",
-  "report.unfollow": "Sluta följ @{name}",
-  "report.unfollow_explanation": "Du följer detta konto. Avfölj det för att inte se dess inlägg i ditt hemflöde.",
+  "report.unfollow": "Sluta följ @{username}",
+  "report.unfollow_explanation": "Du följer detta konto. Avfölj hen för att inte se hens inlägg i ditt hemflöde.",
   "report_notification.attached_statuses": "bifogade {count, plural, one {{count} inlägg} other {{count} inlägg}}",
   "report_notification.categories.legal": "Rättsligt",
   "report_notification.categories.legal_sentence": "olagligt innehåll",
@@ -827,7 +824,7 @@
   "status.show_less_all": "Visa mindre för alla",
   "status.show_more_all": "Visa mer för alla",
   "status.show_original": "Visa original",
-  "status.title.with_attachments": "{user} lade upp {attachmentCount, plural, one {en bilaga} other {{attachmentCount} bilagor}}",
+  "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.translate": "Översätt",
   "status.translated_from_with": "Översatt från {lang} med {provider}",
   "status.uncached_media_warning": "Förhandsvisning inte tillgänglig",

app/javascript/mastodon/locales/th.json

@@ -97,7 +97,7 @@
   "block_modal.they_will_know": "เขาสามารถเห็นว่ามีการปิดกั้นเขา",
   "block_modal.title": "ปิดกั้นผู้ใช้?",
   "block_modal.you_wont_see_mentions": "คุณจะไม่เห็นโพสต์ที่กล่าวถึงเขา",
-  "boost_modal.combo": "คุณสามารถกดปุ่ม {combo} เพื่อข้ามสิ่งนี้ในครั้งถัดไป",
+  "boost_modal.combo": "คุณสามารถกด {combo} เพื่อข้ามสิ่งนี้ในครั้งถัดไป",
   "boost_modal.reblog": "ดันโพสต์?",
   "boost_modal.undo_reblog": "เลิกดันโพสต์?",
   "bundle_column_error.copy_stacktrace": "คัดลอกรายงานข้อผิดพลาด",
@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "เลิกติดตามผู้ใช้?",
   "content_warning.hide": "ซ่อนโพสต์",
   "content_warning.show": "แสดงต่อไป",
-  "content_warning.show_more": "แสดงเพิ่มเติม",
   "conversation.delete": "ลบการสนทนา",
   "conversation.mark_as_read": "ทำเครื่องหมายว่าอ่านแล้ว",
   "conversation.open": "ดูการสนทนา",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "ใช้หมวดหมู่ที่มีอยู่หรือสร้างหมวดหมู่ใหม่",
   "filter_modal.select_filter.title": "กรองโพสต์นี้",
   "filter_modal.title.status": "กรองโพสต์",
-  "filter_warning.matches_filter": "ตรงกับตัวกรอง “<span>{title}</span>”",
+  "filter_warning.matches_filter": "ตรงกับตัวกรอง “{title}”",
   "filtered_notifications_banner.pending_requests": "จาก {count, plural, =0 {ไม่มีใคร} other {# คน}} ที่คุณอาจรู้จัก",
   "filtered_notifications_banner.title": "การแจ้งเตือนที่กรองอยู่",
   "firehose.all": "ทั้งหมด",
@@ -509,7 +508,6 @@
   "notification.favourite": "{name} ได้ชื่นชอบโพสต์ของคุณ",
   "notification.favourite.name_and_others_with_link": "{name} และ <a>{count, plural, other {# อื่น ๆ}}</a> ได้ชื่นชอบโพสต์ของคุณ",
   "notification.follow": "{name} ได้ติดตามคุณ",
-  "notification.follow.name_and_others": "{name} และ <a>{count, plural, other {# อื่น ๆ}}</a> ได้ติดตามคุณ",
   "notification.follow_request": "{name} ได้ขอติดตามคุณ",
   "notification.follow_request.name_and_others": "{name} และ {count, plural, other {# อื่น ๆ}} ได้ขอติดตามคุณ",
   "notification.label.mention": "การกล่าวถึง",
@@ -568,7 +566,6 @@
   "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": "การแจ้งเตือนแบบผลัก",
@@ -855,11 +852,6 @@
   "upload_error.poll": "ไม่อนุญาตการอัปโหลดไฟล์โดยมีการสำรวจความคิดเห็น",
   "upload_form.audio_description": "อธิบายสำหรับผู้ที่สูญเสียการได้ยิน",
   "upload_form.description": "อธิบายสำหรับผู้คนที่พิการทางการมองเห็นหรือมีสายตาเลือนราง",
-  "upload_form.drag_and_drop.instructions": "เพื่อหยิบไฟล์แนบสื่อ กดปุ่มเว้นวรรคหรือขึ้นบรรทัดใหม่ ขณะลาก ใช้ปุ่มลูกศรเพื่อย้ายไฟล์แนบสื่อในทิศทางใดก็ตามที่กำหนด กดปุ่มเว้นวรรคหรือขึ้นบรรทัดใหม่อีกครั้งเพื่อปล่อยไฟล์แนบสื่อในตำแหน่งใหม่ หรือกดปุ่ม Escape เพื่อยกเลิก",
-  "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} แล้ว",
-  "upload_form.drag_and_drop.on_drag_start": "หยิบไฟล์แนบสื่อ {item} แล้ว",
   "upload_form.edit": "แก้ไข",
   "upload_form.thumbnail": "เปลี่ยนภาพขนาดย่อ",
   "upload_form.video_description": "อธิบายสำหรับผู้คนที่พิการทางการได้ยิน ได้ยินไม่ชัด พิการทางการมองเห็น หรือมีสายตาเลือนราง",

app/javascript/mastodon/locales/tok.json

@@ -1,16 +1,13 @@
 {
   "about.blocks": "ma lawa",
   "about.contact": "toki:",
-  "about.disclaimer": "ilo Masoton la, jan ale li ken kama jo e ona kepeken mani ala, li ken ante e toki ilo ona. kulupu esun Mastodon li jo e nimi ona. kulupu esun Mastodon li nasin lawa gGmbH.",
   "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.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 lili lukin",
   "about.domain_blocks.suspended.title": "weka",
   "about.not_available": "lon kulupu ni la sina ken alasa ala e sona ni.",
-  "about.powered_by": "lipu kulupu pi jan lawa mute tan {mastodon}",
   "about.rules": "lawa kulupu",
-  "account.account_note_header": "sona pi sina taso",
   "account.add_or_remove_from_list": "o ante e lipu jan",
   "account.badges.bot": "ilo nanpa li lawa e ni",
   "account.badges.group": "kulupu",
@@ -22,27 +19,23 @@
   "account.copy": "o pali same e linja pi lipu jan",
   "account.direct": "len la o mu e @{name}",
   "account.disable_notifications": "@{name} li toki la o mu ala e mi",
-  "account.domain_blocked": "sina wile ala lukin e ma ni",
+  "account.domain_blocked": "ma ni li weka tawa sina",
   "account.edit_profile": "o ante e lipu mi",
   "account.enable_notifications": "@{name} li toki la o toki e toki ona tawa mi",
   "account.endorse": "lipu jan la o suli e ni",
   "account.featured_tags.last_status_at": "sitelen pini pi jan ni li lon tenpo {date}",
   "account.featured_tags.last_status_never": "toki ala li lon",
-  "account.featured_tags.title": "{name} la kulupu ni pi toki suli li pona",
   "account.follow": "o kute",
   "account.follow_back": "jan ni li kute e sina. o 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.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.go_to_profile": "o tawa lipu jan",
   "account.hide_reblogs": "o lukin ala e pana toki tan @{name}",
   "account.in_memoriam": "jan ni li moli. pona o tawa ona.",
   "account.joined_short": "li kama",
   "account.languages": "sina wile lukin e sitelen pi toki seme",
-  "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 toki e jan @{name}",
@@ -51,7 +44,6 @@
   "account.mute_notifications_short": "o kute ala e mu tan jan ni",
   "account.mute_short": "o kute ala",
   "account.muted": "sina len e jan ni",
-  "account.mutual": "jan pona sona",
   "account.no_bio": "lipu li weka",
   "account.open_original_page": "o open e lipu open",
   "account.posts": "toki suli",
@@ -61,7 +53,6 @@
   "account.requested_follow": "{name} li wile kute e sina",
   "account.share": "o pana e lipu jan @{name}",
   "account.show_reblogs": "o lukin e pana toki tan @{name}",
-  "account.statuses_counter": "{count, plural, other {toki {counter}}}",
   "account.unblock": "o weka ala e jan {name}",
   "account.unblock_domain": "o weka ala e ma {domain}",
   "account.unblock_short": "o pini weka",
@@ -70,24 +61,18 @@
   "account.unmute": "o len ala e @{name}",
   "account.unmute_notifications_short": "o kute e mu tan jan ni",
   "account.unmute_short": "o len ala",
-  "account_note.placeholder": "o luka e ni la sona pi sina taso",
   "admin.dashboard.retention.average": "sama",
   "admin.dashboard.retention.cohort": "tenpo mun open",
   "admin.dashboard.retention.cohort_size": "jan sin",
   "alert.rate_limited.message": "tenpo {retry_time, time, medium} la o pali awen",
   "alert.unexpected.message": "pakala li lon",
   "alert.unexpected.title": "pakala a!",
-  "alt_text_badge.title": "toki sona sitelen",
   "announcement.announcement": "toki suli",
-  "attachments_list.unprocessed": "(nasin open)",
   "audio.hide": "o len e kalama",
   "block_modal.show_less": "o lili e lukin",
   "block_modal.show_more": "o mute e lukin",
   "block_modal.they_cant_mention": "ona li ken ala toki e sina li ken ala alasa e sina",
-  "block_modal.they_cant_see_posts": "ona li ken ala lukin e toki sina. sina ken ala lukin e toki ona.",
-  "block_modal.they_will_know": "ona li sona e ni: sina ala e lukin ona.",
   "block_modal.title": "o weka ala weka e jan",
-  "block_modal.you_wont_see_mentions": "nimi ona li lon toki suli la sina lukin ala e toki ni.",
   "boost_modal.combo": "sina ken luka e nena {combo} tawa ni: sina wile ala luka e nena lon tenpo kama",
   "bundle_column_error.copy_stacktrace": "o awen e sona pakala lon ilo sina",
   "bundle_column_error.error.body": "ilo li ken ala pana e lipu ni. ni li ken tan pakala ilo.",
@@ -100,22 +85,17 @@
   "bundle_modal_error.close": "o pini",
   "bundle_modal_error.message": "ilo li wile kama e ijo ni, taso pakala li lon.",
   "bundle_modal_error.retry": "o ni sin",
-  "closed_registrations.other_server_instructions": "kulupu Masoton li jo e jan lawa mute, la sina ken pali e sijelo lon ma ante, li ken lukin e ijo pi ma ni.",
   "closed_registrations_modal.find_another_server": "o alasa e ma ante",
-  "closed_registrations_modal.title": "sina kama lon kulupu Masoton",
   "column.about": "sona",
   "column.blocks": "kulupu pi jan weka",
   "column.bookmarks": "awen toki",
   "column.community": "linja tenpo pi ma ni",
-  "column.directory": "o lukin e jan",
-  "column.domain_blocks": "ma pi wile ala lukin",
   "column.favourites": "ijo pona",
   "column.firehose": "toki pi tenpo ni",
   "column.follow_requests": "wile alasa pi jan ante",
   "column.home": "lipu open",
   "column.lists": "kulupu lipu",
   "column.mutes": "jan len",
-  "column.notifications": "mu pi sona sin",
   "column.pins": "toki sewi",
   "column_back_button.label": "o tawa monsi",
   "column_header.hide_settings": "o len e lawa",
@@ -137,7 +117,7 @@
   "compose_form.poll.duration": "tenpo pana",
   "compose_form.poll.multiple": "pana mute",
   "compose_form.poll.option_placeholder": "ken nanpa {number}",
-  "compose_form.poll.single": "o wile e wan taso",
+  "compose_form.poll.single": "pana pi wan taso",
   "compose_form.poll.switch_to_multiple": "o ante e nasin pana. pana mute o ken",
   "compose_form.poll.switch_to_single": "o ante e nasin pana. pana wan taso o lon",
   "compose_form.poll.type": "nasin",
@@ -281,12 +261,9 @@
   "lists.edit.submit": "o ante e nimi",
   "lists.exclusive": "o len e toki lon lipu open",
   "lists.new.create": "o sin e kulupu lipu",
-  "lists.new.title_placeholder": "nimi pi kulupu sin",
   "lists.replies_policy.followed": "jan kute ale",
   "lists.replies_policy.list": "jan pi kulupu ni taso",
   "lists.replies_policy.none": "jan ala",
-  "lists.replies_policy.title": "jan ni li ken lukin e toki lili:",
-  "lists.search": "o alasa lon kulupu jan ni: sina kute e ona",
   "lists.subheading": "kulupu lipu sina",
   "load_pending": "{count, plural, other {ijo sin #}}",
   "loading_indicator.label": "ni li kama…",
@@ -324,32 +301,13 @@
   "notifications.filter.polls": "pana lon pana ni",
   "onboarding.action.back": "o tawa monsi",
   "onboarding.actions.back": "o tawa monsi",
-  "onboarding.actions.go_to_explore": "seme li pona tawa jan mute",
-  "onboarding.actions.go_to_home": "o tawa lipu open mi",
-  "onboarding.compose.template": "toki a, kulupu #Mastodon o!",
-  "onboarding.follows.lead": "lipu open li nasin nanpa wan pi ilo Masoton. sina kute e jan mute la, musi mute li lon. open la, ni li ken pona:",
-  "onboarding.follows.title": "o ante e lipu open sina",
+  "onboarding.compose.template": "toki a, #Mastodon o!",
   "onboarding.profile.display_name": "nimi tawa jan ante",
-  "onboarding.profile.lead": "sina ken pana e ni lon tenpo kama, lon lipu pi ante nasin. ona la, nasin ante mute li lon.",
   "onboarding.profile.note": "sona sina",
   "onboarding.share.lead": "o toki lon nasin Masoton pi alasa sina tawa jan",
   "onboarding.share.message": "ilo #Mastodon la mi jan {username} a! o kute e mi lon ni: {url}",
-  "onboarding.share.next_steps": "ken la ni li pali kama pona:",
-  "onboarding.share.title": "o pana e lipu sina",
-  "onboarding.start.lead": "ni la sina lon kulupu Masoton. kulupu ante ala li sama ona. ona li jo e jan lawa pi wan taso ala. ilo li pana ala e ijo pi wile ala tawa sina, sina ken lon e wile sina. nasin kulupu sin ni la mi o open:",
-  "onboarding.start.skip": "sina wile ala kama sona e nasin open anu seme?",
   "onboarding.start.title": "sina o kama pona a!",
-  "onboarding.steps.follow_people.body": "lipu Masoton la, sina ken kute e jan namako.",
-  "onboarding.steps.follow_people.title": "o ante e lipu open sina",
-  "onboarding.steps.publish_status.body": "o toki tawa ale kepeken sitelen nimi, kepeken sitelen kule, kepeken sitelen tawa, kepeken alasa sona kulupu {emoji}",
-  "onboarding.steps.publish_status.title": "o pali e toki suli sina nanpa wan",
-  "onboarding.steps.setup_profile.body": "lipu sina li jo e sona mute la jan mute li wile toki tawa sina.",
-  "onboarding.steps.setup_profile.title": "o ante e lipu sina",
-  "onboarding.steps.share_profile.body": "jan pona sina o ken alasa e sina lon lipu Masoton",
-  "onboarding.steps.share_profile.title": "o pana e lipu sina",
-  "onboarding.tips.accounts_from_other_servers": "<strong>sina sona ala sona?</strong> kulupu Masoton li jo e jan lawa mute e ma mute la, sina ken lukin e jan pi ma ilo ante. taso sina ken toki tawa ona kepeken wawa lili a! nimi jan la, nimi nanpa wan li nimi jan, nimi nanpa tu li nimi ma!",
   "onboarding.tips.migration": "<strong>sina sona ala sona e ni?</strong> tenpo kama la sina pilin ike tawa ma {domain} la, sina ken tawa ma ante lon ilo Masoton. jan li kute e sina la jan ni li awen kute e sina. kin la sina ken lawa e ma pi sina taso a!",
-  "onboarding.tips.verification": "<strong>sina sona ala sona?</strong> sina ken pana e lipu ilo sina tawa lipu sina pi ilo Masoton. sina ken pala e lipu sina pi ilo Masoton tawa lipu ilo sina. sina ni tu la, jan ale li sona e ni: nimi sina la sina toki e lon. ni li wile ala e mani e lipu jan lawa a!",
   "poll.closed": "ona li pini",
   "poll.total_people": "{count, plural, other {jan #}}",
   "poll.total_votes": "{count, plural, other {pana #}}",
@@ -386,17 +344,10 @@
   "report.unfollow": "o pini kute e {name}",
   "report_notification.categories.legal": "ike tawa nasin lawa",
   "report_notification.categories.other": "ante",
-  "search.no_recent_searches": "alasa ala li lon tenpo poka",
   "search.placeholder": "o alasa",
   "search.quick_action.go_to_account": "o tawa lipu jan {x}",
   "search_popout.language_code": "nimi toki kepeken nasin ISO",
-  "search_popout.recent": "alasa pi tenpo poka",
-  "search_popout.specific_date": "tenpo suno wan",
-  "search_popout.user": "jan",
-  "search_results.accounts": "lipu jan",
   "search_results.all": "ale",
-  "search_results.hashtags": "kulupu pi toki suli",
-  "search_results.nothing_found": "nimi alasa ni la mi lukin e ala",
   "search_results.see_all": "ale",
   "search_results.statuses": "toki",
   "search_results.title": "o alasa e {q}",

app/javascript/mastodon/locales/tr.json

@@ -81,7 +81,7 @@
   "admin.impact_report.instance_followers": "Kullanıcılarımızın kaybedeceği takipçiler",
   "admin.impact_report.instance_follows": "Kullanıcılarının kaybedeceği takipçiler",
   "admin.impact_report.title": "Etki özeti",
-  "alert.rate_limited.message": "Lütfen sonra tekrar deneyin {retry_time, time, medium}.",
+  "alert.rate_limited.message": "Lütfen {retry_time, time, medium} saatinden sonra tekrar deneyin.",
   "alert.rate_limited.title": "Aşırı istek gönderildi",
   "alert.unexpected.message": "Beklenmedik bir hata oluştu.",
   "alert.unexpected.title": "Hay aksi!",
@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Kullanıcıyı takipten çık?",
   "content_warning.hide": "Gönderiyi gizle",
   "content_warning.show": "Yine de göster",
-  "content_warning.show_more": "Daha fazla göster",
   "conversation.delete": "Sohbeti sil",
   "conversation.mark_as_read": "Okundu olarak işaretle",
   "conversation.open": "Sohbeti görüntüle",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Mevcut bir kategoriyi kullan veya yeni bir tane oluştur",
   "filter_modal.select_filter.title": "Bu gönderiyi süzgeçle",
   "filter_modal.title.status": "Bir gönderi süzgeçle",
-  "filter_warning.matches_filter": "“<span>{title}</span>” filtresiyle eşleşiyor",
+  "filter_warning.matches_filter": "“{title}” filtresiyle eşleşiyor",
   "filtered_notifications_banner.pending_requests": "Bildiğiniz {count, plural, =0 {hiç kimseden} one {bir kişiden} other {# kişiden}}",
   "filtered_notifications_banner.title": "Filtrelenmiş bildirimler",
   "firehose.all": "Tümü",
@@ -339,7 +338,7 @@
   "footer.privacy_policy": "Gizlilik politikası",
   "footer.source_code": "Kaynak kodu görüntüle",
   "footer.status": "Durum",
-  "generic.saved": "Kaydet",
+  "generic.saved": "Kaydedildi",
   "getting_started.heading": "Başlarken",
   "hashtag.column_header.tag_mode.all": "ve {additional}",
   "hashtag.column_header.tag_mode.any": "ya da {additional}",

app/javascript/mastodon/locales/uk.json

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Відписатися від користувача?",
   "content_warning.hide": "Сховати допис",
   "content_warning.show": "Усе одно показати",
-  "content_warning.show_more": "Показати більше",
   "conversation.delete": "Видалити бесіду",
   "conversation.mark_as_read": "Позначити як прочитане",
   "conversation.open": "Переглянути бесіду",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Використати наявну категорію або створити нову",
   "filter_modal.select_filter.title": "Фільтрувати цей допис",
   "filter_modal.title.status": "Фільтрувати допис",
-  "filter_warning.matches_filter": "Збігається з фільтром “<span>{title}</span>”",
+  "filter_warning.matches_filter": "Збігається з фільтром “{title}”",
   "filtered_notifications_banner.pending_requests": "Від {count, plural, =0 {жодної особи} one {однієї особи} few {# осіб} many {# осіб} other {# особи}}, котрих ви можете знати",
   "filtered_notifications_banner.title": "Відфільтровані сповіщення",
   "firehose.all": "Всі",
@@ -509,7 +508,6 @@
   "notification.favourite": "Ваш допис сподобався {name}",
   "notification.favourite.name_and_others_with_link": "{name} та <a>{count, plural, one {# інший} few {# інших} many {# інших} other {# інший}}</a> вподобали ваш допис",
   "notification.follow": "{name} підписалися на вас",
-  "notification.follow.name_and_others": "{name} та <a>{count, plural, one {# інший} few {# інших} many {# інших} other {# інший}}</a> стежать за вами",
   "notification.follow_request": "{name} відправили запит на підписку",
   "notification.follow_request.name_and_others": "{name} та {count, plural, one {# інший} few {# інших} many {# інших} other {# інший}} надсилають вам запит на стеження",
   "notification.label.mention": "Згадка",
@@ -568,7 +566,7 @@
   "notifications.column_settings.filter_bar.category": "Панель швидкого фільтра",
   "notifications.column_settings.follow": "Нові підписники:",
   "notifications.column_settings.follow_request": "Нові запити на підписку:",
-  "notifications.column_settings.group": "Групувати",
+  "notifications.column_settings.group": "Група",
   "notifications.column_settings.mention": "Згадки:",
   "notifications.column_settings.poll": "Результати опитування:",
   "notifications.column_settings.push": "Push-сповіщення",

app/javascript/mastodon/locales/vi.json

@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "Bỏ theo dõi",
   "content_warning.hide": "Ẩn lại",
   "content_warning.show": "Nhấn để xem",
-  "content_warning.show_more": "Hiện thêm",
   "conversation.delete": "Xóa tin nhắn này",
   "conversation.mark_as_read": "Đánh dấu là đã đọc",
   "conversation.open": "Xem toàn bộ tin nhắn",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "Sử dụng một danh mục hiện có hoặc tạo một danh mục mới",
   "filter_modal.select_filter.title": "Lọc tút này",
   "filter_modal.title.status": "Lọc một tút",
-  "filter_warning.matches_filter": "Khớp bộ lọc “<span>{title}</span>”",
+  "filter_warning.matches_filter": "Khớp bộ lọc “{title}”",
   "filtered_notifications_banner.pending_requests": "Từ {count, plural, =0 {không ai} other {# người}} bạn có thể biết",
   "filtered_notifications_banner.title": "Thông báo đã lọc",
   "firehose.all": "Toàn bộ",

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

@@ -11,7 +11,7 @@
   "about.not_available": "此信息在当前服务器尚不可用。",
   "about.powered_by": "由 {mastodon} 驱动的去中心化社交媒体",
   "about.rules": "站点规则",
-  "account.account_note_header": "备注",
+  "account.account_note_header": "个人备注",
   "account.add_or_remove_from_list": "从列表中添加或移除",
   "account.badges.bot": "机器人",
   "account.badges.group": "群组",
@@ -26,8 +26,8 @@
   "account.domain_blocked": "域名已屏蔽",
   "account.edit_profile": "修改个人资料",
   "account.enable_notifications": "当 @{name} 发布嘟文时通知我",
-  "account.endorse": "在账户页推荐此用户",
-  "account.featured_tags.last_status_at": "上次发言于 {date}",
+  "account.endorse": "在个人资料中推荐此用户",
+  "account.featured_tags.last_status_at": "最近发言于 {date}",
   "account.featured_tags.last_status_never": "暂无嘟文",
   "account.featured_tags.title": "{name} 的精选标签",
   "account.follow": "关注",
@@ -36,15 +36,15 @@
   "account.followers.empty": "目前无人关注此用户。",
   "account.followers_counter": "{count, plural, other {{counter} 关注者}}",
   "account.following": "正在关注",
-  "account.following_counter": "{count, plural, other {{counter} 正在关注}}",
+  "account.following_counter": "正在关注 {count, plural, other {{counter} 人}}",
   "account.follows.empty": "此用户目前未关注任何人。",
   "account.go_to_profile": "前往个人资料页",
   "account.hide_reblogs": "隐藏来自 @{name} 的转嘟",
   "account.in_memoriam": "谨此悼念。",
   "account.joined_short": "加入于",
   "account.languages": "更改订阅语言",
-  "account.link_verified_on": "已于 {date} 验证此链接的所有权",
-  "account.locked_info": "此账户已锁嘟。账户所有人会手动审核新关注者。",
+  "account.link_verified_on": "此链接的所有权已在 {date} 检查",
+  "account.locked_info": "此账户已锁嘟。账户所有者会手动审核关注者。",
   "account.media": "媒体",
   "account.mention": "提及 @{name}",
   "account.moved_to": "{name} 的新账号是：",
@@ -60,9 +60,9 @@
   "account.report": "举报 @{name}",
   "account.requested": "正在等待对方同意。点击取消发送关注请求",
   "account.requested_follow": "{name} 向你发送了关注请求",
-  "account.share": "分享 @{name} 的账户页",
+  "account.share": "分享 @{name} 的个人资料页",
   "account.show_reblogs": "显示来自 @{name} 的转嘟",
-  "account.statuses_counter": "{count, plural, other {{counter} 嘟文}}",
+  "account.statuses_counter": "{count, plural, other {{counter} 条嘟文}}",
   "account.unblock": "取消屏蔽 @{name}",
   "account.unblock_domain": "取消屏蔽 {domain} 域名",
   "account.unblock_short": "取消屏蔽",
@@ -77,7 +77,7 @@
   "admin.dashboard.retention.average": "平均",
   "admin.dashboard.retention.cohort": "注册月份",
   "admin.dashboard.retention.cohort_size": "新用户",
-  "admin.impact_report.instance_accounts": "将被删除的账户",
+  "admin.impact_report.instance_accounts": "将要删除的账户资料",
   "admin.impact_report.instance_followers": "本实例用户即将丢失的关注者",
   "admin.impact_report.instance_follows": "对方实例用户将会丢失的关注者",
   "admin.impact_report.title": "影响摘要",
@@ -89,7 +89,7 @@
   "announcement.announcement": "公告",
   "attachments_list.unprocessed": "(未处理)",
   "audio.hide": "隐藏音频",
-  "block_modal.remote_users_caveat": "我们将要求服务器 {domain} 尊重你的决定。然而，我们无法保证对方一定遵从，因为某些服务器可能会以不同的方案处理屏蔽操作。公开嘟文仍然可能对未登录的用户可见。",
+  "block_modal.remote_users_caveat": "我们将要求服务器 {domain} 尊重您的决定。然而，我们无法保证对方一定遵从，因为某些服务器可能会以不同的方案处理屏蔽操作。公开嘟文仍然可能对未登录的用户可见。",
   "block_modal.show_less": "隐藏",
   "block_modal.show_more": "显示更多",
   "block_modal.they_cant_mention": "他们不能提及或关注你。",
@@ -112,15 +112,15 @@
   "bundle_modal_error.close": "关闭",
   "bundle_modal_error.message": "载入这个组件时发生了错误。",
   "bundle_modal_error.retry": "重试",
-  "closed_registrations.other_server_instructions": "基于 Mastodon 的去中心化特性，你可以在其它服务器上创建账号，并与本站用户保持互动。",
-  "closed_registrations_modal.description": "你目前无法在 {domain} 上创建账户，但请注意，使用 Mastodon 并非需要专门在 {domain} 上注册账户。",
+  "closed_registrations.other_server_instructions": "基于 Mastodon 去中心化的特性，你可以在其它服务器上创建账号并继续与此服务器互动。",
+  "closed_registrations_modal.description": "您目前无法在 {domain} 上创建账户，但请注意，使用 Mastodon 并非需要专门在 {domain} 上注册账户。",
   "closed_registrations_modal.find_another_server": "查找其他服务器",
   "closed_registrations_modal.preamble": "Mastodon 是去中心化的，所以无论在哪个实例创建账号，都可以关注本服务器上的账号并与之交流。 或者你还可以自己搭建实例！",
   "closed_registrations_modal.title": "注册 Mastodon 账号",
   "column.about": "关于",
   "column.blocks": "屏蔽的用户",
-  "column.bookmarks": "收藏夹",
-  "column.community": "本站时间线",
+  "column.bookmarks": "书签",
+  "column.community": "本站时间轴",
   "column.direct": "私下提及",
   "column.directory": "浏览用户资料",
   "column.domain_blocks": "已屏蔽的域名",
@@ -132,7 +132,7 @@
   "column.mutes": "已隐藏的用户",
   "column.notifications": "通知",
   "column.pins": "置顶嘟文",
-  "column.public": "跨站公共时间线",
+  "column.public": "跨站公共时间轴",
   "column_back_button.label": "返回",
   "column_header.hide_settings": "隐藏设置",
   "column_header.moveLeft_settings": "将此栏左移",
@@ -142,8 +142,8 @@
   "column_header.unpin": "取消置顶",
   "column_subheading.settings": "设置",
   "community.column_settings.local_only": "仅限本站",
-  "community.column_settings.media_only": "仅媒体",
-  "community.column_settings.remote_only": "仅外站",
+  "community.column_settings.media_only": "仅限媒体",
+  "community.column_settings.remote_only": "仅限外部",
   "compose.language.change": "更改语言",
   "compose.language.search": "搜索语言...",
   "compose.published.body": "嘟文已发布。",
@@ -153,7 +153,7 @@
   "compose_form.encryption_warning": "Mastodon 上的嘟文未经端到端加密。请勿在 Mastodon 上分享敏感信息。",
   "compose_form.hashtag_warning": "这条嘟文被设置为“不公开”，因此它不会出现在任何话题标签的列表下。只有公开的嘟文才能通过话题标签进行搜索。",
   "compose_form.lock_disclaimer": "你的账户没有{locked}。任何人都可以在关注你后立即查看仅关注者可见的嘟文。",
-  "compose_form.lock_disclaimer.lock": "锁嘟",
+  "compose_form.lock_disclaimer.lock": "开启保护",
   "compose_form.placeholder": "想写什么？",
   "compose_form.poll.duration": "投票期限",
   "compose_form.poll.multiple": "多选",
@@ -161,11 +161,11 @@
   "compose_form.poll.single": "单选",
   "compose_form.poll.switch_to_multiple": "将投票改为多选",
   "compose_form.poll.switch_to_single": "将投票改为单选",
-  "compose_form.poll.type": "类型",
+  "compose_form.poll.type": "样式",
   "compose_form.publish": "发布",
-  "compose_form.publish_form": "新嘟文",
+  "compose_form.publish_form": "发布",
   "compose_form.reply": "回复",
-  "compose_form.save_changes": "更改",
+  "compose_form.save_changes": "更新",
   "compose_form.spoiler.marked": "移除内容警告",
   "compose_form.spoiler.unmarked": "添加内容警告",
   "compose_form.spoiler_placeholder": "内容警告 (可选)",
@@ -173,15 +173,15 @@
   "confirmations.block.confirm": "屏蔽",
   "confirmations.delete.confirm": "删除",
   "confirmations.delete.message": "你确定要删除这条嘟文吗？",
-  "confirmations.delete.title": "是否删除嘟文？",
+  "confirmations.delete.title": "确认删除嘟文？",
   "confirmations.delete_list.confirm": "删除",
-  "confirmations.delete_list.message": "你确定要永久删除此列表吗？",
-  "confirmations.delete_list.title": "是否删除列表？",
+  "confirmations.delete_list.message": "确定永久删除这个列表吗？",
+  "confirmations.delete_list.title": "确认删除列表？",
   "confirmations.discard_edit_media.confirm": "丢弃",
-  "confirmations.discard_edit_media.message": "你还有未保存的媒体描述或预览修改，仍要丢弃吗？",
+  "confirmations.discard_edit_media.message": "您还有未保存的媒体描述或预览修改，仍要丢弃吗？",
   "confirmations.edit.confirm": "编辑",
   "confirmations.edit.message": "编辑此消息将会覆盖当前正在撰写的信息。仍要继续吗？",
-  "confirmations.edit.title": "是否重写嘟文？",
+  "confirmations.edit.title": "确认覆盖嘟文？",
   "confirmations.logout.confirm": "退出登录",
   "confirmations.logout.message": "确定要退出登录吗？",
   "confirmations.logout.title": "是否退出登录？",
@@ -191,13 +191,12 @@
   "confirmations.redraft.title": "是否删除并重新编辑嘟文？",
   "confirmations.reply.confirm": "回复",
   "confirmations.reply.message": "回复此消息将会覆盖当前正在编辑的信息。确定继续吗？",
-  "confirmations.reply.title": "是否重写嘟文？",
+  "confirmations.reply.title": "确认覆盖嘟文？",
   "confirmations.unfollow.confirm": "取消关注",
   "confirmations.unfollow.message": "你确定要取消关注 {name} 吗？",
   "confirmations.unfollow.title": "是否取消关注用户？",
-  "content_warning.hide": "隐藏",
-  "content_warning.show": "展开",
-  "content_warning.show_more": "展开",
+  "content_warning.hide": "隐藏嘟文",
+  "content_warning.show": "仍然显示",
   "conversation.delete": "删除对话",
   "conversation.mark_as_read": "标记为已读",
   "conversation.open": "查看对话",
@@ -210,42 +209,42 @@
   "directory.new_arrivals": "新来者",
   "directory.recently_active": "最近活跃",
   "disabled_account_banner.account_settings": "账号设置",
-  "disabled_account_banner.text": "你的账号 {disabledAccount} 目前已被禁用。",
+  "disabled_account_banner.text": "您的账号 {disabledAccount} 目前已被禁用。",
   "dismissable_banner.community_timeline": "这些是来自 {domain} 用户的最新公开嘟文。",
   "dismissable_banner.dismiss": "忽略",
   "dismissable_banner.explore_links": "这些新闻故事正被本站和分布式网络上其他站点的用户谈论。",
   "dismissable_banner.explore_statuses": "这些是目前在社交网络上引起关注的嘟文。嘟文的喜欢和转嘟次数越多，排名越高。",
   "dismissable_banner.explore_tags": "这些标签正在本站和分布式网络上其他站点的用户中引起关注。",
-  "dismissable_banner.public_timeline": "这些是 {domain} 上的用户关注的人的最新公开嘟文。",
+  "dismissable_banner.public_timeline": "这些是在 {domain} 上关注的人们最新发布的公开嘟文。",
   "domain_block_modal.block": "屏蔽服务器",
   "domain_block_modal.block_account_instead": "改为屏蔽 @{name}",
   "domain_block_modal.they_can_interact_with_old_posts": "来自该服务器的人可以与你之前的嘟文交互。",
   "domain_block_modal.they_cant_follow": "此服务器上没有人可以关注你。",
   "domain_block_modal.they_wont_know": "对方不会知道自己被屏蔽。",
-  "domain_block_modal.title": "是否屏蔽该域名？",
+  "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_relationships": "你将失去在此实例上的所有关注和关注者。",
   "domain_block_modal.you_wont_see_posts": "你将不会看到此服务器上用户的嘟文或通知。",
-  "domain_pill.activitypub_lets_connect": "它可以让你与不同社交应用上的人交流互动，而不仅限于 Mastodon。",
+  "domain_pill.activitypub_lets_connect": "它让你不仅能与 Mastodon 上的人交流互动，还能与其它不同社交应用上的人联系。",
   "domain_pill.activitypub_like_language": "ActivityPub 好比 Mastodon 与其它社交网络交流时使用的语言。",
   "domain_pill.server": "服务器",
-  "domain_pill.their_handle": "对方用户名：",
+  "domain_pill.their_handle": "对方代号：",
   "domain_pill.their_server": "对方的数字家园，对方的所有嘟文都存放在那里。",
-  "domain_pill.their_username": "对方在其服务器上的唯一标识。不同服务器上可能会存在相同用户名的用户。",
+  "domain_pill.their_username": "对方在其服务器上的唯一标识符。不同服务器上可能会存在相同用户名的用户。",
   "domain_pill.username": "用户名",
-  "domain_pill.whats_in_a_handle": "用户名的构成",
-  "domain_pill.who_they_are": "用户名可以表明用户的身份和其所在站点，这样你就可以通过<button>基于 ActivityPub 的平台</button>在社交网络和人们互动。",
-  "domain_pill.who_you_are": "用户名可以表明你的身份和你所在的站点，这样人们就可以通过<button>基于 ActivityPub 的平台</button>在社交网络与你互动。",
-  "domain_pill.your_handle": "你的用户名：",
-  "domain_pill.your_server": "你的数字家园，你的所有嘟文都在此存储。不喜欢这里吗？你可以随时迁移到其它服务器，并带上你的关注者。",
-  "domain_pill.your_username": "你在此服务器上的唯一标识。不同服务器上可能存在相同用户名的用户。",
+  "domain_pill.whats_in_a_handle": "代号里都有什么？",
+  "domain_pill.who_they_are": "代号可以表明用户和其所在站点，你可以在社交网络上与<button>由 ActivityPub 驱动的不同平台</button>的人们互动。",
+  "domain_pill.who_you_are": "代号可以表明你自己和你所在站点，社交网络上来自<button>由 ActivityPub 驱动的不同平台</button>的人们因此可以与你互动。",
+  "domain_pill.your_handle": "你的代号：",
+  "domain_pill.your_server": "你的数字家园，你的所有嘟文都存放在这里。不喜欢这个服务器吗？随时带上你的关注者一起迁移到其它服务器。",
+  "domain_pill.your_username": "你在这个服务器上的唯一标识符。不同服务器上可能会存在相同用户名的用户。",
   "embed.instructions": "复制下列代码以在你的网站中嵌入此嘟文。",
-  "embed.preview": "这是它的预览效果：",
+  "embed.preview": "它会像这样显示出来：",
   "emoji_button.activity": "活动",
   "emoji_button.clear": "清除",
   "emoji_button.custom": "自定义",
   "emoji_button.flags": "旗帜",
-  "emoji_button.food": "食物与饮料",
+  "emoji_button.food": "食物和饮料",
   "emoji_button.label": "插入表情符号",
   "emoji_button.nature": "自然",
   "emoji_button.not_found": "未找到匹配的表情符号",
@@ -255,27 +254,27 @@
   "emoji_button.search": "搜索…",
   "emoji_button.search_results": "搜索结果",
   "emoji_button.symbols": "符号",
-  "emoji_button.travel": "旅行与地点",
-  "empty_column.account_hides_collections": "该用户选择不公开此信息",
+  "emoji_button.travel": "旅行和地点",
+  "empty_column.account_hides_collections": "该用户选择不提供此信息",
   "empty_column.account_suspended": "账户已被停用",
   "empty_column.account_timeline": "这里没有嘟文！",
   "empty_column.account_unavailable": "个人资料不可用",
   "empty_column.blocks": "你还未屏蔽任何用户。",
-  "empty_column.bookmarked_statuses": "你还没有收藏任何嘟文。收藏后嘟文就会显示在这里。",
-  "empty_column.community": "本站时间线还没有内容，写点什么并公开发布，让它活跃起来吧！",
+  "empty_column.bookmarked_statuses": "你还没有给任何嘟文添加过书签。在你添加书签后，嘟文就会显示在这里。",
+  "empty_column.community": "本站时间轴暂时没有内容，快写点什么让它动起来吧！",
   "empty_column.direct": "你还未使用过私下提及。当你发出或者收到私下提及时，它将显示在此。",
   "empty_column.domain_blocks": "暂且没有被屏蔽的站点。",
   "empty_column.explore_statuses": "目前没有热门内容，稍后再来看看吧！",
   "empty_column.favourited_statuses": "你没有喜欢过任何嘟文。喜欢过的嘟文会显示在这里。",
   "empty_column.favourites": "没有人喜欢过这条嘟文。如果有人喜欢了，就会显示在这里。",
   "empty_column.follow_requests": "你还没有收到任何关注请求。当你收到一个关注请求时，它会出现在这里。",
-  "empty_column.followed_tags": "你还没有关注任何话题标签。 当你关注后，它们会出现在这里。",
+  "empty_column.followed_tags": "您还没有关注任何话题标签。 当您关注后，它们会出现在这里。",
   "empty_column.hashtag": "这个话题标签下暂时没有内容。",
-  "empty_column.home": "你的主页时间线还没有内容！快去关注更多人吧。",
+  "empty_column.home": "你的主页时间线是空的！快去关注更多人吧。 {suggestions}",
   "empty_column.list": "列表中还没有任何内容。当列表成员发布新嘟文时，它们将出现在这里。",
   "empty_column.lists": "你还没有创建过列表。你创建的列表会在这里显示。",
   "empty_column.mutes": "你没有隐藏任何用户。",
-  "empty_column.notification_requests": "都看完了！这里没有任何未读通知。当收到新的通知时，它们将根据你的设置显示在这里。",
+  "empty_column.notification_requests": "都看完了！这里没有任何未读通知。当收到新的通知时，它们将根据您的设置显示在这里。",
   "empty_column.notifications": "你还没有收到过任何通知，快和其他用户互动吧。",
   "empty_column.public": "这里什么都没有！写一些公开的嘟文，或者关注其他服务器的用户后，这里就会有嘟文出现了",
   "error.unexpected_crash.explanation": "此页面无法正确显示，这可能是因为我们的代码中有错误，也可能是因为浏览器兼容问题。",
@@ -290,31 +289,31 @@
   "explore.trending_links": "新闻",
   "explore.trending_statuses": "嘟文",
   "explore.trending_tags": "话题标签",
-  "filter_modal.added.context_mismatch_explanation": "这条过滤规则不适用于你当前访问此嘟文的场景。要在此场景下过滤嘟文，你必须编辑此过滤规则。",
-  "filter_modal.added.context_mismatch_title": "场景不匹配！",
-  "filter_modal.added.expired_explanation": "此过滤规则类别已过期，你需要修改到期日期才能应用。",
-  "filter_modal.added.expired_title": "过滤规则已过期！",
-  "filter_modal.added.review_and_configure": "要检查并进一步配置此过滤规则分类，请前往{settings_link}。",
-  "filter_modal.added.review_and_configure_title": "过滤规则设置",
+  "filter_modal.added.context_mismatch_explanation": "此过滤器类别不适用访问过嘟文的环境中。如要在此环境中过滤嘟文，你必须编辑此过滤器。",
+  "filter_modal.added.context_mismatch_title": "环境不匹配！",
+  "filter_modal.added.expired_explanation": "此过滤器类别已过期，你需要修改到期日期才能应用。",
+  "filter_modal.added.expired_title": "过滤器已过期！",
+  "filter_modal.added.review_and_configure": "要审核并进一步配置此过滤器分类，请前往{settings_link}。",
+  "filter_modal.added.review_and_configure_title": "过滤器设置",
   "filter_modal.added.settings_link": "设置页面",
-  "filter_modal.added.short_explanation": "此嘟文已被添加到以下过滤规则：{title}。",
-  "filter_modal.added.title": "已添加过滤规则 ！",
-  "filter_modal.select_filter.context_mismatch": "不适用于此场景",
+  "filter_modal.added.short_explanation": "此嘟文已添加到以下过滤器类别：{title}。",
+  "filter_modal.added.title": "过滤器已添加 ！",
+  "filter_modal.select_filter.context_mismatch": "不适用于此环境",
   "filter_modal.select_filter.expired": "已过期",
-  "filter_modal.select_filter.prompt_new": "新条目：{name}",
+  "filter_modal.select_filter.prompt_new": "新类别：{name}",
   "filter_modal.select_filter.search": "搜索或创建",
-  "filter_modal.select_filter.subtitle": "使用一个已存在条目，或创建新条目",
+  "filter_modal.select_filter.subtitle": "使用一个已存在类别，或创建一个新类别",
   "filter_modal.select_filter.title": "过滤此嘟文",
   "filter_modal.title.status": "过滤一条嘟文",
-  "filter_warning.matches_filter": "命中过滤规则 “<span>{title}</span>”",
+  "filter_warning.matches_filter": "命中过滤规则 “{title}”",
   "filtered_notifications_banner.pending_requests": "来自你可能认识的 {count, plural, =0 {0 个人} other {# 个人}}",
-  "filtered_notifications_banner.title": "被过滤的通知",
+  "filtered_notifications_banner.title": "通知（已过滤）",
   "firehose.all": "全部",
   "firehose.local": "此服务器",
   "firehose.remote": "其他服务器",
   "follow_request.authorize": "同意",
   "follow_request.reject": "拒绝",
-  "follow_requests.unlocked_explanation": "尽管你没有锁嘟，但是 {domain} 的站务人员认为你也许会想手动审核这些账号的关注请求。",
+  "follow_requests.unlocked_explanation": "尽管你没有锁嘟，但是 {domain} 的工作人员认为你也许会想手动审核审核这些账号的关注请求。",
   "follow_suggestions.curated_suggestion": "站务人员精选",
   "follow_suggestions.dismiss": "不再显示",
   "follow_suggestions.featured_longer": "由 {domain} 管理团队精选",
@@ -322,20 +321,20 @@
   "follow_suggestions.hints.featured": "该用户已被 {domain} 管理团队精选。",
   "follow_suggestions.hints.friends_of_friends": "该用户在你关注的人中很受欢迎。",
   "follow_suggestions.hints.most_followed": "该用户是 {domain} 上关注度最高的用户之一。",
-  "follow_suggestions.hints.most_interactions": "该用户最近在 {domain} 获得了很多关注。",
-  "follow_suggestions.hints.similar_to_recently_followed": "该用户与你最近关注的人类似。",
+  "follow_suggestions.hints.most_interactions": "该用户最近在 {domain} 上获得了很多关注。",
+  "follow_suggestions.hints.similar_to_recently_followed": "该用户与你最近关注的用户类似。",
   "follow_suggestions.personalized_suggestion": "个性化建议",
   "follow_suggestions.popular_suggestion": "热门建议",
   "follow_suggestions.popular_suggestion_longer": "在 {domain} 上很受欢迎",
   "follow_suggestions.similar_to_recently_followed_longer": "与你近期关注的用户相似",
   "follow_suggestions.view_all": "查看全部",
   "follow_suggestions.who_to_follow": "推荐关注",
-  "followed_tags": "已关注话题标签",
+  "followed_tags": "关注的话题标签",
   "footer.about": "关于",
-  "footer.directory": "用户列表",
+  "footer.directory": "用户目录",
   "footer.get_app": "获取应用",
   "footer.invite": "邀请",
-  "footer.keyboard_shortcuts": "快捷键",
+  "footer.keyboard_shortcuts": "快捷键列表",
   "footer.privacy_policy": "隐私政策",
   "footer.source_code": "查看源代码",
   "footer.status": "状态",
@@ -369,12 +368,12 @@
   "home.hide_announcements": "隐藏公告",
   "home.pending_critical_update.body": "请尽快更新你的 Mastodon 服务器！",
   "home.pending_critical_update.link": "查看更新",
-  "home.pending_critical_update.title": "有紧急安全更新！",
+  "home.pending_critical_update.title": "紧急安全更新可用！",
   "home.show_announcements": "显示公告",
   "ignore_notifications_modal.disclaimer": "Mastodon无法通知对方用户你忽略了他们的通知。忽略通知不会阻止消息本身的发送。",
   "ignore_notifications_modal.filter_instead": "改为过滤",
   "ignore_notifications_modal.filter_to_act_users": "你仍然可以接受、拒绝或举报用户",
-  "ignore_notifications_modal.filter_to_avoid_confusion": "过滤有助于避免潜在的混淆",
+  "ignore_notifications_modal.filter_to_avoid_confusion": "选择过滤有助于避免潜在的混淆",
   "ignore_notifications_modal.filter_to_review_separately": "你可以单独查看被过滤的通知",
   "ignore_notifications_modal.ignore": "忽略通知",
   "ignore_notifications_modal.limited_accounts_title": "是否忽略来自受限账号的通知？",
@@ -382,17 +381,17 @@
   "ignore_notifications_modal.not_followers_title": "是否忽略未关注你的人的通知？",
   "ignore_notifications_modal.not_following_title": "是否忽略你未关注的人的通知？",
   "ignore_notifications_modal.private_mentions_title": "是否忽略不请自来的私下提及？",
-  "interaction_modal.description.favourite": "只需一个 Mastodon 账号，即可喜欢这条嘟文，向作者展示你欣赏的态度，并将其保存以供日后查看。",
-  "interaction_modal.description.follow": "只需一个 Mastodon 账号，即可关注 {name} 并在自己的主页接收对方的新嘟文。",
-  "interaction_modal.description.reblog": "只需一个 Mastodon 账号，即可转发此嘟文，向你的关注者分享它。",
-  "interaction_modal.description.reply": "只需一个 Mastodon 账号，即可回复此嘟文。",
+  "interaction_modal.description.favourite": "只需一个 Mastodon 账号，即可喜欢这条嘟文，对嘟文的作者展示您欣赏的态度，并保存嘟文以供日后使用。",
+  "interaction_modal.description.follow": "拥有一个 Mastodon 账号，你可以关注 {name} 并在自己的主页上接收对方的新嘟文。",
+  "interaction_modal.description.reblog": "拥有一个 Mastodon 账号，你可以向自己的关注者们转发此嘟文。",
+  "interaction_modal.description.reply": "拥有一个 Mastodon 账号，你可以回复此嘟文。",
   "interaction_modal.login.action": "转到主页",
-  "interaction_modal.login.prompt": "你所入驻的服务器域名，如：mastodon.social",
-  "interaction_modal.no_account_yet": "还没加入 Mastodon？",
+  "interaction_modal.login.prompt": "您所入驻的服务器域名，如：mastodon.social",
+  "interaction_modal.no_account_yet": "不在 Mastodon 上？",
   "interaction_modal.on_another_server": "在另一服务器",
   "interaction_modal.on_this_server": "在此服务器",
-  "interaction_modal.sign_in": "你尚未登录此服务器，你的账号是在哪里注册的？",
-  "interaction_modal.sign_in_hint": "提示：这是你注册的网站，如果你不记得了，请在邮箱的收件箱中查找欢迎邮件。你还可以输入完整的用户名！(例如 @Mastodon@mastodon.social)",
+  "interaction_modal.sign_in": "您尚未登录此服务器，您的账号托管在哪？",
+  "interaction_modal.sign_in_hint": "提示：这是您注册的网站，如果您不记得了，请在邮箱的收件箱中查找欢迎邮件。您还可以输入完整的用户名！(例如 @Mastodon@mastodon.social)",
   "interaction_modal.title.favourite": "喜欢 {name} 的嘟文",
   "interaction_modal.title.follow": "关注 {name}",
   "interaction_modal.title.reblog": "转发 {name} 的嘟文",
@@ -403,30 +402,30 @@
   "keyboard_shortcuts.back": "返回上一页",
   "keyboard_shortcuts.blocked": "打开被屏蔽用户列表",
   "keyboard_shortcuts.boost": "转嘟",
-  "keyboard_shortcuts.column": "选中某栏",
-  "keyboard_shortcuts.compose": "选中输入框",
+  "keyboard_shortcuts.column": "选择某栏",
+  "keyboard_shortcuts.compose": "选择输入框",
   "keyboard_shortcuts.description": "说明",
   "keyboard_shortcuts.direct": "打开私下提及栏",
   "keyboard_shortcuts.down": "在列表中让光标下移",
   "keyboard_shortcuts.enter": "展开嘟文",
   "keyboard_shortcuts.favourite": "喜欢嘟文",
   "keyboard_shortcuts.favourites": "打开喜欢列表",
-  "keyboard_shortcuts.federated": "打开跨站时间线",
+  "keyboard_shortcuts.federated": "打开跨站时间轴",
   "keyboard_shortcuts.heading": "快捷键列表",
-  "keyboard_shortcuts.home": "打开主页时间线",
+  "keyboard_shortcuts.home": "打开主页时间轴",
   "keyboard_shortcuts.hotkey": "快捷键",
   "keyboard_shortcuts.legend": "显示此列表",
-  "keyboard_shortcuts.local": "打开本站时间线",
+  "keyboard_shortcuts.local": "打开本站时间轴",
   "keyboard_shortcuts.mention": "提及嘟文作者",
   "keyboard_shortcuts.muted": "打开隐藏用户列表",
-  "keyboard_shortcuts.my_profile": "打开你的账户页",
+  "keyboard_shortcuts.my_profile": "打开你的个人资料",
   "keyboard_shortcuts.notifications": "打开通知栏",
   "keyboard_shortcuts.open_media": "打开媒体",
   "keyboard_shortcuts.pinned": "打开置顶嘟文列表",
-  "keyboard_shortcuts.profile": "打开作者的账户页",
+  "keyboard_shortcuts.profile": "打开作者的个人资料",
   "keyboard_shortcuts.reply": "回复嘟文",
   "keyboard_shortcuts.requests": "打开关注请求列表",
-  "keyboard_shortcuts.search": "选中搜索框",
+  "keyboard_shortcuts.search": "选择搜索框",
   "keyboard_shortcuts.spoilers": "显示或隐藏被折叠的正文",
   "keyboard_shortcuts.start": "打开“开始使用”栏",
   "keyboard_shortcuts.toggle_hidden": "显示或隐藏被折叠的正文",
@@ -452,16 +451,16 @@
   "lists.exclusive": "在主页中隐藏这些嘟文",
   "lists.new.create": "新建列表",
   "lists.new.title_placeholder": "新列表的标题",
-  "lists.replies_policy.followed": "所有我关注的用户",
+  "lists.replies_policy.followed": "任何被关注的用户",
   "lists.replies_policy.list": "列表成员",
-  "lists.replies_policy.none": "不显示",
-  "lists.replies_policy.title": "回复显示范围：",
+  "lists.replies_policy.none": "无人",
+  "lists.replies_policy.title": "显示回复：",
   "lists.search": "搜索你关注的人",
   "lists.subheading": "你的列表",
   "load_pending": "{count} 项",
   "loading_indicator.label": "加载中…",
   "media_gallery.hide": "隐藏",
-  "moved_to_account_banner.text": "你的账号 {disabledAccount} 已禁用，因为你已迁移到 {movedToAccount}。",
+  "moved_to_account_banner.text": "您的账号 {disabledAccount} 已禁用，因为您已迁移到 {movedToAccount}。",
   "mute_modal.hide_from_notifications": "从通知中隐藏",
   "mute_modal.hide_options": "隐藏选项",
   "mute_modal.indefinite": "直到我取消隐藏他们",
@@ -475,8 +474,8 @@
   "navigation_bar.administration": "管理",
   "navigation_bar.advanced_interface": "在高级网页界面中打开",
   "navigation_bar.blocks": "已屏蔽的用户",
-  "navigation_bar.bookmarks": "收藏夹",
-  "navigation_bar.community_timeline": "本站时间线",
+  "navigation_bar.bookmarks": "书签",
+  "navigation_bar.community_timeline": "本站时间轴",
   "navigation_bar.compose": "撰写新嘟文",
   "navigation_bar.direct": "私下提及",
   "navigation_bar.discover": "发现",
@@ -486,19 +485,19 @@
   "navigation_bar.filters": "忽略的关键词",
   "navigation_bar.follow_requests": "关注请求",
   "navigation_bar.followed_tags": "关注的话题标签",
-  "navigation_bar.follows_and_followers": "关注与关注者",
+  "navigation_bar.follows_and_followers": "关注和粉丝",
   "navigation_bar.lists": "列表",
   "navigation_bar.logout": "退出登录",
-  "navigation_bar.moderation": "审核",
+  "navigation_bar.moderation": "运营",
   "navigation_bar.mutes": "已隐藏的用户",
-  "navigation_bar.opened_in_classic_interface": "嘟文页、账户页与其他某些页面默认在经典网页界面中打开。",
+  "navigation_bar.opened_in_classic_interface": "嘟文、账户和其他特定页面默认在经典网页界面中打开。",
   "navigation_bar.personal": "个人",
   "navigation_bar.pins": "置顶嘟文",
-  "navigation_bar.preferences": "偏好设置",
-  "navigation_bar.public_timeline": "跨站时间线",
+  "navigation_bar.preferences": "首选项",
+  "navigation_bar.public_timeline": "跨站公共时间轴",
   "navigation_bar.search": "搜索",
   "navigation_bar.security": "安全",
-  "not_signed_in_indicator.not_signed_in": "你需要登录才能访问此资源。",
+  "not_signed_in_indicator.not_signed_in": "您需要登录才能访问此资源。",
   "notification.admin.report": "{name} 举报了 {target}",
   "notification.admin.report_account": "{name} 举报了来自 {target} 的 {count, plural, other {# 条嘟文}}，原因为 {category}",
   "notification.admin.report_account_other": "{name} 举报了来自 {target} 的 {count, plural, other {# 条嘟文}}",
@@ -508,7 +507,7 @@
   "notification.admin.sign_up.name_and_others": "{name} 和 {count, plural, other {另外 # 人}}注册了",
   "notification.favourite": "{name} 喜欢了你的嘟文",
   "notification.favourite.name_and_others_with_link": "{name} 和 <a>{count, plural, other {另外 # 人}}</a> 喜欢了你的嘟文",
-  "notification.follow": "{name} 关注了你",
+  "notification.follow": "{name} 开始关注你",
   "notification.follow.name_and_others": "{name} 和 <a>{count, plural, other {另外 # 人}}</a> 关注了你",
   "notification.follow_request": "{name} 向你发送了关注请求",
   "notification.follow_request.name_and_others": "{name} 和 {count, plural, other {另外 # 人}} 向你发送了关注请求",
@@ -518,7 +517,7 @@
   "notification.label.reply": "回复",
   "notification.mention": "提及",
   "notification.mentioned_you": "{name} 提到了你",
-  "notification.moderation-warning.learn_more": "详细了解",
+  "notification.moderation-warning.learn_more": "了解更多",
   "notification.moderation_warning": "你收到了一条管理警告",
   "notification.moderation_warning.action_delete_statuses": "你的一些嘟文已被移除。",
   "notification.moderation_warning.action_disable": "你的账号已被禁用。",
@@ -532,9 +531,9 @@
   "notification.reblog": "{name} 转发了你的嘟文",
   "notification.reblog.name_and_others_with_link": "{name} 和 <a>{count, plural, other {另外 # 人}}</a> 转嘟了你的嘟文",
   "notification.relationships_severance_event": "与 {name} 的联系已断开",
-  "notification.relationships_severance_event.account_suspension": "{from} 的管理员封禁了 {target}，这意味着你将无法再收到对方的更新或与其互动。",
-  "notification.relationships_severance_event.domain_block": "{from} 的管理员屏蔽了 {target}，其中包括你的 {followersCount} 个关注者和 {followingCount, plural, other {# 个关注}}。",
-  "notification.relationships_severance_event.learn_more": "详细了解",
+  "notification.relationships_severance_event.account_suspension": "来自 {from} 的管理员封禁了 {target}，这意味着你将无法再收到对方的更新或与其互动。",
+  "notification.relationships_severance_event.domain_block": "来自 {from} 的管理员屏蔽了 {target}，其中包括你的 {followersCount} 个关注者和 {followingCount, plural, other {# 个关注}}。",
+  "notification.relationships_severance_event.learn_more": "了解更多",
   "notification.relationships_severance_event.user_domain_block": "你已经屏蔽了 {target}，移除了你的 {followersCount} 个关注者和 {followingCount, plural, other {# 个关注}}。",
   "notification.status": "{name} 刚刚发布嘟文",
   "notification.update": "{name} 编辑了嘟文",
@@ -546,16 +545,16 @@
   "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.title": "是否拒绝通知请求?",
-  "notification_requests.dismiss": "忽略",
+  "notification_requests.dismiss": "拒绝",
   "notification_requests.dismiss_multiple": "{count, plural, other {拒绝 # 个请求…}}",
   "notification_requests.edit_selection": "编辑",
   "notification_requests.exit_selection": "完成",
-  "notification_requests.explainer_for_limited_account": "来自此账户的通知已被过滤，因为此账户已被管理员限制。",
-  "notification_requests.explainer_for_limited_remote_account": "来自此账户的通知已被过滤，因为此账户或其所在的服务器已被管理员限制。",
+  "notification_requests.explainer_for_limited_account": "来自该账户的通知已被过滤，因为该账户已被管理员限制。",
+  "notification_requests.explainer_for_limited_remote_account": "来自该账户的通知已被过滤，因为该账户或其所在的实例已被管理员限制。",
   "notification_requests.maximize": "最大化",
-  "notification_requests.minimize_banner": "最小化被过滤通知横幅",
+  "notification_requests.minimize_banner": "最小化被过滤通知的横幅",
   "notification_requests.notifications_from": "来自 {name} 的通知",
-  "notification_requests.title": "被过滤的通知",
+  "notification_requests.title": "通知（已过滤）",
   "notification_requests.view": "查看通知",
   "notifications.clear": "清空通知列表",
   "notifications.clear_confirmation": "你确定要永久清空通知列表吗？",
@@ -574,7 +573,7 @@
   "notifications.column_settings.push": "推送通知",
   "notifications.column_settings.reblog": "转嘟：",
   "notifications.column_settings.show": "在通知栏显示",
-  "notifications.column_settings.sound": "播放提示音",
+  "notifications.column_settings.sound": "播放音效",
   "notifications.column_settings.status": "新嘟文：",
   "notifications.column_settings.unread_notifications.category": "未读通知",
   "notifications.column_settings.unread_notifications.highlight": "高亮显示未读通知",
@@ -597,17 +596,17 @@
   "notifications.policy.drop": "忽略",
   "notifications.policy.drop_hint": "送入虚空，再也不查看",
   "notifications.policy.filter": "过滤",
-  "notifications.policy.filter_hint": "发送到被过滤通知列表",
-  "notifications.policy.filter_limited_accounts_hint": "被服务器管理员限制的账号",
+  "notifications.policy.filter_hint": "发送到被过滤通知收件箱",
+  "notifications.policy.filter_limited_accounts_hint": "被实例管理员限制",
   "notifications.policy.filter_limited_accounts_title": "受限账号",
-  "notifications.policy.filter_new_accounts.hint": "注册未满 {days, plural, other {# 天}} 的账号",
+  "notifications.policy.filter_new_accounts.hint": "在 {days, plural, other {# 天}}内创建的账户",
   "notifications.policy.filter_new_accounts_title": "新账户",
-  "notifications.policy.filter_not_followers_hint": "包括关注你未满 {days, plural, other {# 天}}的人",
-  "notifications.policy.filter_not_followers_title": "没有关注你的人",
-  "notifications.policy.filter_not_following_hint": "需要你手动批准",
+  "notifications.policy.filter_not_followers_hint": "包括关注你少于 {days, plural, other {# 天}}的人",
+  "notifications.policy.filter_not_followers_title": "未关注你的人",
+  "notifications.policy.filter_not_following_hint": "直到你手动批准",
   "notifications.policy.filter_not_following_title": "你没有关注的人",
-  "notifications.policy.filter_private_mentions_hint": "过滤通知，除非对应嘟文是在回复你的私下提及，或来自你关注的人。",
-  "notifications.policy.filter_private_mentions_title": "不请自来的私下提及",
+  "notifications.policy.filter_private_mentions_hint": "过滤通知，除非通知是在回复提及你自己的内容，或发送者是你关注的人",
+  "notifications.policy.filter_private_mentions_title": "不请自来的提及",
   "notifications.policy.title": "管理来自 … 的通知",
   "notifications_permission_banner.enable": "启用桌面通知",
   "notifications_permission_banner.how_to_control": "启用桌面通知以在 Mastodon 未打开时接收通知。你可以通过交互通过上面的 {icon} 按钮来精细控制可以发送桌面通知的交互类型。",
@@ -617,41 +616,41 @@
   "onboarding.actions.go_to_explore": "看看有什么新鲜事",
   "onboarding.actions.go_to_home": "转到主页动态",
   "onboarding.compose.template": "你好 #Mastodon！",
-  "onboarding.follows.empty": "很抱歉，现在无法显示任何结果。你可以尝试使用搜索或浏览探索页面来查找要关注的人，或稍后再试。",
+  "onboarding.follows.empty": "很抱歉，现在无法显示任何结果。您可以尝试使用搜索或浏览探索页面来查找要关注的人，或稍后再试。",
   "onboarding.follows.lead": "你管理你自己的家庭饲料。你关注的人越多，它将越活跃和有趣。 这些配置文件可能是一个很好的起点——你可以随时取消关注它们！",
-  "onboarding.follows.title": "定制你的主页动态",
-  "onboarding.profile.discoverable": "让我的账户可被他人发现",
-  "onboarding.profile.discoverable_hint": "当你在 Mastodon 上启用发现功能时，你的嘟文可能会出现在搜索结果与热门中，你的账户可能会被推荐给与你兴趣相似的人。",
+  "onboarding.follows.title": "定制您的主页动态",
+  "onboarding.profile.discoverable": "让我的资料卡可被他人发现",
+  "onboarding.profile.discoverable_hint": "当你选择在 Mastodon 上启用发现功能时，你的嘟文可能会出现在搜索结果和热门中，你的账户可能会被推荐给与你兴趣相似的人。",
   "onboarding.profile.display_name": "昵称",
   "onboarding.profile.display_name_hint": "你的全名或昵称…",
   "onboarding.profile.lead": "你可以稍后在设置中完成此操作，设置中有更多的自定义选项。",
   "onboarding.profile.note": "简介",
-  "onboarding.profile.note_hint": "你可以提及 @其他人 或使用 #话题标签…",
+  "onboarding.profile.note_hint": "你可以提及 @其他人 或 #标签…",
   "onboarding.profile.save_and_continue": "保存并继续",
   "onboarding.profile.title": "设置个人资料",
   "onboarding.profile.upload_avatar": "上传头像",
-  "onboarding.profile.upload_header": "上传账户页封面图",
+  "onboarding.profile.upload_header": "上传资料卡头图",
   "onboarding.share.lead": "让人们知道他们如何在Mastodon找到你！",
   "onboarding.share.message": "我是来自 #Mastodon 的 {username}！请在 {url} 关注我。",
   "onboarding.share.next_steps": "可能的下一步：",
-  "onboarding.share.title": "分享你的账户页",
-  "onboarding.start.lead": "你的新 Mastodon 账户已准备好。下面是如何最大限度地利用它：",
+  "onboarding.share.title": "分享你的个人资料",
+  "onboarding.start.lead": "你的新 Mastodon 帐户已准备好。下面是如何最大限度地利用它：",
   "onboarding.start.skip": "想要在前面跳过吗？",
   "onboarding.start.title": "你已经成功了!",
   "onboarding.steps.follow_people.body": "You curate your own feed. Lets fill it with interesting people.",
-  "onboarding.steps.follow_people.title": "定制你的主页动态",
+  "onboarding.steps.follow_people.title": "定制您的主页动态",
   "onboarding.steps.publish_status.body": "向世界问声好吧。",
   "onboarding.steps.publish_status.title": "发布你的第一篇嘟文",
-  "onboarding.steps.setup_profile.body": "完善个人资料，提升你的互动体验。",
-  "onboarding.steps.setup_profile.title": "自定义你的账户",
-  "onboarding.steps.share_profile.body": "让你的朋友知道如何在 Mastodon 找到你",
-  "onboarding.steps.share_profile.title": "分享你的账户页",
+  "onboarding.steps.setup_profile.body": "Others are more likely to interact with you with a filled out profile.",
+  "onboarding.steps.setup_profile.title": "自定义你的个人资料",
+  "onboarding.steps.share_profile.body": "Let your friends know how to find you on Mastodon!",
+  "onboarding.steps.share_profile.title": "分享你的个人资料",
   "onboarding.tips.2fa": "<strong>你知道吗？</strong>你可以在账户设置中配置双因素认证来保护账户安全。可以使用你选择的任何 TOTP 应用，无需电话号码！",
-  "onboarding.tips.accounts_from_other_servers": "<strong>你知道吗？</strong> Mastodon 是去中心化的，所以你看到的一些账号实际上是在别的服务器上。不过你仍然可以和他们无缝交流！他们的服务器地址就在他们用户名的后半部分！",
-  "onboarding.tips.migration": "<strong>你知道吗？</strong>如果你将来觉得 {domain} 不再符合您的需求，你可以在保留现有关注者的情况下迁移至其他 Mastodon 服务器。你甚至可以部署自己的服务器！",
-  "onboarding.tips.verification": "<strong>你知道吗？</strong> 你可以在自己的网站上添加指向你 Mastodon 账户页的链接，并在你的 Mastodon 账户页中添加对应的网站链接，以此来验证您的账号。此验证方式无需任何费用或文件。",
+  "onboarding.tips.accounts_from_other_servers": "<strong>你知道吗？</strong> 既然Mastodon是去中心化的，你所看到的一些账户将被托管在你以外的服务器上。 但你可以无缝地与他们交互！他们的服务器在他们的用户名的后半部分！",
+  "onboarding.tips.migration": "<strong>您知道吗？</strong> 如果你觉得你喜欢 {domain} 不是您未来的一个伟大的服务器选择。 您可以移动到另一个 Mastodon 服务器而不失去您的关注者。 您甚至可以主持您自己的服务器！",
+  "onboarding.tips.verification": "<strong>您知道吗？</strong> 您可以通过在自己的网站上放置一个链接到您的 Mastodon 个人资料并将网站添加到您的个人资料来验证您的帐户。 无需收费或文书工作！",
   "password_confirmation.exceeds_maxlength": "密码确认超过最大密码长度",
-  "password_confirmation.mismatching": "确认密码与密码不一致。",
+  "password_confirmation.mismatching": "密码确认不匹配",
   "picture_in_picture.restore": "恢复",
   "poll.closed": "已关闭",
   "poll.refresh": "刷新",
@@ -664,13 +663,13 @@
   "poll_button.add_poll": "发起投票",
   "poll_button.remove_poll": "移除投票",
   "privacy.change": "设置嘟文的可见范围",
-  "privacy.direct.long": "嘟文中提到的每个人",
+  "privacy.direct.long": "帖子中提到的每个人",
   "privacy.direct.short": "特定的人",
-  "privacy.private.long": "仅限你的关注者",
+  "privacy.private.long": "仅限您的关注者",
   "privacy.private.short": "关注者",
   "privacy.public.long": "所有 Mastodon 内外的人",
   "privacy.public.short": "公开",
-  "privacy.unlisted.additional": "此模式的行为与“公开”类似，只是嘟文不会出现在实时动态、话题标签、探索或 Mastodon 搜索页面中，即使您已全局开启了对应的发现设置。",
+  "privacy.unlisted.additional": "该模式的行为与“公开”完全相同，只是帖子不会出现在实时动态、话题标签、探索或 Mastodon 搜索中，即使你已在账户级设置中选择加入。",
   "privacy.unlisted.long": "减少算法影响",
   "privacy.unlisted.short": "悄悄公开",
   "privacy_policy.last_updated": "最近更新于 {date}",
@@ -680,11 +679,11 @@
   "regeneration_indicator.label": "加载中…",
   "regeneration_indicator.sublabel": "你的主页动态正在准备中！",
   "relative_time.days": "{number} 天前",
-  "relative_time.full.days": "{number, plural, other {# 天}}前",
-  "relative_time.full.hours": "{number, plural, other {# 小时}}前",
+  "relative_time.full.days": "{number, plural, one {# 天} other {# 天}}前",
+  "relative_time.full.hours": "{number, plural, one {# 小时} other {# 小时}}前",
   "relative_time.full.just_now": "刚刚",
-  "relative_time.full.minutes": "{number, plural, other {# 分钟}}前",
-  "relative_time.full.seconds": "{number, plural, other {# 秒}}前",
+  "relative_time.full.minutes": "{number, plural, one {# 分钟} other {# 分钟}}前",
+  "relative_time.full.seconds": "{number, plural, one {# 秒} other {# 秒}}前",
   "relative_time.hours": "{number} 小时前",
   "relative_time.just_now": "刚刚",
   "relative_time.minutes": "{number} 分钟前",
@@ -701,7 +700,7 @@
   "report.categories.violation": "内容违反一条或多条服务器规则",
   "report.category.subtitle": "选择最佳匹配",
   "report.category.title": "告诉我们此 {type} 存在的问题",
-  "report.category.title_account": "账户",
+  "report.category.title_account": "个人资料",
   "report.category.title_status": "嘟文",
   "report.close": "完成",
   "report.comment.title": "还有什么你认为我们应该知道的吗？",
@@ -722,12 +721,12 @@
   "report.reasons.violation": "违反服务器规则",
   "report.reasons.violation_description": "你清楚它违反了特定的规则",
   "report.rules.subtitle": "选择所有适用选项",
-  "report.rules.title": "违反了哪些规则？",
+  "report.rules.title": "哪些规则被违反了？",
   "report.statuses.subtitle": "选择所有适用选项",
-  "report.statuses.title": "是否有可以证实此举报的嘟文？",
+  "report.statuses.title": "是否有任何嘟文可以支持这一报告？",
   "report.submit": "提交",
   "report.target": "举报 {target}",
-  "report.thanks.take_action": "以下是你控制你在 Mastodon 上能看到哪些内容的选项：",
+  "report.thanks.take_action": "以下是您控制您在 Mastodon 上能看到哪些内容的选项：",
   "report.thanks.take_action_actionable": "在我们审阅这个问题时，你可以对 @{name} 采取行动",
   "report.thanks.title": "不想看到这个内容？",
   "report.thanks.title_actionable": "感谢提交举报，我们将会进行处理。",
@@ -745,11 +744,11 @@
   "report_notification.open": "打开举报",
   "search.no_recent_searches": "无最近搜索",
   "search.placeholder": "搜索",
-  "search.quick_action.account_search": "包含 {x} 的账户",
-  "search.quick_action.go_to_account": "打开 {x} 的账户页",
-  "search.quick_action.go_to_hashtag": "打开话题标签 {x}",
-  "search.quick_action.open_url": "在 Mastodon 中打开此链接",
-  "search.quick_action.status_search": "包含 {x} 的嘟文",
+  "search.quick_action.account_search": "匹配 {x} 的个人资料",
+  "search.quick_action.go_to_account": "前往 {x} 个人资料",
+  "search.quick_action.go_to_hashtag": "前往标签 {x}",
+  "search.quick_action.open_url": "在 Mastodon 中打开网址",
+  "search.quick_action.status_search": "匹配 {x} 的嘟文",
   "search.search_or_paste": "搜索或输入网址",
   "search_popout.full_text_search_disabled_message": "在 {domain} 不可用",
   "search_popout.full_text_search_logged_out_message": "只有登录后才可用。",
@@ -757,7 +756,7 @@
   "search_popout.options": "搜索选项",
   "search_popout.quick_actions": "快捷操作",
   "search_popout.recent": "最近搜索",
-  "search_popout.specific_date": "具体日期",
+  "search_popout.specific_date": "指定日期",
   "search_popout.user": "用户",
   "search_results.accounts": "用户",
   "search_results.all": "全部",
@@ -766,7 +765,7 @@
   "search_results.see_all": "查看全部",
   "search_results.statuses": "嘟文",
   "search_results.title": "搜索 {q}",
-  "server_banner.about_active_users": "过去 30 天内使用此服务器的人(月活跃用户)",
+  "server_banner.about_active_users": "过去 30 天内使用此服务器的人(每月活跃用户)",
   "server_banner.active_users": "活跃用户",
   "server_banner.administered_by": "本站管理员：",
   "server_banner.is_one_of_many": "{domain} 是可用于参与联邦宇宙的众多独立 Mastodon 服务器之一。",
@@ -778,20 +777,20 @@
   "sign_in_banner.sso_redirect": "登录或注册",
   "status.admin_account": "打开 @{name} 的管理界面",
   "status.admin_domain": "打开 {domain} 的管理界面",
-  "status.admin_status": "在管理界面查看此嘟文",
+  "status.admin_status": "打开此帖的管理界面",
   "status.block": "屏蔽 @{name}",
-  "status.bookmark": "收藏",
-  "status.cancel_reblog_private": "取消转嘟",
-  "status.cannot_reblog": "不能转嘟这条嘟文",
+  "status.bookmark": "添加到书签",
+  "status.cancel_reblog_private": "取消转贴",
+  "status.cannot_reblog": "这条嘟文不允许被转嘟",
   "status.continued_thread": "上接嘟文串",
   "status.copy": "复制嘟文链接",
   "status.delete": "删除",
-  "status.detailed_status": "对话详情",
+  "status.detailed_status": "详细的对话视图",
   "status.direct": "私下提及 @{name}",
   "status.direct_indicator": "私下提及",
   "status.edit": "编辑",
   "status.edited": "最后编辑于 {date}",
-  "status.edited_x_times": "共编辑 {count, plural, other {{count} 次}}",
+  "status.edited_x_times": "共编辑 {count, plural, one {{count} 次} other {{count} 次}}",
   "status.embed": "获取嵌入代码",
   "status.favourite": "喜欢",
   "status.favourites": "{count, plural, other {次喜欢}}",
@@ -801,48 +800,48 @@
   "status.load_more": "加载更多",
   "status.media.open": "点击打开",
   "status.media.show": "点击查看",
-  "status.media_hidden": "媒体已隐藏",
+  "status.media_hidden": "已隐藏的媒体内容",
   "status.mention": "提及 @{name}",
   "status.more": "更多",
   "status.mute": "隐藏 @{name}",
-  "status.mute_conversation": "关闭此对话的通知",
+  "status.mute_conversation": "禁用此对话的消息提醒",
   "status.open": "展开嘟文",
-  "status.pin": "在账户页置顶",
+  "status.pin": "在个人资料页面置顶",
   "status.pinned": "置顶嘟文",
   "status.read_more": "查看更多",
   "status.reblog": "转嘟",
-  "status.reblog_private": "以相同可见性转嘟",
+  "status.reblog_private": "转嘟（可见者不变）",
   "status.reblogged_by": "{name} 转嘟了",
   "status.reblogs": "{count, plural, other {次转嘟}}",
-  "status.reblogs.empty": "还没有人转嘟过此条嘟文。转嘟此嘟文的人会显示在这里。",
+  "status.reblogs.empty": "没有人转嘟过此条嘟文。如果有人转嘟了，就会显示在这里。",
   "status.redraft": "删除并重新编辑",
-  "status.remove_bookmark": "取消收藏",
-  "status.replied_in_thread": "回复嘟文串",
-  "status.replied_to": "回复 {name}",
+  "status.remove_bookmark": "移除书签",
+  "status.replied_in_thread": "回复给嘟文串",
+  "status.replied_to": "回复给 {name}",
   "status.reply": "回复",
   "status.replyAll": "回复此嘟文串",
   "status.report": "举报 @{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, other {{attachmentCount} 个附件}}",
+  "status.title.with_attachments": "{user} 上传了 {attachmentCount, plural, one {一个附件} other {{attachmentCount} 个附件}}",
   "status.translate": "翻译",
   "status.translated_from_with": "由 {provider} 翻译自 {lang}",
   "status.uncached_media_warning": "预览不可用",
   "status.unmute_conversation": "恢复此对话的通知提醒",
-  "status.unpin": "在账户页取消置顶",
-  "subscribed_languages.lead": "更改此选择后，只有选定语言的嘟文才会出现在你的主页和列表时间线上。选择「无」将显示所有语言的嘟文。",
+  "status.unpin": "在个人资料页面取消置顶",
+  "subscribed_languages.lead": "更改此选择后，仅选定语言的嘟文会出现在您的主页和列表时间轴上。选择「无」将接收所有语言的嘟文。",
   "subscribed_languages.save": "保存更改",
   "subscribed_languages.target": "更改 {target} 的订阅语言",
   "tabs_bar.home": "主页",
   "tabs_bar.notifications": "通知",
-  "time_remaining.days": "剩余 {number, plural, other {# 天}}",
-  "time_remaining.hours": "剩余 {number, plural, other {# 小时}}",
-  "time_remaining.minutes": "剩余 {number, plural, other {# 分钟}}",
+  "time_remaining.days": "剩余 {number, plural, one {# 天} other {# 天}}",
+  "time_remaining.hours": "剩余 {number, plural, one {# 小时} other {# 小时}}",
+  "time_remaining.minutes": "剩余 {number, plural, one {# 分钟} other {# 分钟}}",
   "time_remaining.moments": "即将结束",
-  "time_remaining.seconds": "剩余 {number, plural, other {# 秒}}",
+  "time_remaining.seconds": "剩余 {number, plural, one {# 秒} other {# 秒}}",
   "trends.counter_by_accounts": "过去 {days, plural, other {{days} 天}}有{count, plural, other { {counter} 人}}讨论",
   "trends.trending_now": "当前热门",
   "ui.beforeunload": "如果你现在离开 Mastodon，你的草稿内容将会丢失。",
@@ -862,12 +861,12 @@
   "upload_form.drag_and_drop.on_drag_start": "已选中媒体附件 {item}。",
   "upload_form.edit": "编辑",
   "upload_form.thumbnail": "更改缩略图",
-  "upload_form.video_description": "为听障人士与视障人士添加文字描述",
-  "upload_modal.analyzing_picture": "正在分析图片…",
+  "upload_form.video_description": "为听障人士和视障人士添加文字描述",
+  "upload_modal.analyzing_picture": "分析图片…",
   "upload_modal.apply": "应用",
   "upload_modal.applying": "正在应用…",
-  "upload_modal.choose_image": "选择图片",
-  "upload_modal.description_placeholder": "在这里写下你的描述",
+  "upload_modal.choose_image": "选择图像",
+  "upload_modal.description_placeholder": "快狐跨懒狗",
   "upload_modal.detect_text": "从图片中检测文本",
   "upload_modal.edit_media": "编辑媒体",
   "upload_modal.hint": "在预览图上点击或拖动圆圈，以选择缩略图的焦点。",
@@ -875,7 +874,7 @@
   "upload_modal.preview_label": "预览 ({ratio})",
   "upload_progress.label": "上传中…",
   "upload_progress.processing": "正在处理…",
-  "username.taken": "此用户名已被占用。请换用其它用户名",
+  "username.taken": "此用户名已被使用。请尝试其他",
   "video.close": "关闭视频",
   "video.download": "下载文件",
   "video.exit_fullscreen": "退出全屏",
@@ -885,5 +884,5 @@
   "video.mute": "静音",
   "video.pause": "暂停",
   "video.play": "播放",
-  "video.unmute": "取消静音"
+  "video.unmute": "解除禁音"
 }

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

@@ -11,7 +11,6 @@
   "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": "群組",
@@ -34,7 +33,6 @@
   "account.follow_back": "追蹤對方",
   "account.followers": "追蹤者",
   "account.followers.empty": "尚未有人追蹤這位使用者。",
-  "account.followers_counter": "{count, plural, other {{counter} 個追蹤者}}",
   "account.following": "正在追蹤",
   "account.follows.empty": "這位使用者尚未追蹤任何人。",
   "account.go_to_profile": "前往個人檔案",
@@ -83,7 +81,6 @@
   "alert.rate_limited.title": "已限速",
   "alert.unexpected.message": "發生意外錯誤。",
   "alert.unexpected.title": "失敗！",
-  "alt_text_badge.title": "替代文字",
   "announcement.announcement": "公告",
   "attachments_list.unprocessed": "（未處理）",
   "audio.hide": "隱藏音訊",
@@ -172,7 +169,6 @@
   "confirmations.delete.title": "刪除帖文？",
   "confirmations.delete_list.confirm": "刪除",
   "confirmations.delete_list.message": "你確定要永久刪除這列表嗎？",
-  "confirmations.delete_list.title": "刪除列表？",
   "confirmations.discard_edit_media.confirm": "捨棄",
   "confirmations.discard_edit_media.message": "您在媒體描述或預覽有尚未儲存的變更。確定要捨棄它們嗎？",
   "confirmations.edit.confirm": "編輯",
@@ -187,9 +183,6 @@
   "confirmations.reply.message": "現在回覆將蓋掉您目前正在撰寫的訊息。是否仍要回覆？",
   "confirmations.unfollow.confirm": "取消追蹤",
   "confirmations.unfollow.message": "真的不要繼續追蹤 {name} 了嗎？",
-  "confirmations.unfollow.title": "取消追蹤使用者？",
-  "content_warning.hide": "隱藏嘟文",
-  "content_warning.show": "仍要顯示",
   "conversation.delete": "刪除對話",
   "conversation.mark_as_read": "標為已讀",
   "conversation.open": "檢視對話",
@@ -351,7 +344,6 @@
   "home.pending_critical_update.link": "查看更新",
   "home.pending_critical_update.title": "有重要的安全更新！",
   "home.show_announcements": "顯示公告",
-  "ignore_notifications_modal.ignore": "忽略推播通知",
   "interaction_modal.description.favourite": "有了 Mastodon 的帳號，你便可以把這篇帖文加入最愛，讓作者知道你欣賞他的作品，並可以稍後再閱讀。",
   "interaction_modal.description.follow": "在 Mastodon 上有個帳號的話，您可以追蹤 {name} 以於首頁時間軸接收他們的帖文。",
   "interaction_modal.description.reblog": "在 Mastodon 上有個帳號的話，您可以向自己的追縱者們轉發此帖文。",
@@ -426,7 +418,6 @@
   "lists.subheading": "列表",
   "load_pending": "{count, plural, other {# 個新項目}}",
   "loading_indicator.label": "載入中…",
-  "media_gallery.hide": "隱藏",
   "moved_to_account_banner.text": "您的帳號 {disabledAccount} 目前已停用，因為您已搬家至 {movedToAccount}。",
   "mute_modal.hide_from_notifications": "隱藏通知",
   "mute_modal.hide_options": "隱藏選項",

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

@@ -1,7 +1,7 @@
 {
   "about.blocks": "被限制的伺服器",
   "about.contact": "聯絡我們：",
-  "about.disclaimer": "Mastodon 是一個自由的開源軟體，是 Mastodon gGmbH 之註冊商標。",
+  "about.disclaimer": "Mastodon 是一個自由的開源軟體，是 Mastodon gGmbH 的註冊商標。",
   "about.domain_blocks.no_reason_available": "無法存取的原因",
   "about.domain_blocks.preamble": "Mastodon 基本上允許您瀏覽聯邦宇宙中任何伺服器的內容並與使用者互動。以下是在本伺服器上設定的例外。",
   "about.domain_blocks.silenced.explanation": "一般來說您不會看到來自這個伺服器的個人檔案和內容，除非您明確搜尋或主動跟隨對方。",
@@ -197,7 +197,6 @@
   "confirmations.unfollow.title": "是否取消跟隨該使用者？",
   "content_warning.hide": "隱藏嘟文",
   "content_warning.show": "仍要顯示",
-  "content_warning.show_more": "顯示更多",
   "conversation.delete": "刪除對話",
   "conversation.mark_as_read": "標記為已讀",
   "conversation.open": "檢視對話",
@@ -306,7 +305,7 @@
   "filter_modal.select_filter.subtitle": "使用既有的類別或是新增",
   "filter_modal.select_filter.title": "過濾此嘟文",
   "filter_modal.title.status": "過濾一則嘟文",
-  "filter_warning.matches_filter": "符合過濾器「<span>{title}</span>」",
+  "filter_warning.matches_filter": "匹配過濾器「{title}」",
   "filtered_notifications_banner.pending_requests": "來自您可能認識的 {count, plural, =0 {0 人} other {# 人}}",
   "filtered_notifications_banner.title": "已過濾之推播通知",
   "firehose.all": "全部",
@@ -397,9 +396,9 @@
   "interaction_modal.title.follow": "跟隨 {name}",
   "interaction_modal.title.reblog": "轉嘟 {name} 的嘟文",
   "interaction_modal.title.reply": "回覆 {name} 的嘟文",
-  "intervals.full.days": "{number, plural, other {# 天}}",
-  "intervals.full.hours": "{number, plural, other {# 小時}}",
-  "intervals.full.minutes": "{number, plural, other {# 分鐘}}",
+  "intervals.full.days": "{number, plural, one {# 天} other {# 天}}",
+  "intervals.full.hours": "{number, plural, one {# 小時} other {# 小時}}",
+  "intervals.full.minutes": "{number, plural, one {# 分鐘} other {# 分鐘}}",
   "keyboard_shortcuts.back": "上一頁",
   "keyboard_shortcuts.blocked": "開啟「封鎖使用者」列表",
   "keyboard_shortcuts.boost": "轉嘟",
@@ -458,7 +457,7 @@
   "lists.replies_policy.title": "顯示回覆：",
   "lists.search": "搜尋您跟隨之使用者",
   "lists.subheading": "您的列表",
-  "load_pending": "{count, plural, other {# 個新項目}}",
+  "load_pending": "{count, plural, one {# 個新項目} other {# 個新項目}}",
   "loading_indicator.label": "正在載入...",
   "media_gallery.hide": "隱藏",
   "moved_to_account_banner.text": "您的帳號 {disabledAccount} 目前已停用，因為您已搬家至 {movedToAccount}。",
@@ -500,8 +499,8 @@
   "navigation_bar.security": "安全性",
   "not_signed_in_indicator.not_signed_in": "您需要登入才能存取此資源。",
   "notification.admin.report": "{name} 已檢舉 {target}",
-  "notification.admin.report_account": "{name} 已檢舉來自 {target} 關於 {category} 之 {count, plural, other {# 則嘟文}}",
-  "notification.admin.report_account_other": "{name} 已檢舉來自 {target} 之 {count, plural, other {# 則嘟文}}",
+  "notification.admin.report_account": "{name} 已檢舉來自 {target} 關於 {category} 之 {count, plural, other {# 則嘟文}} ",
+  "notification.admin.report_account_other": "{name} 已檢舉來自 {target} 之 {count, plural, other {# 則嘟文}} ",
   "notification.admin.report_statuses": "{name} 已檢舉 {target} 關於 {category}",
   "notification.admin.report_statuses_other": "{name} 已檢舉 {target}",
   "notification.admin.sign_up": "{name} 已經註冊",
@@ -656,11 +655,11 @@
   "poll.closed": "已關閉",
   "poll.refresh": "重新整理",
   "poll.reveal": "檢視結果",
-  "poll.total_people": "{count, plural, other {# 個人}}",
-  "poll.total_votes": "{count, plural, other {# 張票}}",
+  "poll.total_people": "{count, plural, one {# 個投票} other {# 個投票}}",
+  "poll.total_votes": "{count, plural, one {# 個投票} other {# 個投票}}",
   "poll.vote": "投票",
   "poll.voted": "您已對此問題投票",
-  "poll.votes": "{votes, plural, other {# 張票}}",
+  "poll.votes": "{votes, plural, one {# 張票} other {# 張票}}",
   "poll_button.add_poll": "新增投票",
   "poll_button.remove_poll": "移除投票",
   "privacy.change": "調整嘟文隱私狀態",
@@ -681,10 +680,10 @@
   "regeneration_indicator.sublabel": "您的首頁時間軸正在準備中！",
   "relative_time.days": "{number} 天",
   "relative_time.full.days": "{number, plural, other {# 天}}前",
-  "relative_time.full.hours": "{number, plural, other {# 小時}}前",
+  "relative_time.full.hours": "{number, plural, one {# 小時} other {# 小時}}前",
   "relative_time.full.just_now": "剛剛",
-  "relative_time.full.minutes": "{number, plural, other {# 分鐘}}前",
-  "relative_time.full.seconds": "{number, plural, other {# 秒}}前",
+  "relative_time.full.minutes": "{number, plural, one {# 分鐘} other {# 分鐘}}前",
+  "relative_time.full.seconds": "{number, plural, one {# 秒} other {# 秒}}前",
   "relative_time.hours": "{number} 小時前",
   "relative_time.just_now": "剛剛",
   "relative_time.minutes": "{number} 分鐘前",
@@ -794,7 +793,7 @@
   "status.edited_x_times": "已編輯 {count, plural, one {{count} 次} other {{count} 次}}",
   "status.embed": "取得嵌入程式碼",
   "status.favourite": "最愛",
-  "status.favourites": "{count, plural, other {則最愛}}",
+  "status.favourites": "{count, plural, other {# 則最愛}}",
   "status.filter": "過濾此嘟文",
   "status.history.created": "{name} 於 {date} 建立",
   "status.history.edited": "{name} 於 {date} 修改",
@@ -813,7 +812,7 @@
   "status.reblog": "轉嘟",
   "status.reblog_private": "依照原嘟可見性轉嘟",
   "status.reblogged_by": "{name} 已轉嘟",
-  "status.reblogs": "{count, plural, other {則轉嘟}}",
+  "status.reblogs": "{count, plural, other {# 則轉嘟}}",
   "status.reblogs.empty": "還沒有人轉嘟過這則嘟文。當有人轉嘟時，它將於此顯示。",
   "status.redraft": "刪除並重新編輯",
   "status.remove_bookmark": "移除書籤",
@@ -838,11 +837,11 @@
   "subscribed_languages.target": "變更 {target} 的訂閱語言",
   "tabs_bar.home": "首頁",
   "tabs_bar.notifications": "通知",
-  "time_remaining.days": "剩餘 {number, plural, other {# 天}}",
-  "time_remaining.hours": "剩餘{number, plural, other {# 小時}}",
-  "time_remaining.minutes": "剩餘{number, plural, other {# 分鐘}}",
+  "time_remaining.days": "剩餘 {number, plural, one {# 天} other {# 天}}",
+  "time_remaining.hours": "剩餘 {number, plural, one {# 小時} other {# 小時}}",
+  "time_remaining.minutes": "剩餘 {number, plural, one {# 分鐘} other {# 分鐘}}",
   "time_remaining.moments": "剩餘時間",
-  "time_remaining.seconds": "剩餘{number, plural, other {# 秒}}",
+  "time_remaining.seconds": "剩餘 {number, plural, one {# 秒} other {# 秒}}",
   "trends.counter_by_accounts": "{count, plural, one {{counter} 人} other {{counter} 人}}於過去 {days, plural, one {日} other {{days} 日}} 之間",
   "trends.trending_now": "現正熱門趨勢",
   "ui.beforeunload": "如果離開 Mastodon，您的草稿將會不見。",

app/javascript/mastodon/models/notification_group.ts

@@ -16,7 +16,6 @@ export const NOTIFICATIONS_GROUP_MAX_AVATARS = 8;
 interface BaseNotificationGroup
   extends Omit<BaseNotificationGroupJSON, 'sample_account_ids'> {
   sampleAccountIds: string[];
-  partial: boolean;
 }
 
 interface BaseNotificationWithStatus<Type extends NotificationWithStatusType>
@@ -129,7 +128,6 @@ export function createNotificationGroupFromJSON(
       return {
         statusId: statusId ?? undefined,
         sampleAccountIds,
-        partial: false,
         ...groupWithoutStatus,
       };
     }
@@ -138,14 +136,12 @@ export function createNotificationGroupFromJSON(
       return {
         report: createReportFromJSON(report),
         sampleAccountIds,
-        partial: false,
         ...groupWithoutTargetAccount,
       };
     }
     case 'severed_relationships':
       return {
         ...group,
-        partial: false,
         event: createAccountRelationshipSeveranceEventFromJSON(group.event),
         sampleAccountIds,
       };
@@ -154,16 +150,13 @@ export function createNotificationGroupFromJSON(
       const { moderation_warning, ...groupWithoutModerationWarning } = group;
       return {
         ...groupWithoutModerationWarning,
-        partial: false,
         moderationWarning: createAccountWarningFromJSON(moderation_warning),
         sampleAccountIds,
       };
     }
-
     default:
       return {
         sampleAccountIds,
-        partial: false,
         ...group,
       };
   }
@@ -171,17 +164,17 @@ export function createNotificationGroupFromJSON(
 
 export function createNotificationGroupFromNotificationJSON(
   notification: ApiNotificationJSON,
-): NotificationGroup {
+) {
   const group = {
     sampleAccountIds: [notification.account.id],
     group_key: notification.group_key,
     notifications_count: 1,
+    type: notification.type,
     most_recent_notification_id: notification.id,
     page_min_id: notification.id,
     page_max_id: notification.id,
     latest_page_notification_at: notification.created_at,
-    partial: true,
-  };
+  } as NotificationGroup;
 
   switch (notification.type) {
     case 'favourite':
@@ -190,21 +183,12 @@ export function createNotificationGroupFromNotificationJSON(
     case 'mention':
     case 'poll':
     case 'update':
-      return {
-        ...group,
-        type: notification.type,
-        statusId: notification.status?.id,
-      };
+      return { ...group, statusId: notification.status?.id };
     case 'admin.report':
-      return {
-        ...group,
-        type: notification.type,
-        report: createReportFromJSON(notification.report),
-      };
+      return { ...group, report: createReportFromJSON(notification.report) };
     case 'severed_relationships':
       return {
         ...group,
-        type: notification.type,
         event: createAccountRelationshipSeveranceEventFromJSON(
           notification.event,
         ),
@@ -212,15 +196,11 @@ export function createNotificationGroupFromNotificationJSON(
     case 'moderation_warning':
       return {
         ...group,
-        type: notification.type,
         moderationWarning: createAccountWarningFromJSON(
           notification.moderation_warning,
         ),
       };
     default:
-      return {
-        ...group,
-        type: notification.type,
-      };
+      return group;
   }
 }

app/javascript/mastodon/reducers/accounts.ts

@@ -57,10 +57,7 @@ export const accountsReducer: Reducer<typeof initialState> = (
     return state.setIn([action.payload.id, 'hidden'], false);
   else if (importAccounts.match(action))
     return normalizeAccounts(state, action.payload.accounts);
-  else if (
-    followAccountSuccess.match(action) &&
-    !action.payload.alreadyFollowing
-  ) {
+  else if (followAccountSuccess.match(action)) {
     return state
       .update(action.payload.relationship.id, (account) =>
         account?.update('followers_count', (n) => n + 1),

app/javascript/mastodon/reducers/notification_groups.ts

@@ -534,13 +534,10 @@ export const notificationGroupsReducer = createReducer<NotificationGroupsState>(
             if (existingGroupIndex > -1) {
               const existingGroup = state.groups[existingGroupIndex];
               if (existingGroup && existingGroup.type !== 'gap') {
-                if (group.partial) {
-                  group.notifications_count +=
-                    existingGroup.notifications_count;
-                  group.sampleAccountIds = group.sampleAccountIds
-                    .concat(existingGroup.sampleAccountIds)
-                    .slice(0, NOTIFICATIONS_GROUP_MAX_AVATARS);
-                }
+                group.notifications_count += existingGroup.notifications_count;
+                group.sampleAccountIds = group.sampleAccountIds
+                  .concat(existingGroup.sampleAccountIds)
+                  .slice(0, NOTIFICATIONS_GROUP_MAX_AVATARS);
                 state.groups.splice(existingGroupIndex, 1);
               }
             }

app/javascript/styles/mastodon/components.scss

@@ -2759,7 +2759,6 @@ a.account__display-name {
       flex: 0 1 auto;
       display: flex;
       flex-direction: column;
-      contain: inline-size layout paint style;
 
       @media screen and (min-width: $no-gap-breakpoint) {
         max-width: 600px;
@@ -4033,7 +4032,6 @@ $ui-header-logo-wordmark-width: 99px;
   overflow: hidden;
   border: 1px solid var(--background-border-color);
   border-radius: 8px;
-  contain: inline-size layout paint style;
 
   &.bottomless {
     border-radius: 8px 8px 0 0;
@@ -5811,7 +5809,6 @@ a.status-card {
   pointer-events: auto;
   user-select: text;
   display: flex;
-  max-width: 100vw;
 
   @media screen and (width <= $mobile-breakpoint) {
     margin-top: auto;
@@ -11112,21 +11109,19 @@ noscript {
 }
 
 .content-warning {
-  display: block;
   box-sizing: border-box;
   background: rgba($ui-highlight-color, 0.05);
   color: $secondary-text-color;
-  border: 1px solid rgba($ui-highlight-color, 0.15);
-  border-radius: 8px;
+  border-top: 1px solid;
+  border-bottom: 1px solid;
+  border-color: rgba($ui-highlight-color, 0.15);
   padding: 8px (5px + 8px);
   position: relative;
   font-size: 15px;
   line-height: 22px;
-  cursor: pointer;
 
   p {
     margin-bottom: 8px;
-    font-weight: 500;
   }
 
   .link-button {
@@ -11135,16 +11130,31 @@ noscript {
     font-weight: 500;
   }
 
-  &--filter {
-    color: $darker-text-color;
+  &::before,
+  &::after {
+    content: '';
+    display: block;
+    position: absolute;
+    height: 100%;
+    background: url('../images/warning-stripes.svg') repeat-y;
+    width: 5px;
+    top: 0;
+  }
 
-    p {
-      font-weight: normal;
-    }
+  &::before {
+    border-start-start-radius: 4px;
+    border-end-start-radius: 4px;
+    inset-inline-start: 0;
+  }
 
-    .filter-name {
-      font-weight: 500;
-      color: $secondary-text-color;
-    }
+  &::after {
+    border-start-end-radius: 4px;
+    border-end-end-radius: 4px;
+    inset-inline-end: 0;
+  }
+
+  &--filter::before,
+  &--filter::after {
+    background-image: url('../images/filter-stripes.svg');
   }
 }

app/lib/attachment_batch.rb

@@ -77,22 +77,10 @@ class AttachmentBatch
           when :fog
             logger.debug { "Deleting #{attachment.path(style)}" }
 
-            retries = 0
             begin
               attachment.send(:directory).files.new(key: attachment.path(style)).destroy
-            rescue Fog::OpenStack::Storage::NotFound
-              logger.debug "Will ignore because file is not found #{attachment.path(style)}"
-            rescue => e
-              retries += 1
-
-              if retries < MAX_RETRY
-                logger.debug "Retry #{retries}/#{MAX_RETRY} after #{e.message}"
-                sleep 2**retries
-                retry
-              else
-                logger.error "Batch deletion from fog failed after #{e.message}"
-                raise e
-              end
+            rescue Fog::Storage::OpenStack::NotFound
+              # Ignore failure to delete a file that has already been deleted
             end
           when :azure
             logger.debug { "Deleting #{attachment.path(style)}" }

app/lib/feed_manager.rb

@@ -58,7 +58,6 @@ class FeedManager
   # @param [Boolean] update
   # @return [Boolean]
   def push_to_home(account, status, update: false)
-    return false unless account.user&.signed_in_recently?
     return false unless add_to_feed(:home, account.id, status, aggregate_reblogs: account.user&.aggregates_reblogs?)
 
     trim(:home, account.id)
@@ -84,9 +83,7 @@ class FeedManager
   # @param [Boolean] update
   # @return [Boolean]
   def push_to_list(list, status, update: false)
-    return false if filter_from_list?(status, list)
-    return false unless list.account.user&.signed_in_recently?
-    return false unless add_to_feed(:list, list.id, status, aggregate_reblogs: list.account.user&.aggregates_reblogs?)
+    return false if filter_from_list?(status, list) || !add_to_feed(:list, list.id, status, aggregate_reblogs: list.account.user&.aggregates_reblogs?)
 
     trim(:list, list.id)
     PushUpdateWorker.perform_async(list.account_id, status.id, "timeline:list:#{list.id}", { 'update' => update }) if push_update_required?("timeline:list:#{list.id}")
@@ -110,8 +107,6 @@ class FeedManager
   # @param [Account] into_account
   # @return [void]
   def merge_into_home(from_account, into_account)
-    return unless into_account.user&.signed_in_recently?
-
     timeline_key = key(:home, into_account.id)
     aggregate    = into_account.user&.aggregates_reblogs?
     query        = from_account.statuses.list_eligible_visibility.includes(:preloadable_poll, :media_attachments, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)
@@ -138,8 +133,6 @@ class FeedManager
   # @param [List] list
   # @return [void]
   def merge_into_list(from_account, list)
-    return unless list.account.user&.signed_in_recently?
-
     timeline_key = key(:list, list.id)
     aggregate    = list.account.user&.aggregates_reblogs?
     query        = from_account.statuses.list_eligible_visibility.includes(:preloadable_poll, :media_attachments, reblog: :account).limit(FeedManager::MAX_ITEMS / 4)

app/lib/search_query_transformer.rb

@@ -144,8 +144,6 @@ class SearchQueryTransformer < Parslet::Transform
   end
 
   class PrefixClause
-    EPOCH_RE = /\A\d+\z/
-
     attr_reader :operator, :prefix, :term
 
     def initialize(prefix, operator, term, options = {})
@@ -170,15 +168,15 @@ class SearchQueryTransformer < Parslet::Transform
       when 'before'
         @filter = :created_at
         @type = :range
-        @term = { lt: date_from_term(term), time_zone: @options[:current_account]&.user_time_zone.presence || 'UTC' }
+        @term = { lt: TermValidator.validate_date!(term), time_zone: @options[:current_account]&.user_time_zone.presence || 'UTC' }
       when 'after'
         @filter = :created_at
         @type = :range
-        @term = { gt: date_from_term(term), time_zone: @options[:current_account]&.user_time_zone.presence || 'UTC' }
+        @term = { gt: TermValidator.validate_date!(term), time_zone: @options[:current_account]&.user_time_zone.presence || 'UTC' }
       when 'during'
         @filter = :created_at
         @type = :range
-        @term = { gte: date_from_term(term), lte: date_from_term(term), time_zone: @options[:current_account]&.user_time_zone.presence || 'UTC' }
+        @term = { gte: TermValidator.validate_date!(term), lte: TermValidator.validate_date!(term), time_zone: @options[:current_account]&.user_time_zone.presence || 'UTC' }
       when 'in'
         @operator = :flag
         @term = term
@@ -224,10 +222,16 @@ class SearchQueryTransformer < Parslet::Transform
 
       term
     end
+  end
 
-    def date_from_term(term)
-      DateTime.iso8601(term) unless term.match?(EPOCH_RE) # This will raise Date::Error if the date is invalid
-      term
+  class TermValidator
+    STRICT_DATE_REGEX = /\A\d{4}-\d{2}-\d{2}\z/ # yyyy-MM-dd
+    EPOCH_MILLIS_REGEX = /\A\d{1,19}\z/
+
+    def self.validate_date!(value)
+      return value if value.match?(STRICT_DATE_REGEX) || value.match?(EPOCH_MILLIS_REGEX)
+
+      raise Mastodon::FilterValidationError, "Invalid date #{value}"
     end
   end
 

app/models/account.rb

@@ -89,7 +89,6 @@ class Account < ApplicationRecord
   include Account::Merging
   include Account::Search
   include Account::StatusesSearch
-  include Account::Suspensions
   include Account::AttributionDomains
   include DomainMaterializable
   include DomainNormalizable
@@ -128,7 +127,9 @@ class Account < ApplicationRecord
   scope :local, -> { where(domain: nil) }
   scope :partitioned, -> { order(Arel.sql('row_number() over (partition by domain)')) }
   scope :silenced, -> { where.not(silenced_at: nil) }
+  scope :suspended, -> { where.not(suspended_at: nil) }
   scope :sensitized, -> { where.not(sensitized_at: nil) }
+  scope :without_suspended, -> { where(suspended_at: nil) }
   scope :without_silenced, -> { where(silenced_at: nil) }
   scope :without_instance_actor, -> { where.not(id: INSTANCE_ACTOR_ID) }
   scope :recent, -> { reorder(id: :desc) }
@@ -254,6 +255,41 @@ class Account < ApplicationRecord
     update!(silenced_at: nil)
   end
 
+  def suspended?
+    suspended_at.present? && !instance_actor?
+  end
+
+  def suspended_locally?
+    suspended? && suspension_origin_local?
+  end
+
+  def suspended_permanently?
+    suspended? && deletion_request.nil?
+  end
+
+  def suspended_temporarily?
+    suspended? && deletion_request.present?
+  end
+
+  alias unavailable? suspended?
+  alias permanently_unavailable? suspended_permanently?
+
+  def suspend!(date: Time.now.utc, origin: :local, block_email: true)
+    transaction do
+      create_deletion_request!
+      update!(suspended_at: date, suspension_origin: origin)
+      create_canonical_email_block! if block_email
+    end
+  end
+
+  def unsuspend!
+    transaction do
+      deletion_request&.destroy!
+      update!(suspended_at: nil, suspension_origin: nil)
+      destroy_canonical_email_block!
+    end
+  end
+
   def sensitized?
     sensitized_at.present?
   end

app/models/concerns/account/interactions.rb

@@ -88,9 +88,6 @@ module Account::Interactions
       has_many :remote_severed_relationships, foreign_key: 'remote_account_id', inverse_of: :remote_account
     end
 
-    # Hashtag follows
-    has_many :tag_follows, inverse_of: :account, dependent: :destroy
-
     # Account notes
     has_many :account_notes, dependent: :destroy
 

app/models/concerns/account/merging.rb

@@ -16,7 +16,7 @@ module Account::Merging
       Follow, FollowRequest, Block, Mute,
       AccountModerationNote, AccountPin, AccountStat, ListAccount,
       PollVote, Mention, AccountDeletionRequest, AccountNote, FollowRecommendationSuppression,
-      Appeal, TagFollow
+      Appeal
     ]
 
     owned_classes.each do |klass|

app/models/concerns/account/suspensions.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-module Account::Suspensions
-  extend ActiveSupport::Concern
-
-  included do
-    scope :suspended, -> { where.not(suspended_at: nil) }
-    scope :without_suspended, -> { where(suspended_at: nil) }
-  end
-
-  def suspended?
-    suspended_at.present? && !instance_actor?
-  end
-  alias unavailable? suspended?
-
-  def suspended_locally?
-    suspended? && suspension_origin_local?
-  end
-
-  def suspended_permanently?
-    suspended? && deletion_request.nil?
-  end
-  alias permanently_unavailable? suspended_permanently?
-
-  def suspended_temporarily?
-    suspended? && deletion_request.present?
-  end
-
-  def suspend!(date: Time.now.utc, origin: :local, block_email: true)
-    transaction do
-      create_deletion_request!
-      update!(suspended_at: date, suspension_origin: origin)
-      create_canonical_email_block! if block_email
-    end
-  end
-
-  def unsuspend!
-    transaction do
-      deletion_request&.destroy!
-      update!(suspended_at: nil, suspension_origin: nil)
-      destroy_canonical_email_block!
-    end
-  end
-end

app/models/featured_tag.rb

@@ -44,16 +44,8 @@ class FeaturedTag < ApplicationRecord
     update(statuses_count: statuses_count + 1, last_status_at: timestamp)
   end
 
-  def decrement(deleted_status)
-    if statuses_count <= 1
-      update(statuses_count: 0, last_status_at: nil)
-    elsif last_status_at > deleted_status.created_at
-      update(statuses_count: statuses_count - 1)
-    else
-      # Fetching the latest status creation time can be expensive, so only perform it
-      # if we know we are deleting the latest status using this tag
-      update(statuses_count: statuses_count - 1, last_status_at: visible_tagged_account_statuses.where(id: ...deleted_status.id).pick(:created_at))
-    end
+  def decrement(deleted_status_id)
+    update(statuses_count: [0, statuses_count - 1].max, last_status_at: visible_tagged_account_statuses.where.not(id: deleted_status_id).pick(:created_at))
   end
 
   private

app/models/link_feed.rb

@@ -19,8 +19,6 @@ class LinkFeed < PublicFeed
 
     scope.merge!(discoverable)
     scope.merge!(attached_to_preview_card)
-    scope.merge!(account_filters_scope) if account?
-    scope.merge!(language_scope) if account&.chosen_languages.present?
 
     scope.to_a_paginated_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
   end

app/models/list.rb

@@ -34,7 +34,7 @@ class List < ApplicationRecord
   private
 
   def validate_account_lists_limit
-    errors.add(:base, I18n.t('lists.errors.limit')) if account.owned_lists.count >= PER_ACCOUNT_LIMIT
+    errors.add(:base, I18n.t('lists.errors.limit')) if account.lists.count >= PER_ACCOUNT_LIMIT
   end
 
   def clean_feed_manager

app/models/tag_follow.rb

@@ -21,6 +21,4 @@ class TagFollow < ApplicationRecord
   accepts_nested_attributes_for :tag
 
   rate_limit by: :account, family: :follows
-
-  scope :for_local_distribution, -> { joins(account: :user).merge(User.signed_in_recently) }
 end

app/models/trends/statuses.rb

@@ -106,7 +106,7 @@ class Trends::Statuses < Trends::Base
   private
 
   def eligible?(status)
-    status.created_at.past? && status.public_visibility? && status.account.discoverable? && !status.account.silenced? && !status.account.sensitized? && status.spoiler_text.blank? && !status.sensitive? && !status.reply? && valid_locale?(status.language)
+    status.public_visibility? && status.account.discoverable? && !status.account.silenced? && !status.account.sensitized? && status.spoiler_text.blank? && !status.sensitive? && !status.reply? && valid_locale?(status.language)
   end
 
   def calculate_scores(statuses, at_time)

app/models/user.rb

@@ -165,10 +165,6 @@ class User < ApplicationRecord
     end
   end
 
-  def signed_in_recently?
-    current_sign_in_at.present? && current_sign_in_at >= ACTIVE_DURATION.ago
-  end
-
   def confirmed?
     confirmed_at.present?
   end

app/serializers/rest/credential_application_serializer.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class REST::CredentialApplicationSerializer < REST::ApplicationSerializer
-  attributes :client_id, :client_secret, :client_secret_expires_at
+  attributes :client_id, :client_secret
 
   def client_id
     object.uid
@@ -10,10 +10,4 @@ class REST::CredentialApplicationSerializer < REST::ApplicationSerializer
   def client_secret
     object.secret
   end
-
-  # Added for future forwards compatibility when we may decide to expire OAuth
-  # Applications. Set to zero means that the client_secret never expires.
-  def client_secret_expires_at
-    0
-  end
 end

app/services/activitypub/process_status_update_service.rb

@@ -190,7 +190,6 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
   def update_mentions!
     previous_mentions = @status.active_mentions.includes(:account).to_a
     current_mentions  = []
-    unresolved_mentions = []
 
     @raw_mentions.each do |href|
       next if href.blank?
@@ -204,12 +203,6 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
       mention ||= account.mentions.new(status: @status)
 
       current_mentions << mention
-    rescue Mastodon::UnexpectedResponseError, *Mastodon::HTTP_CONNECTION_ERRORS
-      # Since previous mentions are about already-known accounts,
-      # they don't try to resolve again and won't fall into this case.
-      # In other words, this failure case is only for new mentions and won't
-      # affect `removed_mentions` so they can safely be retried asynchronously
-      unresolved_mentions << href
     end
 
     current_mentions.each do |mention|
@@ -222,11 +215,6 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
     removed_mentions = previous_mentions - current_mentions
 
     Mention.where(id: removed_mentions.map(&:id)).update_all(silent: true) unless removed_mentions.empty?
-
-    # Queue unresolved mentions for later
-    unresolved_mentions.uniq.each do |uri|
-      MentionResolveWorker.perform_in(rand(30...600).seconds, @status.id, uri, { 'request_id' => @request_id })
-    end
   end
 
   def update_emojis!

app/services/delete_account_service.rb

@@ -50,7 +50,6 @@ class DeleteAccountService < BaseService
     owned_lists
     scheduled_statuses
     status_pins
-    tag_follows
   )
 
   ASSOCIATIONS_ON_DESTROY = %w(

app/services/fan_out_on_write_service.rb

@@ -103,7 +103,7 @@ class FanOutOnWriteService < BaseService
   end
 
   def deliver_to_hashtag_followers!
-    TagFollow.for_local_distribution.where(tag_id: @status.tags.map(&:id)).select(:id, :account_id).reorder(nil).find_in_batches do |follows|
+    TagFollow.where(tag_id: @status.tags.map(&:id)).select(:id, :account_id).reorder(nil).find_in_batches do |follows|
       FeedInsertWorker.push_bulk(follows) do |follow|
         [@status.id, follow.account_id, 'tags', { 'update' => update? }]
       end

app/services/process_hashtags_service.rb

@@ -33,7 +33,7 @@ class ProcessHashtagsService < BaseService
 
     unless removed_tags.empty?
       @account.featured_tags.where(tag_id: removed_tags.map(&:id)).find_each do |featured_tag|
-        featured_tag.decrement(@status)
+        featured_tag.decrement(@status.id)
       end
     end
   end