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

.nvmrc

@@ -1 +1 @@
-20.16
+20.17

CHANGELOG.md

@@ -2,6 +2,301 @@
 
 All notable changes to this project will be documented in this file.
 
+## [4.3.0] - UNRELEASED
+
+The following changelog entries focus on changes visible to users, administrators, client developers or federated software developers, but there has also been a lot of code modernization, refactoring, and tooling work, in particular by @mjankowski.
+
+### Security
+
+- **Add confirmation interstitial instead of silently redirecting logged-out visitors to remote resources** (#27792, #28902, and #30651 by @ClearlyClaire and @Gargron)\
+  This fixes a longstanding open redirect in Mastodon, at the cost of added friction when local links to remote resources are shared.
+
+### Added
+
+- **Add experimental server-side notification grouping** (#29889, #30576, #30685, #30688, #30707, #30776, #30779, #30781, #30440, #31062, #31098, #31076, #31111, #31123, #31223, #31214, #31224, #31299, #31325, #31347, #31304, #31326, #31384, #31403, #31433, #31509, #31486, and #31513 by @ClearlyClaire, @mgmn, and @renchap)\
+  Group notifications of the same type for the same target, so that your notifications no longer get cluttered by boost and favorite notifications as soon as a couple of your posts get traction.\
+  This is done server-side so that clients can efficiently get relevant groups without having to go through numerous pages of individual notifications.\
+  As part of this, the visual design of the entire notifications feature has been revamped.\
+  This feature is intended to eventually replace the existing notifications column, but for this first beta, users will have to enable it in the “Experimental features” section of the notifications column settings.\
+  The API is not final yet, but it consists of:
+  - a new `group_key` attribute to `Notification` entities
+  - `GET /api/v2_alpha/notifications`: https://docs.joinmastodon.org/methods/notifications_alpha/#get-grouped
+  - `GET /api/v2_alpha/notifications/:group_key`: https://docs.joinmastodon.org/methods/notifications_alpha/#get-notification-group
+  - `POST /api/v2_alpha/notifications/:group_key/dimsiss`: https://docs.joinmastodon.org/methods/notifications_alpha/#dismiss-group
+  - `GET /api/v2_alpha/notifications/:unread_count`: https://docs.joinmastodon.org/methods/notifications_alpha/#unread-group-count
+- **Add notification policies, filtered notifications and notification requests** (#29366, #29529, #29433, #29565, #29567, #29572, #29575, #29588, #29646, #29652, #29658, #29666, #29693, #29699, #29737, #29706, #29570, #29752, #29810, #29826, #30114, #30251, #30559, #29868, #31008, #31011, #30996, #31149, #31220, #31222, #31225, #31242, #31262, #31250, #31273, #31310, #31316, #31322, #31329, #31324, #31331, #31343, #31342, #31309, #31358, #31378, #31406, #31256, #31456, #31419, #31457, #31508, #31540, and #31541 by @ClearlyClaire, @Gargron, @TheEssem, @mgmn, @oneiros, and @renchap)\
+  The old “Block notifications from non-followers”, “Block notifications from people you don't follow” and “Block direct messages from people you don't follow” notification settings have been replaced by a new set of settings found directly in the notification column.\
+  You can now separately filter or drop notifications from people you don't follow, people who don't follow you, accounts created within the past 30 days, as well as unsolicited private mentions, and accounts limited by the moderation.\
+  Instead of being outright dropped, notifications that you chose to filter are put in a separate “Filtered notifications” box that you can review separately without it clogging your main notifications.\
+  This adds the following REST API endpoints:
+
+  - `GET /api/v2/notifications/policy`: https://docs.joinmastodon.org/methods/notifications/#get-policy
+  - `PATCH /api/v2/notifications/policy`: https://docs.joinmastodon.org/methods/notifications/#update-the-filtering-policy-for-notifications
+  - `GET /api/v1/notifications/requests`: https://docs.joinmastodon.org/methods/notifications/#get-requests
+  - `GET /api/v1/notifications/requests/:id`: https://docs.joinmastodon.org/methods/notifications/#get-one-request
+  - `POST /api/v1/notifications/requests/:id/accept`: https://docs.joinmastodon.org/methods/notifications/#accept-request
+  - `POST /api/v1/notifications/requests/:id/dismiss`: https://docs.joinmastodon.org/methods/notifications/#dismiss-request
+  - `POST /api/v1/notifications/requests/accept`: https://docs.joinmastodon.org/methods/notifications/#accept-multiple-requests
+  - `POST /api/v1/notifications/requests/dismiss`: https://docs.joinmastodon.org/methods/notifications/#dismiss-multiple-requests
+  - `GET /api/v1/notifications/requests/merged`: https://docs.joinmastodon.org/methods/notifications/#requests-merged
+
+  In addition, accepting one or more notification requests generates a new streaming event:
+
+  - `notifications_merged`: an event of this type indicates accepted notification requests have finished merging, and the notifications list should be refreshed
+
+- **Add notifications of severed relationships** (#27511, #29665, #29668, #29670, #29700, #29714, #29712, and #29731 by @ClearlyClaire and @Gargron)\
+  Notify local users when they lose relationships as a result of a local moderator blocking a remote account or server, allowing the affected user to retrieve the list of broken relationships.\
+  Note that this does not notify remote users.\
+  This adds the `severed_relationships` notification type to the REST API and streaming, with a new [`relationship_severance_event` attribute](https://docs.joinmastodon.org/entities/Notification/#relationship_severance_event).
+- **Add hover cards in web UI** (#30754, #30864, #30850, #30879, #30928, #30949, #30948, #30931, and #31300 by @ClearlyClaire, @Gargron, and @renchap)\
+  Hovering over an avatar or username will now display a hover card with the first two lines of the user's description and their first two profile fields.\
+  This can be disabled in the “Animations and accessibility” section of the preferences.
+- **Add "system" theme setting (light/dark theme depending on user system preference)** (#29748, #29553, #29795, #29918, #30839, and #30861 by @nshki, @ErikUden, @mjankowski, @renchap, and @vmstan)\
+  Add a “system” theme that automatically switch between default dark and light themes depending on the user's system preferences.\
+  Also changes the default server theme to this new “system” theme so that automatic theme selection happens even when logged out.
+- **Add timeline of public posts about a trending link** (#30381 and #30840 by @Gargron)\
+  You can now see public posts mentioning currently-trending articles from people who have opted into discovery features.\
+  This adds a new REST API endpoint: https://docs.joinmastodon.org/methods/timelines/#link
+- **Add author highlight for news articles whose authors are on the fediverse** (#30398, #30670, #30521, and #30846 by @Gargron)\
+  This adds a mechanism to [highlight the author of news articles](https://blog.joinmastodon.org/2024/07/highlighting-journalism-on-mastodon/) shared on Mastodon.\
+  Articles hosted outside the fediverse can indicate a fediverse author with a meta tag:
+  ```html
+  <meta name="fediverse:creator" content="username@domain" />
+  ```
+  On the API side, this is represented by a new `authors` attribute to the `PreviewCard` entity: https://docs.joinmastodon.org/entities/PreviewCard/#authors\
+  Note that this feature is still work in progress and the tagging format and verification mechanisms may change in future releases.
+- **Add in-app notifications for moderation actions and warnings** (#30065, #30082, and #30081 by @ClearlyClaire)\
+  In addition to email notifications, also notify users of moderation actions or warnings against them directly within the app, so they are less likely to miss important communication from their moderators.\
+  This adds the `moderation_warning` notification type to the REST API and streaming, with a new [`moderation_warning` attribute](https://docs.joinmastodon.org/entities/Notification/#moderation_warning).
+- **Add domain information to profiles in web UI** (#29602 by @Gargron)\
+  Clicking the domain of a user in their profile will now open a tooltip with a short explanation about servers and federation.
+- Add ability to reorder uploaded media before posting in web UI (#28456 by @Gargron)
+- Add moderation interface for searching hashtags (#30880 by @ThisIsMissEm)
+- Add ability for admins to configure instance favicon and logo (#30040, #30208, #30259, #30375, #30734, #31016, and #30205 by @ClearlyClaire, @FawazFarid, @JasonPunyon, @mgmn, and @renchap)\
+  This is also exposed through the REST API: https://docs.joinmastodon.org/entities/Instance/#icon
+- Add `api_versions` to `/api/v2/instance` (#31354 by @ClearlyClaire)\
+  Add API version number to make it easier for clients to detect compatible features going forward.\
+  See API documentation at https://docs.joinmastodon.org/entities/Instance/#api-versions
+- Add recent audit log entries in federation moderation interface (#27386 by @ThisIsMissEm)
+- Add profile setup to onboarding in web UI (#27829, #27876, and #28453 by @Gargron)
+- Add prominent share/copy button on profiles in web UI (#27865 and #27889 by @ClearlyClaire and @Gargron)
+- Add optional hints for server rules (#29539 and #29758 by @ClearlyClaire and @Gargron)\
+  Server rules can now be broken into a short rule name and a longer explanation of the rule.\
+  This adds a new [`hint` attribute](https://docs.joinmastodon.org/entities/Rule/#hint) to `Rule` entities in the REST API.
+- Add support for PKCE in OAuth flow (#31129 by @ThisIsMissEm)
+- Add CDN cache busting on media deletion (#31353 and #31414 by @ClearlyClaire and @tribela)
+- Add the OAuth application used in local reports (#30539 by @ThisIsMissEm)
+- Add hint to user that other remote statuses may be missing (#26910, #31387, and #31516 by @Gargron, @audiodude, and @renchap)
+- Add lang attribute on preview card title (#31303 by @c960657)
+- Add check for `Content-Length` in `ResponseWithLimitAdapter` (#31285 by @c960657)
+- Add `Accept-Language` header to fetch preview cards in the server's default language (#31232 by @c960657)
+- Add support for PKCE Extension in OmniAuth OIDC through the `OIDC_USE_PKCE` environment variable (#31131 by @ThisIsMissEm)
+- Add API endpoints for unread notifications count (#31191 by @ClearlyClaire)\
+  This adds the following REST API endpoints:
+  - `GET /api/v1/notifications/unread_count`: https://docs.joinmastodon.org/methods/notifications/#unread-count
+- Add `/` keyboard shortcut to focus the search field (#29921 by @ClearlyClaire)
+- Add button to view the Hashtag on the instance from Hashtags in Moderation UI (#31533 by @ThisIsMissEm)
+- Add list of pending releases directly in mail notifications for version updates (#29436 and #30035 by @ClearlyClaire)
+- Add “Appeals” link under “Moderation” navigation category in moderation interface (#31071 by @ThisIsMissEm)
+- Add badge on account card in report moderation interface when account is already suspended (#29592 by @ClearlyClaire)
+- Add admin comments directly to the `admin/instances` page (#29240 by @tribela)
+- Add ability to require approval when users sign up using specific email domains (#28468, #28732, #28607, and #28608 by @ClearlyClaire)
+- Add banner for forwarded reports made by remote users about remote content (#27549 by @ClearlyClaire)
+- Add support HTML ruby tags in remote posts for east-asian languages (#30897 by @ThisIsMissEm)
+- Add link to manage warning presets in admin navigation (#26199 by @vmstan)
+- Add volume saving/reuse to video player (#27488 by @thehydrogen)
+- Add Elasticsearch index size, ffmpeg and ImageMagick versions to the admin dashboard (#27301, #30710, #31130, and #30845 by @vmstan)
+- Add `MASTODON_SIDEKIQ_READY_FILENAME` environment variable to use a file for Sidekiq to signal it is ready to process jobs (#30971 and #30988 by @renchap)\
+  In the official Docker image, this is set to `sidekiq_process_has_started_and_will_begin_processing_jobs` so that Sidekiq will touch `tmp/sidekiq_process_has_started_and_will_begin_processing_jobs` to signal readiness.
+- Add `S3_RETRY_LIMIT` environment variable to make S3 retries configurable (#23215 by @smiba)
+- Add `S3_KEY_PREFIX` environment variable (#30181 by @S0yKaf)
+- Add support for multiple `redirect_uris` when creating OAuth 2.0 Applications (#29192 by @ThisIsMissEm)
+- Add Interlingue and Interlingua to interface languages (#28630 and #30828 by @Dhghomon and @renchap)
+- Add Kashubian, Pennsylvania Dutch, Vai, Jawi Malay, Mohawk and Low German to posting languages (#26024, #26634, #27136, #29098, #27115, and #27434 by @EngineerDali, @HelgeKrueger, and @gunchleoc)
+- Add validations to `Web::PushSubscription` (#30540 and #30542 by @ThisIsMissEm)
+- Add option to use native Ruby driver for Redis through `REDIS_DRIVER=ruby` (#30717 by @vmstan)
+- Add support for libvips in addition to ImageMagick (#30090, #30590, #30597, #30632, #30857, #30869, and #30858 by @ClearlyClaire, @Gargron, and @mjankowski)\
+  Server admins can now use libvips as a faster and lighter alternative to ImageMagick for processing user-uploaded images.\
+  This requires libvips 8.13 or newer, and needs to be enabled with `MASTODON_USE_LIBVIPS=true`.\
+  This is enabled by default in the official Docker images, and is intended to completely replace ImageMagick in the future.
+- Add active animation to header settings button (#30221, #30307, and #30388 by @daudix)
+- Add OpenTelemetry instrumentation (#30130, #30322, #30353, and #30350 by @julianocosta89, @renchap, and @robbkidd)\
+  See https://docs.joinmastodon.org/admin/config/#otel for documentation
+- Add API to get multiple accounts and statuses (#27871 and #30465 by @ClearlyClaire)\
+  This adds `GET /api/v1/accounts` and `GET /api/v1/statuses` to the REST API, see https://docs.joinmastodon.org/methods/accounts/#index and https://docs.joinmastodon.org/methods/statuses/#index
+- Add redirection back to previous page after site upload deletion (#30141 by @FawazFarid)
+- Add RFC8414 OAuth 2.0 server metadata (#29191 by @ThisIsMissEm)
+- Add loading indicator and empty result message to advanced interface search (#30085 by @ClearlyClaire)
+- Add `profile` OAuth 2.0 scope, allowing more limited access to user data (#29087 and #30357 by @ThisIsMissEm)
+- Add the role ID to the badge component (#29707 by @renchap)
+- Add diagnostic message for failure during CLI search deploy (#29462 by @mjankowski)
+- Add pagination `Link` headers on API accounts/statuses when pinned true (#29442 by @mjankowski)
+- Add support for specifying custom CA cert for Elasticsearch through `ES_CA_FILE` (#29122 and #29147 by @ClearlyClaire)
+- Add groundwork for annual reports for accounts (#28693 by @Gargron)\
+  This lays the groundwork for a “year-in-review”/“wrapped” style report for local users, but is currently not in use.
+- Add notification email on invalid second authenticator (#28822 by @ClearlyClaire)
+- Add new emojis from `jdecked/twemoji` 15.0 (#28404 by @TheEssem)
+- Add configurable error handling in attachment batch deletion (#28184 by @vmstan)\
+  This makes the S3 batch size configurable through the `S3_BATCH_DELETE_LIMIT` environment variable (defaults to 1000), and adds some retry logic, configurable through the `S3_BATCH_DELETE_RETRY` environment variable (defaults to 3).
+- Add VAPID public key to instance serializer (#28006 by @ThisIsMissEm)
+- Add `nodeName` and `nodeDescription` to nodeinfo `metadata` (#28079 by @6543)
+- Add Thai diacritics and tone marks in `HASHTAG_INVALID_CHARS_RE` (#26576 by @ppnplus)
+- Add variable delay before link verification of remote account links (#27774 by @ClearlyClaire)
+- Add support for invite codes in the registration API (#27805 by @ClearlyClaire)
+- Add HTML lang attribute to preview card descriptions (#27503 by @srapilly)
+- Add display of relevant account warnings to report action logs (#27425 by @ClearlyClaire)
+- Add validation of allowed schemes on preview card URLs (#27485 by @mjankowski)
+- Add token introspection without read scope to `/api/v1/apps/verify_credentials` (#27142 by @ThisIsMissEm)
+- Add support for cross-origin request to `/nodeinfo/2.0` (#27413 by @palant)
+- Add variable delay before link verification of remote account links (#27351 by @ClearlyClaire)
+- Add PWA shortcut to `/explore` page (#27235 by @jake-anto)
+
+### Changed
+
+- **Change icons throughout the web interface** (#27385, #27539, #27555, #27579, #27700, #27817, #28519, #28709, #28064, #28775, #28780, #27924, #29294, #29395, #29537, #29569, #29610, #29612, #29649, #29844, #27780, #30974, #30963, #30962, #30961, #31362, #31363, #31359, #31371, #31360, #31512, #31511, and #31525 by @ClearlyClaire, @Gargron, @arbolitoloco1, @mjankowski, @nclm, @renchap, @ronilaukkarinen, and @zunda)\
+  This changes all the interface icons from FontAwesome to Material Symbols for a more modern look, consistent with the official Mastodon Android app.\
+  In addition, better care is given to pixel alignment, and icon variants are used to better highlight active/inactive state.
+- **Change design of compose form in web UI** (#28119, #29059, #29248, #29372, #29384, #29417, #29456, #29406, #29651, and #29659 by @ClearlyClaire, @Gargron, @eai04191, @hinaloe, and @ronilaukkarinen)\
+  The compose form has been completely redesigned for a more modern and consistent look, as well as spelling out the chosen privacy setting and language name at all times.\
+  As part of this, the “Unlisted” privacy setting has been renamed to “Quiet public”.
+- **Change design of confirmation modals in the web UI** (#29576, #29614, #29640, #29644, #30131, #30884, and #31399 by @ClearlyClaire, @Gargron, and @tribela)\
+  The mute, block, and domain block confirmation modals have been completely redesigned to be clearer and include more detailed information on the action to be performed.\
+  They also have a more modern and consistent design, along with other confirmation modals in the application.
+- **Change colors throughout the web UI** (#29522, #29584, #29653, #29779, #29803, #29809, #29808, #29828, #31034, #31168, #31266, #31348, #31349, #31361, and #31510 by @ClearlyClaire, @Gargron, @renchap, and @vmstan)
+- **Change onboarding prompt to follow suggestions carousel in web UI** (#28878 and #29272 by @Gargron)
+- **Change email templates** (#28416, #28755, #28814, #29064, #28883, #29470, #29607, #29761, #29760, and #29879 by @ClearlyClaire, @Gargron, @hteumeuleu, and @mjankowski)\
+  All emails to end-users have been completely redesigned with a fresh new look, providing more information while making them easier to reand and keeping maximum compatibility across mail clients.
+- **Change follow recommendations algorithm** (#28314, #28433, #29017, #29108, #29306, #29550, #29619, and #31474 by @ClearlyClaire, @Gargron, @kernal053, @mjankowski, and @wheatear-dev)\
+  This replaces the “past interactions” recommendation algorithm with a “friends of friends” algorithm that suggests accounts followed by people you follow, and a “similar profiles” algorithm that suggests accounts with a profile similar to your most recent follows.\
+  In addition, the implementation has been significantly reworked, and all follow recommendations are now dismissable.\
+  This change deprecates the `source` attribute in `Suggestion` entities in the REST API, and replaces it with the new [`sources` attribute](https://docs.joinmastodon.org/entities/Suggestion/#sources).
+- Change account search algorithm (#30803 by @Gargron)
+- **Change streaming server to use its own dependencies and its own docker image** (#24702, #27967, #26850, #28112, #28115, #28137, #28138, #28497, #28548, and #30795 by @TheEssem, @ThisIsMissEm, @jippi, @timetinytim, and @vmstan)\
+  In order to reduce the amount of runtime dependencies, the streaming server has been moved into a separate package and Docker image.\
+  The `mastodon` image does not contain the streaming server anymore, as it has been moved to its own `mastodon-streaming` image.\
+  Administrators may need to update their setup accordingly.
+- Change how content warnings and filters are displayed in web UI (#31365 by @Gargron)
+- Change Web UI to allow viewing and severing relationships with suspended accounts (#27667 by @ClearlyClaire)\
+  This also adds a `with_suspended` parameter to `GET /api/v1/accounts/relationships` in the REST API.
+- Change avatars border radius (#31390 by @renchap)
+- Change counters to be displayed on profile timelines in web UI (#30525 by @Gargron)
+- Change disabled buttons color in light mode to make the difference more visible (#30998 by @renchap)
+- Change design of people tab on explore in web UI (#30059 by @Gargron)
+- Change sidebar text in web UI (#30696 by @Gargron)
+- Change "Follow" to "Follow back" and "Mutual" when appropriate in web UI (#28452 and #28465 by @Gargron and @renchap)
+- Change media to be hidden/blurred by default in report modal (#28522 by @ClearlyClaire)
+- Change order of the "muting" and "blocking" list options in “Data Exports” (#26088 by @fixermark)
+- Change admin and moderation notes character limit from 500 to 2000 characters (#30288 by @ThisIsMissEm)
+- Change mute options to be in dropdown on muted users list in web UI (#30049 and #31315 by @ClearlyClaire and @Gargron)
+- Change out-of-band hashtags design in web UI (#29732 by @Gargron)
+- Change design of metadata underneath detailed posts in web UI (#29585, #29605, and #29648 by @ClearlyClaire and @Gargron)
+- Change action button to be last on profiles in web UI (#29533 and #29923 by @ClearlyClaire and @Gargron)
+- Change confirmation prompts in trending moderation interface to be more specific (#19626 by @tribela)
+- Change “Trends” moderation menu to “Recommendations & Trends” and move follow recommendations there (#31292 by @ThisIsMissEm)
+- Change irrelevant fields in account cleanup settings to be disabled unless automatic cleanup is enabled (#26562 by @c960657)
+- Change dropdown menu icon to not be replaced by close icon when open in web UI (#29532 by @Gargron)
+- Change back button to always appear in advanced web UI (#29551 and #29669 by @Gargron)
+- Change border of active compose field search inputs (#29832 and #29839 by @vmstan)
+- Change link detection to allow `@` at the end of an URL (#31124 by @adamniedzielski)
+- Change User-Agent to use Mastodon as the product, and http.rb as platform details (#31192 by @ClearlyClaire)
+- Change layout and wording of the Content Retention server settings page (#27733 by @vmstan)
+- Change unconfirmed users to be kept for one week instead of two days (#30285 by @renchap)
+- Change maximum page size for Admin Domain Management APIs from 200 to 500 (#31253 by @ThisIsMissEm)
+- Change database pool size to default to Sidekiq concurrency settings in Sidekiq processes (#26488 by @sinoru)
+- Change alt text to empty string for avatars (#21875 by @jasminjohal)
+- Change Docker images to use custom-built libvips and ffmpeg (#30571, #30569, and #31498 by @vmstan)
+- Change external links in the admin audit log to plain text or local administration pages (#27139 and #27150 by @ClearlyClaire and @ThisIsMissEm)
+- Change YJIT to be enabled when available (#30310 and #27283 by @ClearlyClaire and @mjankowski)\
+  Enable Ruby's built-in just-in-time compiler. This improves performances substantially, at the cost of a slightly increased memory usage.
+- Change `.env` file loading from deprecated `dotenv-rails` gem to `dotenv` gem (#29173 and #30121 by @mjankowski)\
+  This should have no effect except in the unlikely case an environment variable included a newline.
+- Change “Panjabi” language name to the more common spelling “Punjabi” (#27117 by @gunchleoc)
+- Change encryption of OTP secrets to use ActiveRecord Encryption (#29831, #28325, #30151, #30202, #30340, and #30344 by @ClearlyClaire and @mjankowski)\
+  This requires a manual step from administrators of existing servers. Indeed, they need to generate new secrets, which can be done using `bundle exec rails db:encryption:init`.\
+  Furthermore, there is a risk that the introduced migration fails if the server was misconfigured in the past. If that happens, the migration error will include the relevant information.
+- Change `/api/v1/announcements` to return regular `Status` entities (#26736 by @ClearlyClaire)
+- Change imports to convert case-insensitive fields to lowercase (#29739 and #29740 by @ThisIsMissEm)
+- Change stats in the admin interface to be inclusive of the full selected range, from beginning of day to end of day (#29416 and #29841 by @mjankowski)
+- Change materialized views to be refreshed concurrently to avoid locks (#29015 by @Gargron)
+- Change compose form to use server-provided post character and poll options limits (#28928 and #29490 by @ClearlyClaire and @renchap)
+- Change streaming server logging from `npmlog` to `pino` and `pino-http` (#27828 by @ThisIsMissEm)\
+  This changes the Mastodon streaming server log format, so this might be considered a breaking change if you were parsing the logs.
+- Change media “ALT” label to use a specific CSS class (#28777 by @ClearlyClaire)
+- Change streaming API host to not be overridden to localhost in development mode (#28557 by @ClearlyClaire)
+- Change cookie rotator to use SHA1 digest for new cookies (#27392 by @ClearlyClaire)\
+  Note that this requires that no pre-4.2.0 Mastodon web server is running when this code is deployed, as those would not understand the new cookies.\
+  Therefore, zero-downtime updates are only supported if you're coming from 4.2.0 or newer. If you want to skip Mastodon 4.2, you will need to completely stop Mastodon services before updating.
+- Change preview card deletes to be done using batch method (#28183 by @vmstan)
+- Change `img-src` and `media-src` CSP directives to not include `https:` (#28025 and #28561 by @ClearlyClaire)
+- Change self-destruct procedure (#26439, #29049, and #29420 by @ClearlyClaire and @zunda)\
+  Instead of enqueuing deletion jobs immediately, `tootctl self-destruct` now outputs a value for the `SELF_DESTRUCT` environment variable, which puts a server in self-destruct mode, processing deletions in the background, while giving users access to their export archives.
+
+### Removed
+
+- Remove StatsD integration (replaced by OpenTelemetry) (#30240 by @mjankowski)
+- Remove `CacheBuster` default options (#30718 by @mjankowski)
+- Remove home marker updates from the Web UI (#22721 by @davbeck)\
+  The web interface was unconditionally updating the home marker to the most recent received post, discarding any value set by other clients, thus making the feature unreliable.
+- Remove support for Ruby 3.0 (reaching EOL) (#29702 by @mjankowski)
+- Remove setting for unfollow confirmation modal (#29373 by @ClearlyClaire)\
+  Instead, the unfollow confirmation modal will always be displayed.
+- Remove support for Capistrano (#27295 and #30009 by @mjankowski and @renchap)
+
+### Fixed
+
+- **Fix link preview cards not always preserving the original URL from the status** (#27312 by @Gargron)
+- Fix log out from user menu not working on Safari (#31402 by @renchap)
+- Fix various issues when in link preview card generation (#28748, #30017, #30362, #30173, #30853, #30929, #30933, #30957, #30987, and #31144 by @adamniedzielski, @oneiros, @phocks, @timothyjrogers, and @tribela)
+- Fix handling of missing links in Webfinger responses (#31030 by @adamniedzielski)
+- Fix HTTP 500 error in `/api/v1/polls/:id/votes` when required `choices` parameter is missing (#25598 by @danielmbrasil)
+- Fix cross-origin loading of `inert.css` polyfill (#30687 by @louis77)
+- Fix cutoff of instance name in sign-up form (#30598 by @oneiros)
+- Fix empty `aria-hidden` attribute value in logo resources area (#30570 by @mjankowski)
+- Fix “Redirect URI” field not being marked as required in “New application” form (#30311 by @ThisIsMissEm)
+- Fix right-to-left text in preview cards (#30930 by @ClearlyClaire)
+- Fix rack attack `match_type` value typo in logging config (#30514 by @mjankowski)
+- Fix various cases of duplicate, missing, or inconsistent borders or scrollbar styles (#31068, #31286, #31268, #31275, #31284, #31305, #31346, #31372, #31373, #31389, #31432, #31391, and #31445 by @valtlai and @vmstan)
+- Fix race condition in `POST /api/v1/push/subscription` (#30166 by @ClearlyClaire)
+- Fix post deletion not being delayed when those are part of an account warning (#30163 by @ClearlyClaire)
+- Fix rendering error on `/start` when not logged in (#30023 by @timothyjrogers)
+- Fix logo pushing header buttons out of view on certain conditions in mobile layout (#29787 by @ClearlyClaire)
+- Fix notification-related records not being reattributed when merging accounts (#29694 by @ClearlyClaire)
+- Fix results/query in `api/v1/featured_tags/suggestions` (#29597 by @mjankowski)
+- Fix distracting and confusing always-showing scrollbar track in boost confirmation modal (#31524 by @ClearlyClaire)
+- Fix being able to upload more than 4 media attachments in some cases (#29183 by @mashirozx)
+- Fix preview card player getting embedded when clicking on the external link button (#29457 by @ClearlyClaire)
+- Fix full date display not respecting the locale 12/24h format (#29448 by @renchap)
+- Fix filters title and keywords overflow (#29396 by @GeopJr)
+- Fix incorrect date format in “Follows and followers” (#29390 by @JasonPunyon)
+- Fix “Edit media” modal sizing and layout when space-constrained (#27095 by @ronilaukkarinen)
+- Fix modal container bounds (#29185 by @nico3333fr)
+- Fix inefficient HTTP signature parsing using regexps and `StringScanner` (#29133 by @ClearlyClaire)
+- Fix moderation report updates through `PUT /api/v1/admin/reports/:id` not being logged in the audit log (#29044, #30342, and #31033 by @mjankowski, @tribela, and @vmstan)
+- Fix moderation interface allowing to select rule violation when there are no server rules (#31458 by @ThisIsMissEm)
+- Fix redirection from paths with url-encoded `@` to their decoded form (#31184 by @timothyjrogers)
+- Fix Trending Tags pending review having an unstable sort order (#31473 by @ThisIsMissEm)
+- Fix the emoji dropdown button always opening the dropdown instead of behaving like a toggle (#29012 by @jh97uk)
+- Fix processing of incoming posts with bearcaps (#26527 by @kmycode)
+- Fix support for IPv6 redis connections in streaming (#31229 by @ThisIsMissEm)
+- Fix search form re-rendering spuriously in web UI (#28876 by @Gargron)
+- Fix `RedownloadMediaWorker` not being called on transient S3 failure (#28714 by @ClearlyClaire)
+- Fix ISO code for Canadian French from incorrect `fr-QC` to `fr-CA` (#26015 by @gunchleoc)
+- Fix `.opus` file uploads being misidentified by Paperclip (#28580 by @vmstan)
+- Fix loading local accounts with extraneous domain part in WebUI (#28559 by @ClearlyClaire)
+- Fix destructive actions in dropdowns not using error color in light theme (#28484 by @logicalmoody)
+- Fix call to inefficient `delete_matched` cache method in domain blocks (#28374 by @ClearlyClaire)
+- Fix status edits not always being streamed to mentioned users (#28324 by @ClearlyClaire)
+- Fix onboarding step descriptions being truncated on narrow screens (#28021 by @ClearlyClaire)
+- Fix duplicate IDs in relationships and familiar_followers APIs (#27982 by @KevinBongart)
+- Fix modal content not being selectable (#27813 by @pajowu)
+- Fix Web UI not displaying appropriate explanation when a user hides their follows/followers (#27791 by @ClearlyClaire)
+- Fix format-dependent redirects being cached regardless of requested format (#27632 by @ClearlyClaire)
+- Fix confusing screen when visiting a confirmation link for an already-confirmed email (#27368 by @ClearlyClaire)
+- Fix explore page reloading when you navigate back to it in web UI (#27489 by @Gargron)
+- Fix missing redirection from `/home` to `/deck/home` in the advanced interface (#27378 by @Signez)
+- Fix empty environment variables not using default nil value (#27400 by @renchap)
+- Fix language sorting in settings (#27158 by @gunchleoc)
+
 ## |4.2.11] - 2024-08-16
 
 ### Added

Gemfile

@@ -64,7 +64,6 @@ gem 'link_header', '~> 0.0'
 gem 'mario-redis-lock', '~> 1.2', require: 'redis_lock'
 gem 'mime-types', '~> 3.5.0', require: 'mime/types/columnar'
 gem 'nokogiri', '~> 1.15'
-gem 'nsa'
 gem 'oj', '~> 3.14'
 gem 'ox', '~> 2.14'
 gem 'parslet'

Gemfile.lock

@@ -100,7 +100,7 @@ GEM
     attr_required (1.0.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.964.0)
+    aws-partitions (1.966.0)
     aws-sdk-core (3.201.5)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
@@ -109,7 +109,7 @@ GEM
     aws-sdk-kms (1.88.0)
       aws-sdk-core (~> 3, >= 3.201.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.158.0)
+    aws-sdk-s3 (1.159.0)
       aws-sdk-core (~> 3, >= 3.201.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -455,11 +455,6 @@ GEM
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nsa (0.3.0)
-      activesupport (>= 4.2, < 7.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      sidekiq (>= 3.5)
-      statsd-ruby (~> 1.4, >= 1.4.0)
     oj (3.16.5)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
@@ -518,7 +513,7 @@ GEM
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-active_support (~> 0.1)
       opentelemetry-instrumentation-base (~> 0.22.1)
-    opentelemetry-instrumentation-active_job (0.7.6)
+    opentelemetry-instrumentation-active_job (0.7.7)
       opentelemetry-api (~> 1.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
     opentelemetry-instrumentation-active_model_serializers (0.20.2)
@@ -821,7 +816,6 @@ GEM
     simplecov-lcov (0.8.0)
     simplecov_json_formatter (0.1.4)
     stackprof (0.2.26)
-    statsd-ruby (1.5.0)
     stoplight (4.1.0)
       redlock (~> 1.0)
     stringio (3.1.1)
@@ -980,7 +974,6 @@ DEPENDENCIES
   net-http (~> 0.4.0)
   net-ldap (~> 0.18)
   nokogiri (~> 1.15)
-  nsa
   oj (~> 3.14)
   omniauth (~> 2.0)
   omniauth-cas (~> 3.0.0.beta.1)

app/controllers/api/v1/notifications/requests_controller.rb

@@ -75,13 +75,17 @@ class Api::V1::Notifications::RequestsController < Api::BaseController
   end
 
   def next_path
-    api_v1_notifications_requests_url pagination_params(max_id: pagination_max_id) unless @requests.empty?
+    api_v1_notifications_requests_url pagination_params(max_id: pagination_max_id) if records_continue?
   end
 
   def prev_path
     api_v1_notifications_requests_url pagination_params(min_id: pagination_since_id) unless @requests.empty?
   end
 
+  def records_continue?
+    @requests.size == limit_param(DEFAULT_ACCOUNTS_LIMIT)
+  end
+
   def pagination_max_id
     @requests.last.id
   end

app/helpers/application_helper.rb

@@ -252,22 +252,6 @@ module ApplicationHelper
     full_asset_url(instance_presenter.mascot&.file&.url || frontend_asset_path('images/elephant_ui_plane.svg'))
   end
 
-  def instance_presenter
-    @instance_presenter ||= InstancePresenter.new
-  end
-
-  def favicon_path(size = '48')
-    instance_presenter.favicon&.file&.url(size)
-  end
-
-  def app_icon_path(size = '48')
-    instance_presenter.app_icon&.file&.url(size)
-  end
-
-  def use_mask_icon?
-    instance_presenter.app_icon.blank?
-  end
-
   private
 
   def storage_host_var

app/helpers/instance_helper.rb

@@ -13,6 +13,22 @@ module InstanceHelper
     safe_join([description_prefix(invite), I18n.t('auth.description.suffix')], ' ')
   end
 
+  def instance_presenter
+    @instance_presenter ||= InstancePresenter.new
+  end
+
+  def favicon_path(size = '48')
+    instance_presenter.favicon&.file&.url(size)
+  end
+
+  def app_icon_path(size = '48')
+    instance_presenter.app_icon&.file&.url(size)
+  end
+
+  def use_mask_icon?
+    instance_presenter.app_icon.blank?
+  end
+
   private
 
   def description_prefix(invite)

app/javascript/images/filter-stripes.svg

@@ -0,0 +1,24 @@
+<svg width="5" height="80" viewBox="0 0 5 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_954_5239)">
+<rect width="5" height="80" transform="matrix(1 0 0 -1 0 80)" fill="#2F0C7A"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 84C6.46234 83.9609 6.57112 83.9208 6.68172 83.8795C6.79039 83.839 7.16116 83.7 7.21197 83.681C10.0919 82.6043 11.8941 82.2 15 82.2C18.0813 82.2 19.6086 82.5665 22.3886 83.6785C22.6753 83.7932 22.9494 83.9003 23.2136 84H25.0812C24.3279 83.7808 23.5395 83.4927 22.6114 83.1215C19.7664 81.9835 18.1687 81.6 15 81.6C11.8122 81.6 9.94344 82.0192 7.00185 83.119C6.95066 83.1381 6.58016 83.277 6.47198 83.3174C5.72954 83.5944 5.0738 83.8198 4.45483 84H6.35524ZM6.35524 78C3.97726 78.8676 2.42302 79.2 0 79.2L0 78.6C1.72318 78.6 2.98542 78.4277 4.45483 78H6.35524ZM23.2136 78C25.5716 78.8899 27.1507 79.2 30 79.2V78.6C27.9473 78.6 26.5843 78.4373 25.0812 78L23.2136 78ZM0 82.2C2.53215 82.2 4.1155 81.837 6.68172 80.8795C6.79039 80.839 7.16116 80.7 7.21197 80.681C10.0919 79.6043 11.8941 79.2 15 79.2C18.0813 79.2 19.6086 79.5665 22.3886 80.6785C25.2336 81.8165 26.8313 82.2 30 82.2V81.6C26.9187 81.6 25.3914 81.2335 22.6114 80.1215C19.7664 78.9835 18.1687 78.6 15 78.6C11.8122 78.6 9.94344 79.0192 7.00185 80.119C6.95066 80.1381 6.58016 80.277 6.47198 80.3174C3.96706 81.2519 2.44905 81.6 0 81.6L0 82.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 78C6.46234 77.9609 6.57112 77.9208 6.68172 77.8795C6.79039 77.839 7.16116 77.7 7.21197 77.681C10.0919 76.6043 11.8941 76.2 15 76.2C18.0813 76.2 19.6086 76.5665 22.3886 77.6785C22.6753 77.7932 22.9494 77.9003 23.2136 78H25.0812C24.3279 77.7808 23.5395 77.4927 22.6114 77.1215C19.7664 75.9835 18.1687 75.6 15 75.6C11.8122 75.6 9.94344 76.0192 7.00185 77.119C6.95066 77.1381 6.58016 77.277 6.47198 77.3174C5.72954 77.5944 5.0738 77.8198 4.45483 78H6.35524ZM6.35524 72C3.97726 72.8676 2.42302 73.2 0 73.2L0 72.6C1.72318 72.6 2.98542 72.4277 4.45483 72H6.35524ZM23.2136 72C25.5716 72.8899 27.1507 73.2 30 73.2V72.6C27.9473 72.6 26.5843 72.4373 25.0812 72L23.2136 72ZM0 76.2C2.53215 76.2 4.1155 75.837 6.68172 74.8795C6.79039 74.839 7.16116 74.7 7.21197 74.681C10.0919 73.6043 11.8941 73.2 15 73.2C18.0813 73.2 19.6086 73.5665 22.3886 74.6785C25.2336 75.8165 26.8313 76.2 30 76.2V75.6C26.9187 75.6 25.3914 75.2335 22.6114 74.1215C19.7664 72.9835 18.1687 72.6 15 72.6C11.8122 72.6 9.94344 73.0192 7.00185 74.119C6.95066 74.1381 6.58016 74.277 6.47198 74.3174C3.96706 75.2519 2.44905 75.6 0 75.6L0 76.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 72C6.46234 71.9609 6.57112 71.9208 6.68172 71.8795C6.79039 71.839 7.16116 71.7 7.21197 71.681C10.0919 70.6043 11.8941 70.2 15 70.2C18.0813 70.2 19.6086 70.5665 22.3886 71.6785C22.6753 71.7932 22.9494 71.9003 23.2136 72H25.0812C24.3279 71.7808 23.5395 71.4927 22.6114 71.1215C19.7664 69.9835 18.1687 69.6 15 69.6C11.8122 69.6 9.94344 70.0192 7.00185 71.119C6.95066 71.1381 6.58016 71.277 6.47198 71.3174C5.72954 71.5944 5.0738 71.8198 4.45483 72H6.35524ZM6.35524 66C3.97726 66.8676 2.42302 67.2 0 67.2L0 66.6C1.72318 66.6 2.98542 66.4277 4.45483 66H6.35524ZM23.2136 66C25.5716 66.8899 27.1507 67.2 30 67.2V66.6C27.9473 66.6 26.5843 66.4373 25.0812 66L23.2136 66ZM0 70.2C2.53215 70.2 4.1155 69.837 6.68172 68.8795C6.79039 68.839 7.16116 68.7 7.21197 68.681C10.0919 67.6043 11.8941 67.2 15 67.2C18.0813 67.2 19.6086 67.5665 22.3886 68.6785C25.2336 69.8165 26.8313 70.2 30 70.2V69.6C26.9187 69.6 25.3914 69.2335 22.6114 68.1215C19.7664 66.9835 18.1687 66.6 15 66.6C11.8122 66.6 9.94344 67.0192 7.00185 68.119C6.95066 68.1381 6.58016 68.277 6.47198 68.3174C3.96706 69.2519 2.44905 69.6 0 69.6L0 70.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 66C6.46234 65.9609 6.57112 65.9208 6.68172 65.8795C6.79039 65.839 7.16116 65.7 7.21197 65.681C10.0919 64.6043 11.8941 64.2 15 64.2C18.0813 64.2 19.6086 64.5665 22.3886 65.6785C22.6753 65.7932 22.9494 65.9003 23.2136 66H25.0812C24.3279 65.7808 23.5395 65.4927 22.6114 65.1215C19.7664 63.9835 18.1687 63.6 15 63.6C11.8122 63.6 9.94344 64.0192 7.00185 65.119C6.95066 65.1381 6.58016 65.277 6.47198 65.3174C5.72954 65.5944 5.0738 65.8198 4.45483 66H6.35524ZM6.35524 60C3.97726 60.8676 2.42302 61.2 0 61.2L0 60.6C1.72318 60.6 2.98542 60.4277 4.45483 60H6.35524ZM23.2136 60C25.5716 60.8899 27.1507 61.2 30 61.2V60.6C27.9473 60.6 26.5843 60.4373 25.0812 60L23.2136 60ZM0 64.2C2.53215 64.2 4.1155 63.837 6.68172 62.8795C6.79039 62.839 7.16116 62.7 7.21197 62.681C10.0919 61.6043 11.8941 61.2 15 61.2C18.0813 61.2 19.6086 61.5665 22.3886 62.6785C25.2336 63.8165 26.8313 64.2 30 64.2V63.6C26.9187 63.6 25.3914 63.2335 22.6114 62.1215C19.7664 60.9835 18.1687 60.6 15 60.6C11.8122 60.6 9.94344 61.0192 7.00185 62.119C6.95066 62.1381 6.58016 62.277 6.47198 62.3174C3.96706 63.2519 2.44905 63.6 0 63.6L0 64.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 60C6.46234 59.9609 6.57112 59.9208 6.68172 59.8795C6.79039 59.839 7.16116 59.7 7.21197 59.681C10.0919 58.6043 11.8941 58.2 15 58.2C18.0813 58.2 19.6086 58.5665 22.3886 59.6785C22.6753 59.7932 22.9494 59.9003 23.2136 60H25.0812C24.3279 59.7808 23.5395 59.4927 22.6114 59.1215C19.7664 57.9835 18.1687 57.6 15 57.6C11.8122 57.6 9.94344 58.0192 7.00185 59.119C6.95066 59.1381 6.58016 59.277 6.47198 59.3174C5.72954 59.5944 5.0738 59.8198 4.45483 60H6.35524ZM6.35524 54C3.97726 54.8676 2.42302 55.2 0 55.2L0 54.6C1.72318 54.6 2.98542 54.4277 4.45483 54H6.35524ZM23.2136 54C25.5716 54.8899 27.1507 55.2 30 55.2V54.6C27.9473 54.6 26.5843 54.4373 25.0812 54L23.2136 54ZM0 58.2C2.53215 58.2 4.1155 57.837 6.68172 56.8795C6.79039 56.839 7.16116 56.7 7.21197 56.681C10.0919 55.6043 11.8941 55.2 15 55.2C18.0813 55.2 19.6086 55.5665 22.3886 56.6785C25.2336 57.8165 26.8313 58.2 30 58.2V57.6C26.9187 57.6 25.3914 57.2335 22.6114 56.1215C19.7664 54.9835 18.1687 54.6 15 54.6C11.8122 54.6 9.94344 55.0192 7.00185 56.119C6.95066 56.1381 6.58016 56.277 6.47198 56.3174C3.96706 57.2519 2.44905 57.6 0 57.6L0 58.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 54C6.46234 53.9609 6.57112 53.9208 6.68172 53.8795C6.79039 53.839 7.16116 53.7 7.21197 53.681C10.0919 52.6043 11.8941 52.2 15 52.2C18.0813 52.2 19.6086 52.5665 22.3886 53.6785C22.6753 53.7932 22.9494 53.9003 23.2136 54H25.0812C24.3279 53.7808 23.5395 53.4927 22.6114 53.1215C19.7664 51.9835 18.1687 51.6 15 51.6C11.8122 51.6 9.94344 52.0192 7.00185 53.119C6.95066 53.1381 6.58016 53.277 6.47198 53.3174C5.72954 53.5944 5.0738 53.8198 4.45483 54H6.35524ZM6.35524 48C3.97726 48.8676 2.42302 49.2 0 49.2L0 48.6C1.72318 48.6 2.98542 48.4277 4.45483 48H6.35524ZM23.2136 48C25.5716 48.8899 27.1507 49.2 30 49.2V48.6C27.9473 48.6 26.5843 48.4373 25.0812 48L23.2136 48ZM0 52.2C2.53215 52.2 4.1155 51.837 6.68172 50.8795C6.79039 50.839 7.16116 50.7 7.21197 50.681C10.0919 49.6043 11.8941 49.2 15 49.2C18.0813 49.2 19.6086 49.5665 22.3886 50.6785C25.2336 51.8165 26.8313 52.2 30 52.2V51.6C26.9187 51.6 25.3914 51.2335 22.6114 50.1215C19.7664 48.9835 18.1687 48.6 15 48.6C11.8122 48.6 9.94344 49.0192 7.00185 50.119C6.95066 50.1381 6.58016 50.277 6.47198 50.3174C3.96706 51.2519 2.44905 51.6 0 51.6L0 52.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 48C6.46234 47.9609 6.57112 47.9208 6.68172 47.8795C6.79039 47.839 7.16116 47.7 7.21197 47.681C10.0919 46.6043 11.8941 46.2 15 46.2C18.0813 46.2 19.6086 46.5665 22.3886 47.6785C22.6753 47.7932 22.9494 47.9003 23.2136 48H25.0812C24.3279 47.7808 23.5395 47.4927 22.6114 47.1215C19.7664 45.9835 18.1687 45.6 15 45.6C11.8122 45.6 9.94344 46.0192 7.00185 47.119C6.95066 47.1381 6.58016 47.277 6.47198 47.3174C5.72954 47.5944 5.0738 47.8198 4.45483 48H6.35524ZM6.35524 42C3.97726 42.8676 2.42302 43.2 0 43.2L0 42.6C1.72318 42.6 2.98542 42.4277 4.45483 42H6.35524ZM23.2136 42C25.5716 42.8899 27.1507 43.2 30 43.2V42.6C27.9473 42.6 26.5843 42.4373 25.0812 42L23.2136 42ZM0 46.2C2.53215 46.2 4.1155 45.837 6.68172 44.8795C6.79039 44.839 7.16116 44.7 7.21197 44.681C10.0919 43.6043 11.8941 43.2 15 43.2C18.0813 43.2 19.6086 43.5665 22.3886 44.6785C25.2336 45.8165 26.8313 46.2 30 46.2V45.6C26.9187 45.6 25.3914 45.2335 22.6114 44.1215C19.7664 42.9835 18.1687 42.6 15 42.6C11.8122 42.6 9.94344 43.0192 7.00185 44.119C6.95066 44.1381 6.58016 44.277 6.47198 44.3174C3.96706 45.2519 2.44905 45.6 0 45.6L0 46.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 42C6.46234 41.9609 6.57112 41.9208 6.68172 41.8795C6.79039 41.839 7.16116 41.7 7.21197 41.681C10.0919 40.6043 11.8941 40.2 15 40.2C18.0813 40.2 19.6086 40.5665 22.3886 41.6785C22.6753 41.7932 22.9494 41.9003 23.2136 42H25.0812C24.3279 41.7808 23.5395 41.4927 22.6114 41.1215C19.7664 39.9835 18.1687 39.6 15 39.6C11.8122 39.6 9.94344 40.0192 7.00185 41.119C6.95066 41.1381 6.58016 41.277 6.47198 41.3174C5.72954 41.5944 5.0738 41.8198 4.45483 42H6.35524ZM6.35524 36C3.97726 36.8676 2.42302 37.2 0 37.2L0 36.6C1.72318 36.6 2.98542 36.4277 4.45483 36H6.35524ZM23.2136 36C25.5716 36.8899 27.1507 37.2 30 37.2V36.6C27.9473 36.6 26.5843 36.4373 25.0812 36L23.2136 36ZM0 40.2C2.53215 40.2 4.1155 39.837 6.68172 38.8795C6.79039 38.839 7.16116 38.7 7.21197 38.681C10.0919 37.6043 11.8941 37.2 15 37.2C18.0813 37.2 19.6086 37.5665 22.3886 38.6785C25.2336 39.8165 26.8313 40.2 30 40.2V39.6C26.9187 39.6 25.3914 39.2335 22.6114 38.1215C19.7664 36.9835 18.1687 36.6 15 36.6C11.8122 36.6 9.94344 37.0192 7.00185 38.119C6.95066 38.1381 6.58016 38.277 6.47198 38.3174C3.96706 39.2519 2.44905 39.6 0 39.6L0 40.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 36C6.46234 35.9609 6.57112 35.9208 6.68172 35.8795C6.79039 35.839 7.16116 35.7 7.21197 35.681C10.0919 34.6043 11.8941 34.2 15 34.2C18.0813 34.2 19.6086 34.5665 22.3886 35.6785C22.6753 35.7932 22.9494 35.9003 23.2136 36H25.0812C24.3279 35.7808 23.5395 35.4927 22.6114 35.1215C19.7664 33.9835 18.1687 33.6 15 33.6C11.8122 33.6 9.94344 34.0192 7.00185 35.119C6.95066 35.1381 6.58016 35.277 6.47198 35.3174C5.72954 35.5944 5.0738 35.8198 4.45483 36H6.35524ZM6.35524 30C3.97726 30.8676 2.42302 31.2 0 31.2L0 30.6C1.72318 30.6 2.98542 30.4277 4.45483 30H6.35524ZM23.2136 30C25.5716 30.8899 27.1507 31.2 30 31.2V30.6C27.9473 30.6 26.5843 30.4373 25.0812 30L23.2136 30ZM0 34.2C2.53215 34.2 4.1155 33.837 6.68172 32.8795C6.79039 32.839 7.16116 32.7 7.21197 32.681C10.0919 31.6043 11.8941 31.2 15 31.2C18.0813 31.2 19.6086 31.5665 22.3886 32.6785C25.2336 33.8165 26.8313 34.2 30 34.2V33.6C26.9187 33.6 25.3914 33.2335 22.6114 32.1215C19.7664 30.9835 18.1687 30.6 15 30.6C11.8122 30.6 9.94344 31.0192 7.00185 32.119C6.95066 32.1381 6.58016 32.277 6.47198 32.3174C3.96706 33.2519 2.44905 33.6 0 33.6L0 34.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 30C6.46234 29.9609 6.57112 29.9208 6.68172 29.8795C6.79039 29.839 7.16116 29.7 7.21197 29.681C10.0919 28.6043 11.8941 28.2 15 28.2C18.0813 28.2 19.6086 28.5665 22.3886 29.6785C22.6753 29.7932 22.9494 29.9003 23.2136 30H25.0812C24.3279 29.7808 23.5395 29.4927 22.6114 29.1215C19.7664 27.9835 18.1687 27.6 15 27.6C11.8122 27.6 9.94344 28.0192 7.00185 29.119C6.95066 29.1381 6.58016 29.277 6.47198 29.3174C5.72954 29.5944 5.0738 29.8198 4.45483 30H6.35524ZM6.35524 24C3.97726 24.8676 2.42302 25.2 0 25.2L0 24.6C1.72318 24.6 2.98542 24.4277 4.45483 24H6.35524ZM23.2136 24C25.5716 24.8899 27.1507 25.2 30 25.2V24.6C27.9473 24.6 26.5843 24.4373 25.0812 24L23.2136 24ZM0 28.2C2.53215 28.2 4.1155 27.837 6.68172 26.8795C6.79039 26.839 7.16116 26.7 7.21197 26.681C10.0919 25.6043 11.8941 25.2 15 25.2C18.0813 25.2 19.6086 25.5665 22.3886 26.6785C25.2336 27.8165 26.8313 28.2 30 28.2V27.6C26.9187 27.6 25.3914 27.2335 22.6114 26.1215C19.7664 24.9835 18.1687 24.6 15 24.6C11.8122 24.6 9.94344 25.0192 7.00185 26.119C6.95066 26.1381 6.58016 26.277 6.47198 26.3174C3.96706 27.2519 2.44905 27.6 0 27.6L0 28.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 24C6.46234 23.9609 6.57112 23.9208 6.68172 23.8795C6.79039 23.839 7.16116 23.7 7.21197 23.681C10.0919 22.6043 11.8941 22.2 15 22.2C18.0813 22.2 19.6086 22.5665 22.3886 23.6785C22.6753 23.7932 22.9494 23.9003 23.2136 24H25.0812C24.3279 23.7808 23.5395 23.4927 22.6114 23.1215C19.7664 21.9835 18.1687 21.6 15 21.6C11.8122 21.6 9.94344 22.0192 7.00185 23.119C6.95066 23.1381 6.58016 23.277 6.47198 23.3174C5.72954 23.5944 5.0738 23.8198 4.45483 24H6.35524ZM6.35524 18C3.97726 18.8676 2.42302 19.2 0 19.2L0 18.6C1.72318 18.6 2.98542 18.4277 4.45483 18H6.35524ZM23.2136 18C25.5716 18.8899 27.1507 19.2 30 19.2V18.6C27.9473 18.6 26.5843 18.4373 25.0812 18L23.2136 18ZM0 22.2C2.53215 22.2 4.1155 21.837 6.68172 20.8795C6.79039 20.839 7.16116 20.7 7.21197 20.681C10.0919 19.6043 11.8941 19.2 15 19.2C18.0813 19.2 19.6086 19.5665 22.3886 20.6785C25.2336 21.8165 26.8313 22.2 30 22.2V21.6C26.9187 21.6 25.3914 21.2335 22.6114 20.1215C19.7664 18.9835 18.1687 18.6 15 18.6C11.8122 18.6 9.94344 19.0192 7.00185 20.119C6.95066 20.1381 6.58016 20.277 6.47198 20.3174C3.96706 21.2519 2.44905 21.6 0 21.6L0 22.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 18C6.46234 17.9609 6.57112 17.9208 6.68172 17.8795C6.79039 17.839 7.16116 17.7 7.21197 17.681C10.0919 16.6043 11.8941 16.2 15 16.2C18.0813 16.2 19.6086 16.5665 22.3886 17.6785C22.6753 17.7932 22.9494 17.9003 23.2136 18H25.0812C24.3279 17.7808 23.5395 17.4927 22.6114 17.1215C19.7664 15.9835 18.1687 15.6 15 15.6C11.8122 15.6 9.94344 16.0192 7.00185 17.119C6.95066 17.1381 6.58016 17.277 6.47198 17.3174C5.72954 17.5944 5.0738 17.8198 4.45483 18H6.35524ZM6.35524 12C3.97726 12.8676 2.42302 13.2 0 13.2L0 12.6C1.72318 12.6 2.98542 12.4277 4.45483 12H6.35524ZM23.2136 12C25.5716 12.8899 27.1507 13.2 30 13.2V12.6C27.9473 12.6 26.5843 12.4373 25.0812 12L23.2136 12ZM0 16.2C2.53215 16.2 4.1155 15.837 6.68172 14.8795C6.79039 14.839 7.16116 14.7 7.21197 14.681C10.0919 13.6043 11.8941 13.2 15 13.2C18.0813 13.2 19.6086 13.5665 22.3886 14.6785C25.2336 15.8165 26.8313 16.2 30 16.2V15.6C26.9187 15.6 25.3914 15.2335 22.6114 14.1215C19.7664 12.9835 18.1687 12.6 15 12.6C11.8122 12.6 9.94344 13.0192 7.00185 14.119C6.95066 14.1381 6.58016 14.277 6.47198 14.3174C3.96706 15.2519 2.44905 15.6 0 15.6L0 16.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 12C6.46234 11.9609 6.57112 11.9208 6.68172 11.8795C6.79039 11.839 7.16116 11.7 7.21197 11.681C10.0919 10.6043 11.8941 10.2 15 10.2C18.0813 10.2 19.6086 10.5665 22.3886 11.6785C22.6753 11.7932 22.9494 11.9003 23.2136 12H25.0812C24.3279 11.7808 23.5395 11.4927 22.6114 11.1215C19.7664 9.98347 18.1687 9.6 15 9.6C11.8122 9.6 9.94344 10.0192 7.00185 11.119C6.95066 11.1381 6.58016 11.277 6.47198 11.3174C5.72954 11.5944 5.0738 11.8198 4.45483 12H6.35524ZM6.35524 6C3.97726 6.86758 2.42302 7.2 0 7.2L0 6.6C1.72318 6.6 2.98542 6.42769 4.45483 6H6.35524ZM23.2136 6C25.5716 6.88993 27.1507 7.2 30 7.2V6.6C27.9473 6.6 26.5843 6.43734 25.0812 6L23.2136 6ZM0 10.2C2.53215 10.2 4.1155 9.83697 6.68172 8.8795C6.79039 8.83895 7.16116 8.7 7.21197 8.681C10.0919 7.60427 11.8941 7.2 15 7.2C18.0813 7.2 19.6086 7.56653 22.3886 8.67854C25.2336 9.81653 26.8313 10.2 30 10.2V9.6C26.9187 9.6 25.3914 9.23347 22.6114 8.12146C19.7664 6.98347 18.1687 6.6 15 6.6C11.8122 6.6 9.94344 7.01922 7.00185 8.119C6.95066 8.13814 6.58016 8.27699 6.47198 8.31735C3.96706 9.25195 2.44905 9.6 0 9.6L0 10.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.35524 6C6.46234 5.96092 6.57112 5.92076 6.68172 5.8795C6.79039 5.83895 7.16116 5.7 7.21197 5.681C10.0919 4.60427 11.8941 4.2 15 4.2C18.0813 4.2 19.6086 4.56653 22.3886 5.67854C22.6753 5.79323 22.9494 5.90026 23.2136 6H25.0812C24.3279 5.78083 23.5395 5.49269 22.6114 5.12146C19.7664 3.98347 18.1687 3.6 15 3.6C11.8122 3.6 9.94344 4.01922 7.00185 5.119C6.95066 5.13814 6.58016 5.27699 6.47198 5.31735C5.72954 5.59436 5.0738 5.81984 4.45483 6H6.35524ZM6.35524 0C3.97726 0.867585 2.42302 1.2 0 1.2L0 0.6C1.72318 0.6 2.98542 0.427692 4.45483 0L6.35524 0ZM23.2136 0C25.5716 0.88993 27.1507 1.2 30 1.2V0.6C27.9473 0.6 26.5843 0.437343 25.0812 0L23.2136 0ZM0 4.2C2.53215 4.2 4.1155 3.83697 6.68172 2.8795C6.79039 2.83895 7.16116 2.7 7.21197 2.681C10.0919 1.60427 11.8941 1.2 15 1.2C18.0813 1.2 19.6086 1.56653 22.3886 2.67854C25.2336 3.81653 26.8313 4.2 30 4.2V3.6C26.9187 3.6 25.3914 3.23347 22.6114 2.12146C19.7664 0.983469 18.1687 0.6 15 0.6C11.8122 0.6 9.94344 1.01922 7.00185 2.119C6.95066 2.13814 6.58016 2.27699 6.47198 2.31735C3.96706 3.25195 2.44905 3.6 0 3.6L0 4.2Z" fill="#858AFA" stroke="#858AFA" stroke-width="0.5"/>
+</g>
+<defs>
+<clipPath id="clip0_954_5239">
+<rect width="5" height="80" fill="white" transform="matrix(1 0 0 -1 0 80)"/>
+</clipPath>
+</defs>
+</svg>

app/javascript/images/quote-stripes.svg

@@ -0,0 +1,10 @@
+<svg width="5" height="80" viewBox="0 0 5 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_954_5239)">
+<rect width="5" height="80" transform="matrix(1 0 0 -1 0 80)" fill="#788E67"/>
+</g>
+<defs>
+<clipPath id="clip0_954_5239">
+<rect width="5" height="80" fill="white" transform="matrix(1 0 0 -1 0 80)"/>
+</clipPath>
+</defs>
+</svg>

app/javascript/mastodon/components/compacted_status.jsx

@@ -9,22 +9,35 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import { HotKeys } from 'react-hotkeys';
 
+import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
+import QuoteIcon from '@/material-icons/400-24px/format_quote.svg?react';
+import ReferenceIcon from '@/material-icons/400-24px/link.svg?react';
+import PushPinIcon from '@/material-icons/400-24px/push_pin.svg?react';
+import RepeatIcon from '@/material-icons/400-24px/repeat.svg?react';
+import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
+import LimitedIcon from '@/material-icons/400-24px/shield.svg?react';
+import TimerIcon from '@/material-icons/400-24px/timer.svg?react';
 import AttachmentList from 'mastodon/components/attachment_list';
+import { ContentWarning } from 'mastodon/components/content_warning';
 import { Icon }  from 'mastodon/components/icon';
-import { WithRouterPropTypes } from 'mastodon/utils/react_router';
+import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';
+import { withOptionalRouter, WithOptionalRouterPropTypes } from 'mastodon/utils/react_router';
 
 import Card from '../features/status/components/card';
 // We use the component (and not the container) since we do not want
 // to use the progress bar to show download progress
 import Bundle from '../features/ui/components/bundle';
 import { MediaGallery, Video, Audio } from '../features/ui/util/async-components';
+import { SensitiveMediaContext } from '../features/ui/util/sensitive_media_context';
 import { displayMedia } from '../initial_state';
 
 import { Avatar } from './avatar';
 import { DisplayName } from './display_name';
 import { getHashtagBarForStatus } from './hashtag_bar';
 import { RelativeTimestamp } from './relative_timestamp';
+import StatusActionBar from './status_action_bar';
 import StatusContent from './status_content';
+import { VisibilityIcon } from './visibility_icon';
 
 const domParser = new DOMParser();
 
@@ -62,19 +75,36 @@ export const defaultMediaVisibility = (status) => {
 };
 
 const messages = defineMessages({
+  limited_short: { id: 'privacy.limited.short', defaultMessage: 'Limited' },
   edited: { id: 'status.edited', defaultMessage: 'Edited {date}' },
 });
 
 class CompactedStatus extends ImmutablePureComponent {
 
+  static contextType = SensitiveMediaContext;
+
   static propTypes = {
     status: ImmutablePropTypes.map,
+    account: ImmutablePropTypes.record,
     previousId: PropTypes.string,
     nextInReplyToId: PropTypes.string,
     rootId: PropTypes.string,
     onClick: PropTypes.func,
+    onReply: PropTypes.func,
+    onFavourite: PropTypes.func,
+    onEmojiReact: PropTypes.func,
+    onUnEmojiReact: PropTypes.func,
+    onReblog: PropTypes.func,
+    onReblogForceModal: PropTypes.func,
+    onDelete: PropTypes.func,
+    onDirect: PropTypes.func,
+    onMention: PropTypes.func,
+    onPin: PropTypes.func,
     onOpenMedia: PropTypes.func,
     onOpenVideo: PropTypes.func,
+    onBlock: PropTypes.func,
+    onAddFilter: PropTypes.func,
+    onEmbed: PropTypes.func,
     onHeightChange: PropTypes.func,
     onToggleHidden: PropTypes.func,
     onToggleCollapsed: PropTypes.func,
@@ -90,33 +120,43 @@ class CompactedStatus extends ImmutablePureComponent {
     updateScrollBottom: PropTypes.func,
     cacheMediaWidth: PropTypes.func,
     cachedMediaWidth: PropTypes.number,
-    history: PropTypes.func,
+    scrollKey: PropTypes.string,
-    ...WithRouterPropTypes,
+    skipPrepend: PropTypes.bool,
+    deployPictureInPicture: PropTypes.func,
+    unfocusable: PropTypes.bool,
+    pictureInPicture: ImmutablePropTypes.contains({
+      inUse: PropTypes.bool,
+      available: PropTypes.bool,
+    }),
+    withoutEmojiReactions: PropTypes.bool,
+    ...WithOptionalRouterPropTypes,
   };
 
   // Avoid checking props that are functions (and whose equality will always
   // evaluate to false. See react-immutable-pure-component for usage.
   updateOnProps = [
     'status',
+    'account',
     'muted',
     'hidden',
     'unread',
+    'pictureInPicture',
   ];
 
   state = {
-    showMedia: defaultMediaVisibility(this.props.status),
+    showMedia: defaultMediaVisibility(this.props.status) && !(this.context?.hideMediaByDefault),
-    statusId: undefined,
-    forceFilter: undefined,
   };
 
-  static getDerivedStateFromProps(nextProps, prevState) {
+  componentDidUpdate (prevProps) {
-    if (nextProps.status && nextProps.status.get('id') !== prevState.statusId) {
+    // This will potentially cause a wasteful redraw, but in most cases `Status` components are used
-      return {
+    // with a `key` directly depending on their `id`, preventing re-use of the component across
-        showMedia: defaultMediaVisibility(nextProps.status),
+    // different IDs.
-        statusId: nextProps.status.get('id'),
+    // But just in case this does change, reset the state on status change.
-      };
+
-    } else {
+    if (this.props.status?.get('id') !== prevProps.status?.get('id')) {
-      return null;
+      this.setState({
+        showMedia: defaultMediaVisibility(this.props.status) && !(this.context?.hideMediaByDefault),
+      });
     }
   }
 
@@ -223,6 +263,31 @@ class CompactedStatus extends ImmutablePureComponent {
     }
   };
 
+  handleDeployPictureInPicture = (type, mediaProps) => {
+    const { deployPictureInPicture } = this.props;
+    const status = this._properStatus();
+
+    deployPictureInPicture(status, type, mediaProps);
+  };
+
+  handleHotkeyReply = e => {
+    e.preventDefault();
+    this.props.onReply(this._properStatus());
+  };
+
+  handleHotkeyFavourite = () => {
+    this.props.onFavourite(this._properStatus());
+  };
+
+  handleHotkeyBoost = e => {
+    this.props.onReblog(this._properStatus(), e);
+  };
+
+  handleHotkeyMention = e => {
+    e.preventDefault();
+    this.props.onMention(this._properStatus().get('account'));
+  };
+
   handleHotkeyOpen = () => {
     if (this.props.onClick) {
       this.props.onClick();
@@ -263,7 +328,10 @@ class CompactedStatus extends ImmutablePureComponent {
   };
 
   handleHotkeyToggleHidden = () => {
-    this.props.onToggleHidden(this._properStatus());
+    const { onToggleHidden } = this.props;
+    const status = this._properStatus();
+
+    onToggleHidden(status);
   };
 
   handleHotkeyToggleSensitive = () => {
@@ -285,15 +353,19 @@ class CompactedStatus extends ImmutablePureComponent {
   };
 
   render () {
-    const { intl, hidden, featured, unread, showThread, previousId, nextInReplyToId, rootId } = this.props;
+    const { intl, hidden, featured, unfocusable, unread, showThread, scrollKey, pictureInPicture, previousId, nextInReplyToId, rootId, skipPrepend } = this.props;
 
-    let { status } = this.props;
+    let { status, account, ...other } = this.props;
 
     if (status === null) {
       return null;
     }
 
     const handlers = this.props.muted ? {} : {
+      reply: this.handleHotkeyReply,
+      favourite: this.handleHotkeyFavourite,
+      boost: this.handleHotkeyBoost,
+      mention: this.handleHotkeyMention,
       open: this.handleHotkeyOpen,
       openProfile: this.handleHotkeyOpenProfile,
       moveUp: this.handleHotkeyMoveUp,
@@ -303,12 +375,12 @@ class CompactedStatus extends ImmutablePureComponent {
       openMedia: this.handleHotkeyOpenMedia,
     };
 
-    let media, isCardMediaWithSensitive, prepend, rebloggedByText;
+    let media, prepend, rebloggedByText;
 
     if (hidden) {
       return (
-        <HotKeys handlers={handlers}>
+        <HotKeys handlers={handlers} tabIndex={unfocusable ? null : -1}>
-          <div ref={this.handleRef} className='status__wrapper'>
+          <div ref={this.handleRef} className={classNames('status__wrapper', { focusable: !this.props.muted })} tabIndex={unfocusable ? null : 0}>
             <span>{status.getIn(['account', 'display_name']) || status.getIn(['account', 'username'])}</span>
             <span>{status.get('content')}</span>
           </div>
@@ -320,36 +392,51 @@ class CompactedStatus extends ImmutablePureComponent {
     const connectToRoot = rootId && rootId === status.get('in_reply_to_id');
     const connectReply = nextInReplyToId && nextInReplyToId === status.get('id');
 
-    if (showThread && status.get('in_reply_to_id') && status.get('in_reply_to_account_id') === status.getIn(['account', 'id'])) {
+    let visibilityName = status.get('limited_scope') || status.get('visibility_ex') || status.get('visibility');
+
+    if (featured) {
+      prepend = (
+        <div className='status__prepend'>
+          <div className='status__prepend-icon-wrapper'><Icon id='thumb-tack' icon={PushPinIcon} className='status__prepend-icon' /></div>
+          <FormattedMessage id='status.pinned' defaultMessage='Pinned post' />
+        </div>
+      );
+    } else if (status.get('reblog', null) !== null && typeof status.get('reblog') === 'object') {
       const display_name_html = { __html: status.getIn(['account', 'display_name_html']) };
 
       prepend = (
         <div className='status__prepend'>
-          <div className='status__prepend-icon-wrapper'><Icon id='reply' className='status__prepend-icon' fixedWidth /></div>
+          <div className='status__prepend-icon-wrapper'><Icon id='retweet' icon={RepeatIcon} className='status__prepend-icon' /></div>
-          <FormattedMessage id='status.replied_to' defaultMessage='Replied to {name}' values={{ name: <a onClick={this.handlePrependAccountClick} data-id={status.getIn(['account', 'id'])} href={`/@${status.getIn(['account', 'acct'])}`} className='status__display-name muted'><bdi><strong dangerouslySetInnerHTML={display_name_html} /></bdi></a> }} />
+          <div className='status__prepend-icon-wrapper'><VisibilityIcon visibility={visibilityName} className='status__prepend-icon' /></div>
+          <FormattedMessage id='status.reblogged_by' defaultMessage='{name} boosted' values={{ name: <a onClick={this.handlePrependAccountClick} data-id={status.getIn(['account', 'id'])} data-hover-card-account={status.getIn(['account', 'id'])} href={`/@${status.getIn(['account', 'acct'])}`} className='status__display-name muted'><bdi><strong dangerouslySetInnerHTML={display_name_html} /></bdi></a> }} />
+        </div>
+      );
+
+      rebloggedByText = intl.formatMessage({ id: 'status.reblogged_by', defaultMessage: '{name} boosted' }, { name: status.getIn(['account', 'acct']) });
+
+      account = status.get('account');
+      status  = status.get('reblog');
+    } else if (status.get('visibility') === 'direct') {
+      prepend = (
+        <div className='status__prepend'>
+          <div className='status__prepend-icon-wrapper'><Icon id='at' icon={AlternateEmailIcon} className='status__prepend-icon' /></div>
+          <FormattedMessage id='status.direct_indicator' defaultMessage='Private mention' />
+        </div>
+      );
+    } else if (showThread && status.get('in_reply_to_id') && status.get('in_reply_to_account_id') === status.getIn(['account', 'id'])) {
+      const display_name_html = { __html: status.getIn(['account', 'display_name_html']) };
+
+      prepend = (
+        <div className='status__prepend'>
+          <div className='status__prepend-icon-wrapper'><Icon id='reply' icon={ReplyIcon} className='status__prepend-icon' /></div>
+          <FormattedMessage id='status.replied_to' defaultMessage='Replied to {name}' values={{ name: <a onClick={this.handlePrependAccountClick} data-id={status.getIn(['account', 'id'])} data-hover-card-account={status.getIn(['account', 'id'])} href={`/@${status.getIn(['account', 'acct'])}`} className='status__display-name muted'><bdi><strong dangerouslySetInnerHTML={display_name_html} /></bdi></a> }} />
         </div>
       );
     }
 
-    if (status.get('quote_muted')) {
+    if (pictureInPicture.get('inUse')) {
-      const minHandlers = {
+      media = <PictureInPicturePlaceholder aspectRatio={this.getAttachmentAspectRatio()} />;
-        moveUp: this.handleHotkeyMoveUp,
+    } else if (status.get('media_attachments').size > 0) {
-        moveDown: this.handleHotkeyMoveDown,
-      };
-
-      return (
-        <HotKeys handlers={minHandlers}>
-          {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
-          <div className='status__wrapper status__wrapper__compact status__wrapper--filtered' ref={this.handleRef} onClick={this.handleClick}>
-            <FormattedMessage id='status.quote_filtered' defaultMessage='This quote is filtered because of muting, blocking or domain blocking' />
-          </div>
-        </HotKeys>
-      );
-    }
-
-    isCardMediaWithSensitive = false;
-
-    if (status.get('media_attachments').size > 0) {
       const language = status.getIn(['translation', 'language']) || status.get('language');
 
       if (this.props.muted) {
@@ -378,6 +465,7 @@ class CompactedStatus extends ImmutablePureComponent {
                 width={this.props.cachedMediaWidth}
                 height={110}
                 cacheWidth={this.props.cacheMediaWidth}
+                deployPictureInPicture={pictureInPicture.get('available') ? this.handleDeployPictureInPicture : undefined}
                 sensitive={status.get('sensitive')}
                 blurhash={attachment.get('blurhash')}
                 visible={this.state.showMedia}
@@ -403,6 +491,7 @@ class CompactedStatus extends ImmutablePureComponent {
                 lang={language}
                 sensitive={status.get('sensitive')}
                 onOpenVideo={this.handleOpenVideo}
+                deployPictureInPicture={pictureInPicture.get('available') ? this.handleDeployPictureInPicture : undefined}
                 visible={this.state.showMedia}
                 onToggleVisibility={this.handleToggleMediaVisibility}
               />
@@ -414,7 +503,6 @@ class CompactedStatus extends ImmutablePureComponent {
           <Bundle fetchComponent={MediaGallery} loading={this.renderLoadingMediaGallery}>
             {Component => (
               <Component
-                compact
                 media={status.get('media_attachments')}
                 lang={language}
                 sensitive={status.get('sensitive')}
@@ -438,28 +526,40 @@ class CompactedStatus extends ImmutablePureComponent {
           sensitive={status.get('sensitive') && !status.get('spoiler_text')}
         />
       );
-      isCardMediaWithSensitive = status.get('spoiler_text').length > 0;
     }
 
+    visibilityName = status.get('limited_scope') || status.get('visibility_ex') || status.get('visibility');
+
     const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
     const expanded = !status.get('hidden') || status.get('spoiler_text').length === 0;
 
+    const withLimited = status.get('visibility_ex') === 'limited' && status.get('limited_scope') ? <span className='status__visibility-icon'><Icon id='get-pocket' icon={LimitedIcon} title={intl.formatMessage(messages.limited_short)} /></span> : null;
+    const withQuote = status.get('quote_id') ? <span className='status__visibility-icon'><Icon id='quote-right' icon={QuoteIcon} title='Quote' /></span> : null;
+    const withReference = (!withQuote && status.get('status_references_count') > 0) ? <span className='status__visibility-icon'><Icon id='link' icon={ReferenceIcon} title='Quiet quote' /></span> : null;
+    const withExpiration = status.get('expires_at') ? <span className='status__visibility-icon'><Icon id='clock-o' icon={TimerIcon} title='Expiration' /></span> : null;
+
     return (
-      <HotKeys handlers={handlers}>
+      <HotKeys handlers={handlers} tabIndex={unfocusable ? null : -1}>
-        <div className={classNames('status__wrapper', 'status__wrapper__compact', `status__wrapper-${status.get('visibility_ex')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id'), unread })} data-featured={featured ? 'true' : null} aria-label={textForScreenReader(intl, status, rebloggedByText)} ref={this.handleRef} data-nosnippet={status.getIn(['account', 'noindex'], true) || undefined}>
+        <div className={classNames('status__wrapper', 'status__wrapper__compact', 'content-warning', 'content-warning--compacted-status', `status__wrapper-${status.get('visibility_ex')}`, { 'status__wrapper-reply': !!status.get('in_reply_to_id'), unread, focusable: !this.props.muted })} tabIndex={this.props.muted || unfocusable ? null : 0} data-featured={featured ? 'true' : null} aria-label={textForScreenReader(intl, status, rebloggedByText)} ref={this.handleRef} data-nosnippet={status.getIn(['account', 'noindex'], true) || undefined}>
-          {prepend}
+          {!skipPrepend && prepend}
 
           <div className={classNames('status', `status-${status.get('visibility_ex')}`, { 'status-reply': !!status.get('in_reply_to_id'), 'status--in-thread': !!rootId, 'status--first-in-thread': previousId && (!connectUp || connectToRoot), muted: this.props.muted })} data-id={status.get('id')}>
+
             {(connectReply || connectUp || connectToRoot) && <div className={classNames('status__line', { 'status__line--full': connectReply, 'status__line--first': !status.get('in_reply_to_id') && !connectToRoot })} />}
 
             {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
             <div onClick={this.handleClick} className='status__info'>
               <a href={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
-                <RelativeTimestamp timestamp={status.get('created_at')} />{status.get('edited_at') && <abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { hour12: false, year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) })}> *</abbr>}
+                {withQuote}
+                {withReference}
+                {withExpiration}
+                {withLimited}
+                <span className='status__visibility-icon'><VisibilityIcon visibility={visibilityName} /></span>
+                <RelativeTimestamp timestamp={status.get('created_at')} />{status.get('edited_at') && <abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) })}> *</abbr>}
               </a>
 
-              <a onClick={this.handleAccountClick} href={`/@${status.getIn(['account', 'acct'])}`} data-hover-card-account={status.getIn(['account', 'id'])} title={status.getIn(['account', 'acct'])} className='status__display-name' target='_blank' rel='noopener noreferrer'>
+              <a onClick={this.handleAccountClick} href={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} data-hover-card-account={status.getIn(['account', 'id'])} className='status__display-name' target='_blank' rel='noopener noreferrer'>
-                <div className='status__avatar status__avatar__compact'>
+                <div className='status__avatar'>
                   <Avatar account={status.get('account')} size={24} inline />
                 </div>
 
@@ -467,20 +567,25 @@ class CompactedStatus extends ImmutablePureComponent {
               </a>
             </div>
 
+            {status.get('spoiler_text').length > 0 && <ContentWarning text={status.getIn(['translation', 'spoilerHtml']) || status.get('spoilerHtml')} expanded={expanded} onClick={this.handleExpandedToggle} />}
+
+            {expanded && (
+              <>
                 <StatusContent
                   status={status}
                   onClick={this.handleClick}
-              expanded={expanded}
-              onExpandedToggle={this.handleExpandedToggle}
                   onTranslate={this.handleTranslate}
                   collapsible
                   onCollapsedToggle={this.handleCollapsedToggle}
                   {...statusContentProps}
                 />
 
-            {(!isCardMediaWithSensitive || !status.get('hidden')) && media}
+                {media}
+                {hashtagBar}
+              </>
+            )}
 
-            {(!status.get('spoiler_text') || expanded) && hashtagBar}
+            <StatusActionBar scrollKey={scrollKey} status={status} account={account}  {...other} />
           </div>
         </div>
       </HotKeys>
@@ -489,4 +594,4 @@ class CompactedStatus extends ImmutablePureComponent {
 
 }
 
-export default injectIntl(CompactedStatus);
+export default withOptionalRouter(injectIntl(CompactedStatus));

app/javascript/mastodon/components/content_warning.tsx

@@ -0,0 +1,15 @@
+import { StatusBanner, BannerVariant } from './status_banner';
+
+export const ContentWarning: React.FC<{
+  text: string;
+  expanded?: boolean;
+  onClick?: () => void;
+}> = ({ text, expanded, onClick }) => (
+  <StatusBanner
+    expanded={expanded}
+    onClick={onClick}
+    variant={BannerVariant.Yellow}
+  >
+    <p dangerouslySetInnerHTML={{ __html: text }} />
+  </StatusBanner>
+);

app/javascript/mastodon/components/filter_warning.tsx

@@ -0,0 +1,23 @@
+import { FormattedMessage } from 'react-intl';
+
+import { StatusBanner, BannerVariant } from './status_banner';
+
+export const FilterWarning: React.FC<{
+  title: string;
+  expanded?: boolean;
+  onClick?: () => void;
+}> = ({ title, expanded, onClick }) => (
+  <StatusBanner
+    expanded={expanded}
+    onClick={onClick}
+    variant={BannerVariant.Blue}
+  >
+    <p>
+      <FormattedMessage
+        id='filter_warning.matches_filter'
+        defaultMessage='Matches filter “{title}”'
+        values={{ title }}
+      />
+    </p>
+  </StatusBanner>
+);

app/javascript/mastodon/components/status.jsx

@@ -18,6 +18,8 @@ import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
 import LimitedIcon from '@/material-icons/400-24px/shield.svg?react';
 import TimerIcon from '@/material-icons/400-24px/timer.svg?react';
 import AttachmentList from 'mastodon/components/attachment_list';
+import { ContentWarning } from 'mastodon/components/content_warning';
+import { FilterWarning } from 'mastodon/components/filter_warning';
 import { Icon }  from 'mastodon/components/icon';
 import PictureInPicturePlaceholder from 'mastodon/components/picture_in_picture_placeholder';
 import { withOptionalRouter, WithOptionalRouterPropTypes } from 'mastodon/utils/react_router';
@@ -150,7 +152,7 @@ class Status extends ImmutablePureComponent {
 
   state = {
     showMedia: defaultMediaVisibility(this.props.status) && !(this.context?.hideMediaByDefault),
-    forceFilter: undefined,
+    showDespiteFilter: undefined,
   };
 
   componentDidUpdate (prevProps) {
@@ -162,7 +164,7 @@ class Status extends ImmutablePureComponent {
     if (this.props.status?.get('id') !== prevProps.status?.get('id')) {
       this.setState({
         showMedia: defaultMediaVisibility(this.props.status) && !(this.context?.hideMediaByDefault),
-        forceFilter: undefined,
+        showDespiteFilter: undefined,
       });
     }
   }
@@ -335,20 +337,32 @@ class Status extends ImmutablePureComponent {
   };
 
   handleHotkeyToggleHidden = () => {
-    this.props.onToggleHidden(this._properStatus());
+    const { onToggleHidden } = this.props;
+    const status = this._properStatus();
+
+    if (status.get('matched_filters')) {
+      const expandedBecauseOfCW = !status.get('hidden') || status.get('spoiler_text').length === 0;
+      const expandedBecauseOfFilter = this.state.showDespiteFilter;
+
+      if (expandedBecauseOfFilter && !expandedBecauseOfCW) {
+        onToggleHidden(status);
+      } else if (expandedBecauseOfFilter && expandedBecauseOfCW) {
+        onToggleHidden(status);
+        this.handleFilterToggle();
+      } else  {
+        this.handleFilterToggle();
+      }
+    } else {
+      onToggleHidden(status);
+    }
   };
 
   handleHotkeyToggleSensitive = () => {
     this.handleToggleMediaVisibility();
   };
 
-  handleUnfilterClick = e => {
+  handleFilterToggle = () => {
-    this.setState({ forceFilter: false });
+    this.setState(state => ({ ...state, showDespiteFilter: !state.showDespiteFilter }));
-    e.preventDefault();
-  };
-
-  handleFilterClick = () => {
-    this.setState({ forceFilter: true });
   };
 
   _properStatus () {
@@ -390,7 +404,7 @@ class Status extends ImmutablePureComponent {
       openMedia: this.handleHotkeyOpenMedia,
     };
 
-    let media, isCardMediaWithSensitive, statusAvatar, prepend, rebloggedByText;
+    let media, statusAvatar, prepend, rebloggedByText;
 
     if (hidden) {
       return (
@@ -410,25 +424,6 @@ class Status extends ImmutablePureComponent {
 
     let visibilityName = status.get('limited_scope') || status.get('visibility_ex') || status.get('visibility');
 
-    if (this.state.forceFilter === undefined ? matchedFilters : this.state.forceFilter) {
-      const minHandlers = this.props.muted ? {} : {
-        moveUp: this.handleHotkeyMoveUp,
-        moveDown: this.handleHotkeyMoveDown,
-      };
-
-      return (
-        <HotKeys handlers={minHandlers} tabIndex={unfocusable ? null : -1}>
-          <div className='status__wrapper status__wrapper--filtered focusable' tabIndex={unfocusable ? null : 0} ref={this.handleRef}>
-            <FormattedMessage id='status.filtered' defaultMessage='Filtered' />: {matchedFilters.join(', ')}.
-            {' '}
-            <button className='status__wrapper--filtered__button' onClick={this.handleUnfilterClick}>
-              <FormattedMessage id='status.show_filter_reason' defaultMessage='Show anyway' />
-            </button>
-          </div>
-        </HotKeys>
-      );
-    }
-
     if (featured) {
       prepend = (
         <div className='status__prepend'>
@@ -475,59 +470,6 @@ class Status extends ImmutablePureComponent {
       statusAvatar = <AvatarOverlay account={status.get('account')} friend={account} />;
     }
 
-    if (this.state.forceFilter === undefined ? matchedFilters : this.state.forceFilter) {
-      const minHandlers = this.props.muted ? {} : {
-        moveUp: this.handleHotkeyMoveUp,
-        moveDown: this.handleHotkeyMoveDown,
-      };
-
-      if (status.get('filter_action_ex') === 'half_warn') {
-        return (
-          <HotKeys handlers={minHandlers}>
-            <div className='status__wrapper status__wrapper--filtered focusable' tabIndex={0} ref={this.handleRef}>
-              {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
-              <div onClick={this.handleClick} className='status__info'>
-                <a href={`/@${status.getIn(['account', 'acct'])}/${status.get('id')}`} className='status__relative-time' target='_blank' rel='noopener noreferrer'>
-                  <span className='status__visibility-icon'><VisibilityIcon visibility={visibilityName} /></span>
-                  <RelativeTimestamp timestamp={status.get('created_at')} />{status.get('edited_at') && <abbr title={intl.formatMessage(messages.edited, { date: intl.formatDate(status.get('edited_at'), { hour12: false, year: 'numeric', month: 'short', day: '2-digit', hour: '2-digit', minute: '2-digit' }) })}> *</abbr>}
-                </a>
-
-                <a onClick={this.handleAccountClick} href={`/@${status.getIn(['account', 'acct'])}`} title={status.getIn(['account', 'acct'])} className='status__display-name' target='_blank' rel='noopener noreferrer'>
-                  <div className='status__avatar'>
-                    {statusAvatar}
-                  </div>
-
-                  <DisplayName account={status.get('account')} />
-                </a>
-              </div>
-
-              <div >
-                <FormattedMessage id='status.filtered' defaultMessage='Filtered' />: {matchedFilters.join(', ')}.
-                {' '}
-                <button className='status__wrapper--filtered__button' onClick={this.handleUnfilterClick}>
-                  <FormattedMessage id='status.show_filter_reason' defaultMessage='Show anyway' />
-                </button>
-              </div>
-            </div>
-          </HotKeys>
-        );
-      }
-
-      return (
-        <HotKeys handlers={minHandlers}>
-          <div className='status__wrapper status__wrapper--filtered focusable' tabIndex={0} ref={this.handleRef}>
-            <FormattedMessage id='status.filtered' defaultMessage='Filtered' />: {matchedFilters.join(', ')}.
-            {' '}
-            <button className='status__wrapper--filtered__button' onClick={this.handleUnfilterClick}>
-              <FormattedMessage id='status.show_filter_reason' defaultMessage='Show anyway' />
-            </button>
-          </div>
-        </HotKeys>
-      );
-    }
-
-    isCardMediaWithSensitive = false;
-
     if (pictureInPicture.get('inUse')) {
       media = <PictureInPicturePlaceholder aspectRatio={this.getAttachmentAspectRatio()} />;
     } else if (status.get('media_attachments').size > 0) {
@@ -620,7 +562,6 @@ class Status extends ImmutablePureComponent {
           sensitive={status.get('sensitive') && !status.get('spoiler_text')}
         />
       );
-      isCardMediaWithSensitive = status.get('spoiler_text').length > 0;
     }
 
     visibilityName = status.get('limited_scope') || status.get('visibility_ex') || status.get('visibility');
@@ -642,7 +583,7 @@ class Status extends ImmutablePureComponent {
     }
 
     const {statusContentProps, hashtagBar} = getHashtagBarForStatus(status);
-    const expanded = !status.get('hidden') || status.get('spoiler_text').length === 0;
+    const expanded = (!matchedFilters || this.state.showDespiteFilter) && (!status.get('hidden') || status.get('spoiler_text').length === 0);
 
     const withLimited = status.get('visibility_ex') === 'limited' && status.get('limited_scope') ? <span className='status__visibility-icon'><Icon id='get-pocket' icon={LimitedIcon} title={intl.formatMessage(messages.limited_short)} /></span> : null;
     const withQuote = status.get('quote_id') ? <span className='status__visibility-icon'><Icon id='quote-right' icon={QuoteIcon} title='Quote' /></span> : null;
@@ -657,6 +598,9 @@ class Status extends ImmutablePureComponent {
           {!skipPrepend && prepend}
 
           <div className={classNames('status', `status-${status.get('visibility_ex')}`, { 'status-reply': !!status.get('in_reply_to_id'), 'status--in-thread': !!rootId, 'status--first-in-thread': previousId && (!connectUp || connectToRoot), muted: this.props.muted })} data-id={status.get('id')}>
+
+            {(!matchedFilters || this.state.showDespiteFilter || status.get('filter_action_ex') === 'half_warn') && (
+              <>
                 {(connectReply || connectUp || connectToRoot) && <div className={classNames('status__line', { 'status__line--full': connectReply, 'status__line--first': !status.get('in_reply_to_id') && !connectToRoot })} />}
 
                 {/* eslint-disable-next-line jsx-a11y/no-static-element-interactions */}
@@ -678,27 +622,32 @@ class Status extends ImmutablePureComponent {
                     <DisplayName account={status.get('account')} />
                   </a>
                 </div>
+              </>
+            )}
 
+            {matchedFilters && <FilterWarning title={matchedFilters.join(', ')} expanded={this.state.showDespiteFilter} onClick={this.handleFilterToggle} />}
+
+            {(status.get('spoiler_text').length > 0 && (!matchedFilters || this.state.showDespiteFilter)) && <ContentWarning text={status.getIn(['translation', 'spoilerHtml']) || status.get('spoilerHtml')} expanded={expanded} onClick={this.handleExpandedToggle} />}
+
+            {expanded && (
+              <>
                 <StatusContent
                   status={status}
                   onClick={this.handleClick}
-              expanded={expanded}
-              onExpandedToggle={this.handleExpandedToggle}
                   onTranslate={this.handleTranslate}
                   collapsible
                   onCollapsedToggle={this.handleCollapsedToggle}
                   {...statusContentProps}
                 />
 
-            {(!isCardMediaWithSensitive || !status.get('hidden')) && media}
+                {media}
-
+                {hashtagBar}
-            {(!status.get('spoiler_text') || expanded) && hashtagBar}
+                {quote}
-
-            {(!status.get('spoiler_text') || expanded) && quote}
-
                 {emojiReactionsBar}
+              </>
+            )}
 
-            <StatusActionBar scrollKey={scrollKey} status={status} account={account} onFilter={matchedFilters ? this.handleFilterClick : null} {...other} />
+            {(!matchedFilters || this.state.showDespiteFilter) && <StatusActionBar scrollKey={scrollKey} status={status} account={account}  {...other} />}
           </div>
         </div>
       </HotKeys>

app/javascript/mastodon/components/status_action_bar.jsx

@@ -18,7 +18,6 @@ import ReplyIcon from '@/material-icons/400-24px/reply.svg?react';
 import ReplyAllIcon from '@/material-icons/400-24px/reply_all.svg?react';
 import StarIcon from '@/material-icons/400-24px/star-fill.svg?react';
 import StarBorderIcon from '@/material-icons/400-24px/star.svg?react';
-import VisibilityIcon from '@/material-icons/400-24px/visibility.svg?react';
 import RepeatActiveIcon from '@/svg-icons/repeat_active.svg?react';
 import RepeatDisabledIcon from '@/svg-icons/repeat_disabled.svg?react';
 import RepeatPrivateIcon from '@/svg-icons/repeat_private.svg?react';
@@ -72,7 +71,6 @@ const messages = defineMessages({
   copy: { id: 'status.copy', defaultMessage: 'Copy link to post' },
   reference: { id: 'status.reference', defaultMessage: 'Quiet quote' },
   quote: { id: 'status.quote', defaultMessage: 'Quote' },
-  hide: { id: 'status.hide', defaultMessage: 'Hide post' },
   blockDomain: { id: 'account.block_domain', defaultMessage: 'Block domain {domain}' },
   unblockDomain: { id: 'account.unblock_domain', defaultMessage: 'Unblock domain {domain}' },
   unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' },
@@ -297,10 +295,6 @@ class StatusActionBar extends ImmutablePureComponent {
     this.props.onQuote(this.props.status, this.props.history);
   };
 
-  handleHideClick = () => {
-    this.props.onFilter();
-  };
-
   render () {
     const { status, relationship, intl, withDismiss, withCounters, scrollKey } = this.props;
     const { signedIn, permissions } = this.props.identity;
@@ -482,10 +476,6 @@ class StatusActionBar extends ImmutablePureComponent {
       reblogMenu = [];
     }
 
-    const filterButton = this.props.onFilter && (
-      <IconButton className='status__action-bar__button' title={intl.formatMessage(messages.hide)} icon='eye' iconComponent={VisibilityIcon} onClick={this.handleHideClick} />
-    );
-
     const emojiReactionAvailableServer = !isHideItem('emoji_reaction_unavailable_server') || account.getIn(['server_features', 'emoji_reaction']);
     const emojiReactionPolicy = account.getIn(['other_settings', 'emoji_reaction_policy']) || 'allow';
     const following = emojiReactionPolicy !== 'following_only' || (relationship && relationship.get('following'));
@@ -528,8 +518,6 @@ class StatusActionBar extends ImmutablePureComponent {
         <IconButton className='status__action-bar__button bookmark-icon' disabled={!signedIn} active={status.get('bookmarked')} title={intl.formatMessage(messages.bookmark)} icon='bookmark' iconComponent={status.get('bookmarked') ? BookmarkIcon : BookmarkBorderIcon} onClick={this.handleBookmarkClick} />
         {emojiPickerDropdown}
 
-        {filterButton}
-
         <DropdownMenuContainer
           scrollKey={scrollKey}
           status={status}

app/javascript/mastodon/components/status_banner.tsx

@@ -0,0 +1,37 @@
+import { FormattedMessage } from 'react-intl';
+
+export enum BannerVariant {
+  Yellow = 'yellow',
+  Blue = 'blue',
+}
+
+export const StatusBanner: React.FC<{
+  children: React.ReactNode;
+  variant: BannerVariant;
+  expanded?: boolean;
+  onClick?: () => void;
+}> = ({ children, variant, expanded, onClick }) => (
+  <div
+    className={
+      variant === BannerVariant.Yellow
+        ? 'content-warning'
+        : 'content-warning content-warning--filter'
+    }
+  >
+    {children}
+
+    <button className='link-button' onClick={onClick}>
+      {expanded ? (
+        <FormattedMessage
+          id='content_warning.hide'
+          defaultMessage='Hide post'
+        />
+      ) : (
+        <FormattedMessage
+          id='content_warning.show'
+          defaultMessage='Show anyway'
+        />
+      )}
+    </button>
+  </div>
+);

app/javascript/mastodon/components/status_content.jsx

@@ -4,7 +4,7 @@ import { PureComponent } from 'react';
 import { FormattedMessage, injectIntl } from 'react-intl';
 
 import classnames from 'classnames';
-import { Link, withRouter } from 'react-router-dom';
+import { withRouter } from 'react-router-dom';
 
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { connect } from 'react-redux';
@@ -15,7 +15,6 @@ import PollContainer from 'mastodon/containers/poll_container';
 import { identityContextPropShape, withIdentity } from 'mastodon/identity_context';
 import { autoPlayGif, languages as preloadedLanguages } from 'mastodon/initial_state';
 
-
 const MAX_HEIGHT = 706; // 22px * 32 (+ 2px padding at the top)
 
 /**
@@ -73,8 +72,6 @@ class StatusContent extends PureComponent {
     identity: identityContextPropShape,
     status: ImmutablePropTypes.map.isRequired,
     statusContent: PropTypes.string,
-    expanded: PropTypes.bool,
-    onExpandedToggle: PropTypes.func,
     onTranslate: PropTypes.func,
     onClick: PropTypes.func,
     collapsible: PropTypes.bool,
@@ -87,10 +84,6 @@ class StatusContent extends PureComponent {
     history: PropTypes.object.isRequired
   };
 
-  state = {
-    hidden: true,
-  };
-
   _updateStatusLinks () {
     const node = this.node;
 
@@ -218,17 +211,6 @@ class StatusContent extends PureComponent {
     this.startXY = null;
   };
 
-  handleSpoilerClick = (e) => {
-    e.preventDefault();
-
-    if (this.props.onExpandedToggle) {
-      // The parent manages the state
-      this.props.onExpandedToggle();
-    } else {
-      this.setState({ hidden: !this.state.hidden });
-    }
-  };
-
   handleTranslate = () => {
     this.props.onTranslate();
   };
@@ -240,7 +222,6 @@ class StatusContent extends PureComponent {
   render () {
     const { status, intl, statusContent } = this.props;
 
-    const hidden = this.props.onExpandedToggle ? !this.props.expanded : this.state.hidden;
     const renderReadMore = this.props.onClick && status.get('collapsed');
     const contentLocale = intl.locale.replace(/[_-].*/, '');
     const targetLanguages = this.props.languages?.get(status.get('language') || 'und');
@@ -252,11 +233,9 @@ class StatusContent extends PureComponent {
         targetLanguages?.includes(contentLocale);
 
     const content = { __html: statusContent ?? getStatusContent(status) };
-    const spoilerContent = { __html: status.getIn(['translation', 'spoilerHtml']) || status.get('spoilerHtml') };
     const language = status.getIn(['translation', 'language']) || status.get('language');
     const classNames = classnames('status__content', {
       'status__content--with-action': this.props.onClick && this.props.history,
-      'status__content--with-spoiler': status.get('spoiler_text').length > 0,
       'status__content--collapsed': renderReadMore,
     });
 
@@ -274,38 +253,7 @@ class StatusContent extends PureComponent {
       <PollContainer pollId={status.get('poll')} lang={language} />
     );
 
-    if (status.get('spoiler_text').length > 0) {
+    if (this.props.onClick) {
-      let mentionsPlaceholder = '';
-
-      const mentionLinks = status.get('mentions').map(item => (
-        <Link to={`/@${item.get('acct')}`} key={item.get('id')} className='status-link mention'>
-          @<span>{item.get('username')}</span>
-        </Link>
-      )).reduce((aggregate, item) => [...aggregate, item, ' '], []);
-
-      const toggleText = hidden ? <FormattedMessage id='status.show_more' defaultMessage='Show more' /> : <FormattedMessage id='status.show_less' defaultMessage='Show less' />;
-
-      if (hidden) {
-        mentionsPlaceholder = <div>{mentionLinks}</div>;
-      }
-
-      return (
-        <div className={classNames} ref={this.setRef} tabIndex={0} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp} onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>
-          <p style={{ marginBottom: hidden && status.get('mentions').isEmpty() ? '0px' : null }}>
-            <span dangerouslySetInnerHTML={spoilerContent} className='translate' lang={language} />
-            {' '}
-            <button type='button' className={`status__content__spoiler-link ${hidden ? 'status__content__spoiler-link--show-more' : 'status__content__spoiler-link--show-less'}`} onClick={this.handleSpoilerClick} aria-expanded={!hidden}>{toggleText}</button>
-          </p>
-
-          {mentionsPlaceholder}
-
-          <div tabIndex={!hidden ? 0 : null} className={`status__content__text ${!hidden ? 'status__content__text--visible' : ''} translate`} lang={language} dangerouslySetInnerHTML={content} />
-
-          {!hidden && poll}
-          {translateButton}
-        </div>
-      );
-    } else if (this.props.onClick) {
       return (
         <>
           <div className={classNames} ref={this.setRef} tabIndex={0} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp} key='status-content' onMouseEnter={this.handleMouseEnter} onMouseLeave={this.handleMouseLeave}>

app/javascript/mastodon/features/notifications/requests.jsx

@@ -217,7 +217,9 @@ export const NotificationRequests = ({ multiColumn }) => {
         multiColumn={multiColumn}
         showBackButton
         appendContent={
-          <SelectRow selectionMode={selectionMode} setSelectionMode={setSelectionMode} selectAllChecked={selectAllChecked} toggleSelectAll={toggleSelectAll} selectedItems={checkedRequestIds} />}
+          notificationRequests.size > 0 && (
+            <SelectRow selectionMode={selectionMode} setSelectionMode={setSelectionMode} selectAllChecked={selectAllChecked} toggleSelectAll={toggleSelectAll} selectedItems={checkedRequestIds} />
+          )}
       >
         <ColumnSettings />
       </ColumnHeader>

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

@@ -8,11 +8,13 @@ import type { List as ImmutableList, RecordOf } from 'immutable';
 
 import BarChart4BarsIcon from '@/material-icons/400-24px/bar_chart_4_bars.svg?react';
 import PhotoLibraryIcon from '@/material-icons/400-24px/photo_library.svg?react';
+import { toggleStatusSpoilers } from 'mastodon/actions/statuses';
 import { Avatar } from 'mastodon/components/avatar';
+import { ContentWarning } from 'mastodon/components/content_warning';
 import { DisplayName } from 'mastodon/components/display_name';
 import { Icon } from 'mastodon/components/icon';
 import type { Status } from 'mastodon/models/status';
-import { useAppSelector } from 'mastodon/store';
+import { useAppSelector, useAppDispatch } from 'mastodon/store';
 
 import { EmbeddedStatusContent } from './embedded_status_content';
 
@@ -23,6 +25,7 @@ export const EmbeddedStatus: React.FC<{ statusId: string }> = ({
 }) => {
   const history = useHistory();
   const clickCoordinatesRef = useRef<[number, number] | null>();
+  const dispatch = useAppDispatch();
 
   const status = useAppSelector(
     (state) => state.statuses.get(statusId) as Status | undefined,
@@ -96,15 +99,21 @@ export const EmbeddedStatus: React.FC<{ statusId: string }> = ({
     [],
   );
 
+  const handleContentWarningClick = useCallback(() => {
+    dispatch(toggleStatusSpoilers(statusId));
+  }, [dispatch, statusId]);
+
   if (!status) {
     return null;
   }
 
   // Assign status attributes to variables with a forced type, as status is not yet properly typed
   const contentHtml = status.get('contentHtml') as string;
+  const contentWarning = status.get('spoilerHtml') as string;
   const poll = status.get('poll');
   const language = status.get('language') as string;
   const mentions = status.get('mentions') as ImmutableList<Mention>;
+  const expanded = !status.get('hidden') || !contentWarning;
   const mediaAttachmentsSize = (
     status.get('media_attachments') as ImmutableList<unknown>
   ).size;
@@ -124,14 +133,24 @@ export const EmbeddedStatus: React.FC<{ statusId: string }> = ({
         <DisplayName account={account} />
       </div>
 
+      {contentWarning && (
+        <ContentWarning
+          text={contentWarning}
+          onClick={handleContentWarningClick}
+          expanded={expanded}
+        />
+      )}
+
+      {(!contentWarning || expanded) && (
         <EmbeddedStatusContent
           className='notification-group__embedded-status__content reply-indicator__content translate'
           content={contentHtml}
           language={language}
           mentions={mentions}
         />
+      )}
 
-      {(poll || mediaAttachmentsSize > 0) && (
+      {expanded && (poll || mediaAttachmentsSize > 0) && (
         <div className='notification-group__embedded-status__attachments reply-indicator__attachments'>
           {!!poll && (
             <>

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

@@ -10,6 +10,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 import AlternateEmailIcon from '@/material-icons/400-24px/alternate_email.svg?react';
 import { AnimatedNumber } from 'mastodon/components/animated_number';
+import { ContentWarning } from 'mastodon/components/content_warning';
 import EditedTimestamp from 'mastodon/components/edited_timestamp';
 import { getHashtagBarForStatus } from 'mastodon/components/hashtag_bar';
 import { Icon }  from 'mastodon/components/icon';
@@ -144,7 +145,6 @@ class DetailedStatus extends ImmutablePureComponent {
     }
 
     let media           = '';
-    let isCardMediaWithSensitive = false;
     let applicationLink = '';
     let reblogLink = '';
     let favouriteLink = '';
@@ -218,7 +218,6 @@ class DetailedStatus extends ImmutablePureComponent {
       }
     } else if (status.get('card')) {
       media = <Card sensitive={status.get('sensitive') && !status.get('spoiler_text')} onOpenMedia={this.props.onOpenMedia} card={status.get('card', null)} />;
-      isCardMediaWithSensitive = status.get('spoiler_text').length > 0;
     }
 
     let emojiReactionsBar = null;
@@ -338,19 +337,21 @@ class DetailedStatus extends ImmutablePureComponent {
             <DisplayName account={status.get('account')} localDomain={this.props.domain} />
           </a>
 
+          {status.get('spoiler_text').length > 0 && <ContentWarning text={status.getIn(['translation', 'spoilerHtml']) || status.get('spoilerHtml')} expanded={expanded} onClick={this.handleExpandedToggle} />}
+
+          {expanded && (
+            <>
               <StatusContent
                 status={status}
-            expanded={!status.get('hidden')}
-            onExpandedToggle={this.handleExpandedToggle}
                 onTranslate={this.handleTranslate}
                 {...statusContentProps}
               />
 
-          {(!isCardMediaWithSensitive || !status.get('hidden')) && media}
+              {media}
-
+              {hashtagBar}
-          {(!status.get('spoiler_text') || expanded) && hashtagBar}
-
               {emojiReactionsBar}
+            </>
+          )}
 
           <div className='detailed-status__meta'>
             <div className='detailed-status__meta__line'>

app/javascript/mastodon/locales/af.json

@@ -16,7 +16,6 @@
   "account.block_domain": "Blokkeer domein {domain}",
   "account.block_short": "Blokkeer",
   "account.blocked": "Geblokkeer",
-  "account.browse_more_on_origin_server": "Verken die oorspronklike profiel",
   "account.cancel_follow_request": "Herroep volgversoek",
   "account.disable_notifications": "Hou op om my van @{name} se plasings te laat weet",
   "account.domain_blocked": "Domein geblokkeer",
@@ -308,7 +307,6 @@
   "status.translated_from_with": "Uit {lang} vertaal deur {provider}",
   "tabs_bar.home": "Tuis",
   "tabs_bar.notifications": "Kennisgewings",
-  "timeline_hint.resources.statuses": "Ouer plasings",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",

app/javascript/mastodon/locales/an.json

@@ -17,7 +17,6 @@
   "account.block": "Blocar a @{name}",
   "account.block_domain": "Blocar dominio {domain}",
   "account.blocked": "Blocau",
-  "account.browse_more_on_origin_server": "Veyer mas en o perfil orichinal",
   "account.cancel_follow_request": "Retirar solicitut de seguimiento",
   "account.disable_notifications": "Deixar de notificar-me quan @{name} publique bella cosa",
   "account.domain_blocked": "Dominio blocau",
@@ -484,8 +483,6 @@
   "status.edited_x_times": "Editau {count, plural, one {{count} vez} other {{count} veces}}",
   "status.embed": "Incrustado",
   "status.filter": "Filtrar esta publicación",
-  "status.filtered": "Filtrau",
-  "status.hide": "Amagar la publicación",
   "status.history.created": "{name} creyó {date}",
   "status.history.edited": "{name} editó {date}",
   "status.load_more": "Cargar mas",
@@ -510,10 +507,7 @@
   "status.report": "Denunciar €{name}",
   "status.sensitive_warning": "Conteniu sensible",
   "status.share": "Compartir",
-  "status.show_filter_reason": "Amostrar de totz modos",
-  "status.show_less": "Amostrar menos",
   "status.show_less_all": "Amostrar menos pa tot",
-  "status.show_more": "Amostrar mas",
   "status.show_more_all": "Amostrar mas pa tot",
   "status.show_original": "Amostrar orichinal",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
@@ -531,10 +525,6 @@
   "time_remaining.minutes": "{number, plural, one {# menuto restante} other {# menutos restantes}}",
   "time_remaining.moments": "Momentos restantes",
   "time_remaining.seconds": "{number, plural, one {# segundo restante} other {# segundos restantes}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} d'atros servidors no s'amuestran.",
-  "timeline_hint.resources.followers": "Seguidores",
-  "timeline_hint.resources.follows": "Seguius",
-  "timeline_hint.resources.statuses": "Publicacions mas antigas",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} en os zaguers {days, plural, one {días} other {{days} días}}",
   "trends.trending_now": "Tendencia agora",
   "ui.beforeunload": "Lo tuyo borrador se perderá si sales de Mastodon.",

app/javascript/mastodon/locales/ar.json

@@ -19,7 +19,6 @@
   "account.block_domain": "حظر اسم النِّطاق {domain}",
   "account.block_short": "حظر",
   "account.blocked": "محظور",
-  "account.browse_more_on_origin_server": "تصفح المزيد في الملف الشخصي الأصلي",
   "account.cancel_follow_request": "إلغاء طلب المتابعة",
   "account.copy": "نسخ الرابط إلى الملف الشخصي",
   "account.direct": "إشارة خاصة لـ @{name}",
@@ -737,8 +736,6 @@
   "status.favourite": "فضّل",
   "status.favourites": "{count, plural, zero {}one {مفضلة واحدة} two {مفضلتان} few {# مفضلات} many {# مفضلات} other {# مفضلات}}",
   "status.filter": "تصفية هذا المنشور",
-  "status.filtered": "مُصفّى",
-  "status.hide": "إخفاء المنشور",
   "status.history.created": "أنشأه {name} {date}",
   "status.history.edited": "عدله {name} {date}",
   "status.load_more": "حمّل المزيد",
@@ -766,10 +763,7 @@
   "status.report": "ابلِغ عن @{name}",
   "status.sensitive_warning": "محتوى حساس",
   "status.share": "مشاركة",
-  "status.show_filter_reason": "إظهار على أي حال",
-  "status.show_less": "اعرض أقلّ",
   "status.show_less_all": "طي الكل",
-  "status.show_more": "أظهر المزيد",
   "status.show_more_all": "توسيع الكل",
   "status.show_original": "إظهار الأصل",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
@@ -788,11 +782,6 @@
   "time_remaining.minutes": "{number, plural, one {# دقيقة} other {# دقائق}} متبقية",
   "time_remaining.moments": "لحظات متبقية",
   "time_remaining.seconds": "{number, plural, one {# ثانية} other {# ثوانٍ}} متبقية",
-  "timeline_hint.remote_resource_not_displayed": "{resource} من الخوادم الأخرى لا يتم عرضها.",
-  "timeline_hint.resources.followers": "المتابِعون",
-  "timeline_hint.resources.follows": "المتابَعون",
-  "timeline_hint.resources.replies": "بعض الردود",
-  "timeline_hint.resources.statuses": "المنشورات القديمة",
   "trends.counter_by_accounts": "{count, plural, one {شخص واحد} two {شخصان} few {{counter} أشخاصٍ} many {{counter} شخصًا} other {{counter} شخصًا}} {days, plural, one {خلال اليوم الماضي} two {خلال اليومَيْنِ الماضيَيْنِ} few {خلال {days} أيام الماضية} many {خلال {days} يومًا الماضية} other {خلال {days} يومٍ الماضية}}",
   "trends.trending_now": "المتداولة الآن",
   "ui.beforeunload": "سوف تفقد مسودتك إن تركت ماستدون.",

app/javascript/mastodon/locales/ast.json

@@ -17,7 +17,6 @@
   "account.block": "Bloquiar a @{name}",
   "account.block_domain": "Bloquiar el dominiu {domain}",
   "account.blocked": "Perfil bloquiáu",
-  "account.browse_more_on_origin_server": "Restolar más nel perfil orixinal",
   "account.direct": "Mentar a @{name} per privao",
   "account.disable_notifications": "Dexar d'avisame cuando @{name} espublice artículos",
   "account.domain_blocked": "Dominiu bloquiáu",
@@ -270,8 +269,6 @@
   "lists.subheading": "Les tos llistes",
   "load_pending": "{count, plural, one {# elementu nuevu} other {# elementos nuevos}}",
   "media_gallery.toggle_visible": "{number, plural, one {Anubrir la imaxe} other {Anubrir les imáxenes}}",
-  "name_and_others": "{name} y {count, plural, one {# más} other {# más}}",
-  "name_and_others_with_link": "{name} y <a>{count, plural, one {# más} other {# más}}</a>",
   "navigation_bar.about": "Tocante a",
   "navigation_bar.blocks": "Perfiles bloquiaos",
   "navigation_bar.bookmarks": "Marcadores",
@@ -425,8 +422,6 @@
   "status.edited_x_times": "Editóse {count, plural, one {{count} vegada} other {{count} vegaes}}",
   "status.embed": "Empotrar",
   "status.filter": "Peñerar esti artículu",
-  "status.filtered": "Peñeróse",
-  "status.hide": "Anubrir l'artículu",
   "status.history.created": "{name} creó {date}",
   "status.history.edited": "{name} editó {date}",
   "status.load_more": "Cargar más",
@@ -449,9 +444,6 @@
   "status.report": "Informar de @{name}",
   "status.sensitive_warning": "Conteníu sensible",
   "status.share": "Compartir",
-  "status.show_filter_reason": "Amosar de toes toes",
-  "status.show_less": "Amosar menos",
-  "status.show_more": "Amosar más",
   "status.show_original": "Amosar l'orixinal",
   "status.translate": "Traducir",
   "status.translated_from_with": "Tradúxose del {lang} con {provider}",
@@ -464,9 +456,6 @@
   "time_remaining.hours": "{number, plural, one {Queda # hora} other {Queden # hores}}",
   "time_remaining.minutes": "{number, plural, one {Queda # minutu} other {Queden # minutos}}",
   "time_remaining.seconds": "{number, plural, one {Queda # segundu} other {Queden # segundos}}",
-  "timeline_hint.remote_resource_not_displayed": "Nun s'amuesa'l recursu «{resource}» d'otros sirvidores.",
-  "timeline_hint.resources.followers": "Siguidores",
-  "timeline_hint.resources.statuses": "Artículos antiguos",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} persones}} {days, plural, one {nel últimu día} other {nos últimos {days} díes}}",
   "trends.trending_now": "En tendencia",
   "ui.beforeunload": "El borrador piérdese si coles de Mastodon.",

app/javascript/mastodon/locales/be.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Заблакіраваць дамен {domain}",
   "account.block_short": "Заблакіраваць",
   "account.blocked": "Заблакіраваны",
-  "account.browse_more_on_origin_server": "Глядзіце больш у арыгінальным профілі",
   "account.cancel_follow_request": "Скасаваць запыт на падпіску",
   "account.copy": "Скапіраваць спасылку на профіль",
   "account.direct": "Згадаць асабіста @{name}",
@@ -445,8 +444,6 @@
   "mute_modal.title": "Ігнараваць карыстальніка?",
   "mute_modal.you_wont_see_mentions": "Вы не ўбачыце паведамленняў са згадваннем карыстальніка.",
   "mute_modal.you_wont_see_posts": "Карыстальнік па-ранейшаму будзе бачыць вашыя паведамленні, але вы не будзеце паведамленні карыстальніка.",
-  "name_and_others": "{name} і {count, plural, one {# іншы} many {# іншых} other {# іншых}}",
-  "name_and_others_with_link": "{name} і <a>{count, plural, one {# іншы} many {# іншых} other {# іншых}}</a>",
   "navigation_bar.about": "Пра нас",
   "navigation_bar.advanced_interface": "Адкрыць у пашыраным вэб-інтэрфейсе",
   "navigation_bar.blocks": "Заблакіраваныя карыстальнікі",
@@ -748,8 +745,6 @@
   "status.favourite": "Упадабанае",
   "status.favourites": "{count, plural, one {# упадабанае} few {# упадабаныя} many {# упадабаных} other {# упадабанага}}",
   "status.filter": "Фільтраваць гэты допіс",
-  "status.filtered": "Адфільтравана",
-  "status.hide": "Схаваць допіс",
   "status.history.created": "Створана {name} {date}",
   "status.history.edited": "Адрэдагавана {name} {date}",
   "status.load_more": "Загрузіць яшчэ",
@@ -777,10 +772,7 @@
   "status.report": "Паскардзіцца на @{name}",
   "status.sensitive_warning": "Уражвальны змест",
   "status.share": "Абагуліць",
-  "status.show_filter_reason": "Усё адно паказаць",
-  "status.show_less": "Паказаць меньш",
   "status.show_less_all": "Згарнуць усё",
-  "status.show_more": "Паказаць болей",
   "status.show_more_all": "Разгарнуць усё",
   "status.show_original": "Паказаць арыгінал",
   "status.title.with_attachments": "{user} апублікаваў {attachmentCount, plural, one {далучэнне} few {{attachmentCount} далучэнні} many {{attachmentCount} далучэнняў} other {{attachmentCount} далучэння}}",
@@ -799,11 +791,6 @@
   "time_remaining.minutes": "{number, plural, one {засталася # хвіліна} few {засталося # хвіліны} many {засталося # хвілін} other {засталося # хвіліны}}",
   "time_remaining.moments": "Засталося некалькі секунд",
   "time_remaining.seconds": "{number, plural, one {засталася # секунда} few {засталося # секунды} many {засталося # секунд} other {засталося # секунды}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} з іншых сервераў не адлюстроўваецца.",
-  "timeline_hint.resources.followers": "Падпісчыкі",
-  "timeline_hint.resources.follows": "Падпіскі",
-  "timeline_hint.resources.replies": "Некаторыя адказы",
-  "timeline_hint.resources.statuses": "Старыя допісы",
   "trends.counter_by_accounts": "{count, plural, one {{counter} чалавек} few {{counter} чалавекі} many {{counter} людзей} other {{counter} чалавек}} за {days, plural, one {{days} апошні дзень} few {{days} апошнія дні} many {{days} апошніх дзён} other {{days} апошніх дзён}}",
   "trends.trending_now": "Актуальнае",
   "ui.beforeunload": "Ваш чарнавік знішчыцца калі вы пакінеце Mastodon.",

app/javascript/mastodon/locales/bg.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Блокиране на домейн {domain}",
   "account.block_short": "Блокиране",
   "account.blocked": "Блокирани",
-  "account.browse_more_on_origin_server": "Разглеждане на още в оригиналния профил",
   "account.cancel_follow_request": "Оттегляне на заявката за последване",
   "account.copy": "Копиране на връзка към профила",
   "account.direct": "Частно споменаване на @{name}",
@@ -445,8 +444,6 @@
   "mute_modal.title": "Заглушавате ли потребител?",
   "mute_modal.you_wont_see_mentions": "Няма да виждате споменаващите ги публикации.",
   "mute_modal.you_wont_see_posts": "Още могат да виждат публикациите ви, но вие техните не.",
-  "name_and_others": "{name} и {count, plural, one {# друг} other {# други}}",
-  "name_and_others_with_link": "{name} и <a>{count, plural, one {# друг} other {# други}}</a>",
   "navigation_bar.about": "Относно",
   "navigation_bar.advanced_interface": "Отваряне в разширен уебинтерфейс",
   "navigation_bar.blocks": "Блокирани потребители",
@@ -505,6 +502,8 @@
   "notification.update": "{name} промени публикация",
   "notification_requests.accept": "Приемам",
   "notification_requests.dismiss": "Отхвърлям",
+  "notification_requests.edit_selection": "Редактиране",
+  "notification_requests.exit_selection": "Готово",
   "notification_requests.explainer_for_limited_account": "Известията от този акаунт са прецедени, защото акаунтът е ограничен от модератор.",
   "notification_requests.explainer_for_limited_remote_account": "Известията от този акаунт са прецедени, защото акаунтът или сървърът му е ограничен от модератор.",
   "notification_requests.maximize": "Максимизиране",
@@ -747,8 +746,6 @@
   "status.favourite": "Любимо",
   "status.favourites": "{count, plural, one {любимо} other {любими}}",
   "status.filter": "Филтриране на публ.",
-  "status.filtered": "Филтрирано",
-  "status.hide": "Скриване на публ.",
   "status.history.created": "{name} създаде {date}",
   "status.history.edited": "{name} редактира {date}",
   "status.load_more": "Зареждане на още",
@@ -776,10 +773,7 @@
   "status.report": "Докладване на @{name}",
   "status.sensitive_warning": "Деликатно съдържание",
   "status.share": "Споделяне",
-  "status.show_filter_reason": "Покажи въпреки това",
-  "status.show_less": "Показване на по-малко",
   "status.show_less_all": "Показване на по-малко за всички",
-  "status.show_more": "Показване на повече",
   "status.show_more_all": "Показване на повече за всички",
   "status.show_original": "Показване на първообраза",
   "status.title.with_attachments": "{user} публикува {attachmentCount, plural, one {прикачване} other {{attachmentCount} прикачвания}}",
@@ -798,10 +792,6 @@
   "time_remaining.minutes": "{number, plural, one {остава # минута} other {остават # минути}}",
   "time_remaining.moments": "Оставащи моменти",
   "time_remaining.seconds": "{number, plural, one {# секунда} other {# секунди}} остава",
-  "timeline_hint.remote_resource_not_displayed": "{resource} от други сървъри не се показват.",
-  "timeline_hint.resources.followers": "Последователи",
-  "timeline_hint.resources.follows": "Последвани",
-  "timeline_hint.resources.statuses": "По-стари публикации",
   "trends.counter_by_accounts": "{count, plural, one {{counter} човек} other {{counter} души}} {days, plural, one {за последния {days} ден} other {за последните {days} дни}}",
   "trends.trending_now": "Налагащи се сега",
   "ui.beforeunload": "Черновата ви ще се загуби, излизайки от Mastodon.",

app/javascript/mastodon/locales/bn.json

@@ -18,7 +18,6 @@
   "account.block_domain": "{domain} কে ব্লক করুন",
   "account.block_short": "ব্লক",
   "account.blocked": "অবরুদ্ধ",
-  "account.browse_more_on_origin_server": "মূল প্রোফাইলটিতে আরও ব্রাউজ করুন",
   "account.cancel_follow_request": "অনুসরণ অনুরোধ প্রত্যাহার করুন",
   "account.direct": "গোপনে মেনশন করুন @{name}",
   "account.disable_notifications": "আমাকে জানানো বন্ধ করো যখন @{name} পোস্ট করবে",
@@ -412,8 +411,6 @@
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "এমবেড করতে",
   "status.favourite": "পছন্দ",
-  "status.filtered": "ছাঁকনিদিত",
-  "status.hide": "পোস্ট লুকাও",
   "status.load_more": "আরো দেখুন",
   "status.media_hidden": "মিডিয়া লুকানো আছে",
   "status.mention": "@{name}কে উল্লেখ করতে",
@@ -435,9 +432,7 @@
   "status.report": "@{name} কে রিপোর্ট করতে",
   "status.sensitive_warning": "সংবেদনশীল কিছু",
   "status.share": "অন্যদের জানান",
-  "status.show_less": "কম দেখতে",
   "status.show_less_all": "সবগুলোতে কম দেখতে",
-  "status.show_more": "আরো দেখাতে",
   "status.show_more_all": "সবগুলোতে আরো দেখতে",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.translate": "অনুবাদ",
@@ -450,10 +445,6 @@
   "time_remaining.minutes": "{number, plural, one {# মিনিট} other {# মিনিট}} বাকি আছে",
   "time_remaining.moments": "সময় বাকি আছে",
   "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} বাকি আছে",
-  "timeline_hint.remote_resource_not_displayed": "অন্য সার্ভারগুলি থেকে {resource} দেখাচ্ছে না। ",
-  "timeline_hint.resources.followers": "অনুসরকারীরা",
-  "timeline_hint.resources.follows": "অনুসরণ করে",
-  "timeline_hint.resources.statuses": "পুরনো টুটগুলি",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "trends.trending_now": "বর্তমানে জনপ্রিয়",
   "ui.beforeunload": "যে পর্যন্ত এটা লেখা হয়েছে, মাস্টাডন থেকে চলে গেলে এটা মুছে যাবে।",

app/javascript/mastodon/locales/br.json

@@ -18,7 +18,6 @@
   "account.block_domain": "Stankañ an domani {domain}",
   "account.block_short": "Stankañ",
   "account.blocked": "Stanket",
-  "account.browse_more_on_origin_server": "Furchal pelloc'h war ar profil orin",
   "account.cancel_follow_request": "Nullañ ar reked heuliañ",
   "account.copy": "Eilañ al liamm war-zu ho profil",
   "account.direct": "Menegiñ @{name} ent-prevez",
@@ -580,8 +579,6 @@
   "status.embed": "Enframmañ",
   "status.favourite": "Muiañ-karet",
   "status.filter": "Silañ ar c'hannad-mañ",
-  "status.filtered": "Silet",
-  "status.hide": "Kuzhat an embannadur",
   "status.history.created": "Krouet gant {name} {date}",
   "status.history.edited": "Kemmet gant {name} {date}",
   "status.load_more": "Kargañ muioc'h",
@@ -608,10 +605,7 @@
   "status.report": "Disklêriañ @{name}",
   "status.sensitive_warning": "Dalc'had kizidik",
   "status.share": "Rannañ",
-  "status.show_filter_reason": "Diskwel memes tra",
-  "status.show_less": "Diskouez nebeutoc'h",
   "status.show_less_all": "Diskouez nebeutoc'h evit an holl",
-  "status.show_more": "Diskouez muioc'h",
   "status.show_more_all": "Diskouez miuoc'h evit an holl",
   "status.show_original": "Diskouez hini orin",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
@@ -629,10 +623,6 @@
   "time_remaining.minutes": "{number, plural, one {# munut} other{# a vunut}} a chom",
   "time_remaining.moments": "Pennadoù a-zilerc'h",
   "time_remaining.seconds": "{number, plural, one {# eilenn} other{# eilenn}} a chom",
-  "timeline_hint.remote_resource_not_displayed": "{resource} eus servijerien all n'int ket skrammet.",
-  "timeline_hint.resources.followers": "Heulier·ezed·ien",
-  "timeline_hint.resources.follows": "Heuliañ",
-  "timeline_hint.resources.statuses": "Toudoù koshoc'h",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "trends.trending_now": "Luskad ar mare",
   "ui.beforeunload": "Kollet e vo ho prell ma kuitit Mastodon.",

app/javascript/mastodon/locales/ca.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Bloca el domini {domain}",
   "account.block_short": "Bloca",
   "account.blocked": "Blocat",
-  "account.browse_more_on_origin_server": "Explora'n més al perfil original",
   "account.cancel_follow_request": "Cancel·la el seguiment",
   "account.copy": "Copia l'enllaç al perfil",
   "account.direct": "Menciona privadament @{name}",
@@ -193,6 +192,8 @@
   "confirmations.unfollow.confirm": "Deixa de seguir",
   "confirmations.unfollow.message": "Segur que vols deixar de seguir {name}?",
   "confirmations.unfollow.title": "Deixar de seguir l'usuari?",
+  "content_warning.hide": "Amaga la publicació",
+  "content_warning.show": "Mostra-la igualment",
   "conversation.delete": "Elimina la conversa",
   "conversation.mark_as_read": "Marca com a llegida",
   "conversation.open": "Mostra la conversa",
@@ -300,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Usa una categoria existent o crea'n una de nova",
   "filter_modal.select_filter.title": "Filtra aquest tut",
   "filter_modal.title.status": "Filtra un tut",
+  "filter_warning.matches_filter": "Coincideix amb el filtre “{title}”",
   "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",
@@ -349,6 +351,14 @@
   "hashtag.follow": "Segueix l'etiqueta",
   "hashtag.unfollow": "Deixa de seguir l'etiqueta",
   "hashtags.and_other": "…i {count, plural, other {# més}}",
+  "hints.profiles.followers_may_be_missing": "Es poden haver perdut seguidors d'aquest perfil.",
+  "hints.profiles.follows_may_be_missing": "Es poden haver perdut seguiments d'aquest perfil.",
+  "hints.profiles.posts_may_be_missing": "Es poden haver perdut algunes publicacions d'aquest perfil.",
+  "hints.profiles.see_more_followers": "Vegeu més seguidors a {domain}",
+  "hints.profiles.see_more_follows": "Vegeu més seguiments a {domain}",
+  "hints.profiles.see_more_posts": "Vegeu més publicacions a {domain}",
+  "hints.threads.replies_may_be_missing": "Es poden haver perdut respostes d'altres servidors.",
+  "hints.threads.see_more": "Vegeu més respostes a {domain}",
   "home.column_settings.show_reblogs": "Mostra els impulsos",
   "home.column_settings.show_replies": "Mostra les respostes",
   "home.hide_announcements": "Amaga els anuncis",
@@ -356,7 +366,8 @@
   "home.pending_critical_update.link": "Veure actualitzacions",
   "home.pending_critical_update.title": "Actualització de seguretat crítica disponible!",
   "home.show_announcements": "Mostra els anuncis",
-  "ignore_notifications_modal.disclaimer": "Mastodon no pot informar als usuaris de que heu ignorat notificacions seves.\nIgnorar notificacions no evitarà que se segueixin enviant els missatges.",
+  "ignore_notifications_modal.disclaimer": "Mastodon no pot informar els usuaris que heu ignorat notificacions seves.\nIgnorar notificacions no evitarà que se segueixin enviant els missatges.",
+  "ignore_notifications_modal.filter_instead": "Altrament filtra",
   "ignore_notifications_modal.filter_to_act_users": "Encara podreu acceptar, rebutjar o reportar usuaris",
   "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrar ajuda a evitar potencials confusions",
   "ignore_notifications_modal.filter_to_review_separately": "Podeu revisar separadament notificacions filtrades",
@@ -455,8 +466,6 @@
   "mute_modal.title": "Silenciem l'usuari?",
   "mute_modal.you_wont_see_mentions": "No veureu publicacions que els esmentin.",
   "mute_modal.you_wont_see_posts": "Encara poden veure les vostres publicacions, però no veureu les seves.",
-  "name_and_others": "{name} i {count, plural, one {# altre} other {# altres}}",
-  "name_and_others_with_link": "{name} i <a>{count, plural, one {# altre} other {# altres}}</a>",
   "navigation_bar.about": "Quant a",
   "navigation_bar.advanced_interface": "Obre en la interfície web avançada",
   "navigation_bar.blocks": "Usuaris blocats",
@@ -489,9 +498,13 @@
   "notification.admin.report_statuses": "{name} ha reportat {target} per {category}",
   "notification.admin.report_statuses_other": "{name} ha reportat {target}",
   "notification.admin.sign_up": "{name} s'ha registrat",
+  "notification.admin.sign_up.name_and_others": "{name} i {count, plural, one {# altre} other {# altres}} s'han registrat",
   "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 {count, plural, one {# altre} other {# altres}} 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ó",
   "notification.label.private_mention": "Menció privada",
   "notification.label.private_reply": "Resposta en privat",
@@ -509,6 +522,7 @@
   "notification.own_poll": "La teva enquesta ha finalitzat",
   "notification.poll": "Ha finalitzat una enquesta que heu respost",
   "notification.reblog": "{name} t'ha impulsat",
+  "notification.reblog.name_and_others_with_link": "{name} i <a>{count, plural, one {# altre} other {# altres}}</a> han impulsat la vostra publicació",
   "notification.relationships_severance_event": "S'han perdut les connexions amb {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspès {target}; això vol dir que ja no en podreu rebre actualitzacions o interactuar-hi.",
   "notification.relationships_severance_event.domain_block": "Un administrador de {from} ha blocat {target}, incloent-hi {followersCount} dels vostres seguidors i {followingCount, plural, one {# compte} other {# comptes}} que seguiu.",
@@ -571,12 +585,12 @@
   "notifications.permission_denied": "Les notificacions d’escriptori no estan disponibles perquè prèviament s’ha denegat el permís al navegador",
   "notifications.permission_denied_alert": "No es poden activar les notificacions de l'escriptori perquè abans s'ha denegat el permís del navegador",
   "notifications.permission_required": "Les notificacions d'escriptori no estan disponibles perquè el permís requerit no ha estat concedit.",
-  "notifications.policy.accept": "Acceptar",
+  "notifications.policy.accept": "Accepta",
   "notifications.policy.accept_hint": "Mostra a notificacions",
-  "notifications.policy.drop": "Ignorar",
+  "notifications.policy.drop": "Ignora",
   "notifications.policy.drop_hint": "Envia al buit, no es tornarà a veure mai més",
-  "notifications.policy.filter": "Filtrar",
+  "notifications.policy.filter": "Filtra",
-  "notifications.policy.filter_hint": "Filtrar",
+  "notifications.policy.filter_hint": "Envia a la bústia de notificacions filtrades",
   "notifications.policy.filter_limited_accounts_hint": "Limitat pels moderadors del servidor",
   "notifications.policy.filter_limited_accounts_title": "Comptes moderats",
   "notifications.policy.filter_new_accounts.hint": "Creat {days, plural, one {ahir} other {durant els # dies passats}}",
@@ -774,8 +788,6 @@
   "status.favourite": "Favorit",
   "status.favourites": "{count, plural, one {favorit} other {favorits}}",
   "status.filter": "Filtra aquest tut",
-  "status.filtered": "Filtrada",
-  "status.hide": "Amaga el tut",
   "status.history.created": "creat per {name} {date}",
   "status.history.edited": "editat per {name} {date}",
   "status.load_more": "Carrega'n més",
@@ -803,10 +815,7 @@
   "status.report": "Denuncia @{name}",
   "status.sensitive_warning": "Contingut sensible",
   "status.share": "Comparteix",
-  "status.show_filter_reason": "Mostra igualment",
-  "status.show_less": "Mostra'n menys",
   "status.show_less_all": "Mostra'n menys per a tot",
-  "status.show_more": "Mostra'n més",
   "status.show_more_all": "Mostra'n més per a tot",
   "status.show_original": "Mostra l'original",
   "status.title.with_attachments": "{user} ha publicat {attachmentCount, plural, one {un adjunt} other {{attachmentCount} adjunts}}",
@@ -825,11 +834,6 @@
   "time_remaining.minutes": "{number, plural, one {# minut restant} other {# minuts restants}}",
   "time_remaining.moments": "Moments restants",
   "time_remaining.seconds": "{number, plural, one {# segon restant} other {# segons restants}}",
-  "timeline_hint.remote_resource_not_displayed": "No es mostren {resource} d'altres servidors.",
-  "timeline_hint.resources.followers": "Seguidors",
-  "timeline_hint.resources.follows": "Seguiments",
-  "timeline_hint.resources.replies": "Algunes respostes",
-  "timeline_hint.resources.statuses": "Tuts més antics",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} persones}} en {days, plural, one {el passat dia} other {els passats {days} dies}}",
   "trends.trending_now": "És tendència",
   "ui.beforeunload": "El teu esborrany es perdrà si surts de Mastodon.",

app/javascript/mastodon/locales/ckb.json

@@ -18,7 +18,6 @@
   "account.block_domain": "بلۆکی هەموو شتێک لە {domain}",
   "account.block_short": "بلۆک",
   "account.blocked": "بلۆککرا",
-  "account.browse_more_on_origin_server": "گەڕانی فرەتر لە سەر پرۆفایلی سەرەکی",
   "account.cancel_follow_request": "داواکاری فۆڵۆو بکشێنەوە",
   "account.copy": "ڕوونووسی بەستەر بۆ توت",
   "account.direct": "بە شێوەیەکی تایبەت باسی @{name} بکە",
@@ -543,8 +542,6 @@
   "status.edited_x_times": "دەستکاریکراوە {count, plural, one {{count} کات} other {{count} کات}}",
   "status.embed": "نیشتەجێ بکە",
   "status.filter": "ئەم پۆستە فلتەر بکە",
-  "status.filtered": "پاڵاوتن",
-  "status.hide": "شاردنەوەی پۆست",
   "status.history.created": "{name} دروستکراوە لە{date}",
   "status.history.edited": "{name} دروستکاریکراوە لە{date}",
   "status.load_more": "زیاتر بار بکە",
@@ -569,10 +566,7 @@
   "status.report": "گوزارشت @{name}",
   "status.sensitive_warning": "ناوەڕۆکی هەستیار",
   "status.share": "هاوبەشی بکە",
-  "status.show_filter_reason": "بە هەر حاڵ نیشان بدە",
-  "status.show_less": "کەمتر نیشان بدە",
   "status.show_less_all": "هەمووی بچووک بکەوە",
-  "status.show_more": "زیاتر نیشان بدە",
   "status.show_more_all": "زیاتر نیشان بدە بۆ هەمووی",
   "status.show_original": "پیشاندانی شێوه‌ی ڕاسته‌قینه‌",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
@@ -590,10 +584,6 @@
   "time_remaining.minutes": "{number, plural, one {# خولەک} other {# خولەک}} ماوە",
   "time_remaining.moments": "کاتی ماوە",
   "time_remaining.seconds": "{number, plural, one {# چرکە} other {# چرکە}} ماوە",
-  "timeline_hint.remote_resource_not_displayed": "{resource} لە ڕاژەکانی ترەوە پیشان نادرێت.",
-  "timeline_hint.resources.followers": "شوێنکەوتوو",
-  "timeline_hint.resources.follows": "شوێنکەوتن",
-  "timeline_hint.resources.statuses": "نێردراوی کۆن",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "ڕۆژەڤ",
   "ui.beforeunload": "ڕەشنووسەکەت لەدەست دەچێت ئەگەر ماستۆدۆن جێ بهێڵیت.",

app/javascript/mastodon/locales/co.json

@@ -5,7 +5,6 @@
   "account.block": "Bluccà @{name}",
   "account.block_domain": "Piattà u duminiu {domain}",
   "account.blocked": "Bluccatu",
-  "account.browse_more_on_origin_server": "Vede di più nant'à u prufile uriginale",
   "account.cancel_follow_request": "Withdraw follow request",
   "account.disable_notifications": "Ùn mi nutificate più quandu @{name} pubblica qualcosa",
   "account.domain_blocked": "Duminiu piattatu",
@@ -322,7 +321,6 @@
   "status.detailed_status": "Vista in ditagliu di a cunversazione",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "Integrà",
-  "status.filtered": "Filtratu",
   "status.load_more": "Vede di più",
   "status.media_hidden": "Media piattata",
   "status.mention": "Mintuvà @{name}",
@@ -344,9 +342,7 @@
   "status.report": "Palisà @{name}",
   "status.sensitive_warning": "Cuntinutu sensibile",
   "status.share": "Sparte",
-  "status.show_less": "Ripiegà",
   "status.show_less_all": "Ripiegà tuttu",
-  "status.show_more": "Slibrà",
   "status.show_more_all": "Slibrà tuttu",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.unmute_conversation": "Ùn piattà più a cunversazione",
@@ -358,10 +354,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuta ferma} other {# minute fermanu}} left",
   "time_remaining.moments": "Ci fermanu qualchi mumentu",
   "time_remaining.seconds": "{number, plural, one {# siconda ferma} other {# siconde fermanu}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} da l'altri servori ùn so micca affissati·e.",
-  "timeline_hint.resources.followers": "Abbunati",
-  "timeline_hint.resources.follows": "Abbunamenti",
-  "timeline_hint.resources.statuses": "Statuti più anziani",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "trends.trending_now": "Tindenze d'avà",
   "ui.beforeunload": "A bruttacopia sarà persa s'ellu hè chjosu Mastodon.",

app/javascript/mastodon/locales/cs.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Blokovat doménu {domain}",
   "account.block_short": "Zablokovat",
   "account.blocked": "Blokovaný",
-  "account.browse_more_on_origin_server": "Více na původním profilu",
   "account.cancel_follow_request": "Zrušit sledování",
   "account.copy": "Kopírovat odkaz na profil",
   "account.direct": "Soukromě zmínit @{name}",
@@ -732,8 +731,6 @@
   "status.favourite": "Oblíbit",
   "status.favourites": "{count, plural, one {oblíbený} few {oblíbené} many {oblíbených} other {oblíbených}}",
   "status.filter": "Filtrovat tento příspěvek",
-  "status.filtered": "Filtrováno",
-  "status.hide": "Skrýt příspěvek",
   "status.history.created": "Uživatel {name} vytvořil {date}",
   "status.history.edited": "Uživatel {name} upravil {date}",
   "status.load_more": "Načíst více",
@@ -761,10 +758,7 @@
   "status.report": "Nahlásit @{name}",
   "status.sensitive_warning": "Citlivý obsah",
   "status.share": "Sdílet",
-  "status.show_filter_reason": "Přesto zobrazit",
-  "status.show_less": "Zobrazit méně",
   "status.show_less_all": "Zobrazit méně pro všechny",
-  "status.show_more": "Zobrazit více",
   "status.show_more_all": "Zobrazit více pro všechny",
   "status.show_original": "Zobrazit originál",
   "status.title.with_attachments": "{user} zveřejnil {attachmentCount, plural, one {přílohu} few {{attachmentCount} přílohy} many {{attachmentCount} příloh} other {{attachmentCount} příloh}}",
@@ -783,10 +777,6 @@
   "time_remaining.minutes": "{number, plural, one {Zbývá # minuta} few {Zbývají # minuty} many {Zbývá # minut} other {Zbývá # minut}}",
   "time_remaining.moments": "Zbývá několik sekund",
   "time_remaining.seconds": "{number, plural, one {Zbývá # sekunda} few {Zbývají # sekundy} many {Zbývá # sekund} other {Zbývá # sekund}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} z jiných serverů se nezobrazují.",
-  "timeline_hint.resources.followers": "Sledující",
-  "timeline_hint.resources.follows": "Sledovaní",
-  "timeline_hint.resources.statuses": "Starší příspěvky",
   "trends.counter_by_accounts": "{count, plural, one {{counter} člověk} few {{counter} lidé} many {{counter} lidí} other {{counter} lidí}} za poslední {days, plural, one {den} few {{days} dny} many {{days} dnů} other {{days} dnů}}",
   "trends.trending_now": "Právě populární",
   "ui.beforeunload": "Pokud Mastodon opustíte, váš koncept se ztratí.",

app/javascript/mastodon/locales/cy.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Blocio parth {domain}",
   "account.block_short": "Blocio",
   "account.blocked": "Blociwyd",
-  "account.browse_more_on_origin_server": "Pori mwy ar y proffil gwreiddiol",
   "account.cancel_follow_request": "Tynnu cais i ddilyn",
   "account.copy": "Copïo dolen i'r proffil",
   "account.direct": "Crybwyll yn breifat @{name}",
@@ -456,8 +455,6 @@
   "mute_modal.title": "Tewi defnyddiwr?",
   "mute_modal.you_wont_see_mentions": "Welwch chi ddim postiadau sy'n sôn amdanyn nhw.",
   "mute_modal.you_wont_see_posts": "Gallan nhw weld eich postiadau o hyd, ond fyddwch chi ddim yn gweld eu rhai hwy.",
-  "name_and_others": "{name} a(c) {count, plural, one {# arall} other {# eraill}}",
-  "name_and_others_with_link": "{name} a<a>{count, plural, zero {}one {c # arall} two { # eraill} few { # eraill} many { # eraill} other { # eraill}}</a>",
   "navigation_bar.about": "Ynghylch",
   "navigation_bar.advanced_interface": "Agor mewn rhyngwyneb gwe uwch",
   "navigation_bar.blocks": "Defnyddwyr wedi eu blocio",
@@ -765,8 +762,6 @@
   "status.favourite": "Hoffi",
   "status.favourites": "{count, plural, one {ffefryn} other {ffefryn}}",
   "status.filter": "Hidlo'r postiad hwn",
-  "status.filtered": "Wedi'i hidlo",
-  "status.hide": "Cuddio'r postiad",
   "status.history.created": "Crëwyd gan {name} {date}",
   "status.history.edited": "Golygwyd gan {name} {date}",
   "status.load_more": "Llwythwch ragor",
@@ -794,10 +789,7 @@
   "status.report": "Adrodd ar @{name}",
   "status.sensitive_warning": "Cynnwys sensitif",
   "status.share": "Rhannu",
-  "status.show_filter_reason": "Dangos beth bynnag",
-  "status.show_less": "Dangos llai",
   "status.show_less_all": "Dangos llai i bawb",
-  "status.show_more": "Dangos mwy",
   "status.show_more_all": "Dangos mwy i bawb",
   "status.show_original": "Dangos y gwreiddiol",
   "status.title.with_attachments": "Postiodd {user} {attachmentCount, plural, one {an attachment} other {{attachmentCount} attachments}}",
@@ -816,11 +808,6 @@
   "time_remaining.minutes": "{number, plural, one {# munud} other {# munud}} ar ôl",
   "time_remaining.moments": "Munudau yn weddill",
   "time_remaining.seconds": "{number, plural, one {# eiliad} other {# eiliad}} ar ôl",
-  "timeline_hint.remote_resource_not_displayed": "Nid yw {resource} o weinyddion eraill yn cael ei ddangos.",
-  "timeline_hint.resources.followers": "Dilynwyr",
-  "timeline_hint.resources.follows": "Yn dilyn",
-  "timeline_hint.resources.replies": "Rhai atebion",
-  "timeline_hint.resources.statuses": "Postiadau hŷn",
   "trends.counter_by_accounts": "{count, plural, zero {neb} one {{counter} person} two {{counter} berson} few {{counter} pherson} other {{counter} o bobl}} yn y {days, plural, one {diwrnod diwethaf} two {ddeuddydd diwethaf} other {{days} diwrnod diwethaf}}",
   "trends.trending_now": "Yn trendio nawr",
   "ui.beforeunload": "Byddwch yn colli eich drafft os byddwch yn gadael Mastodon.",

app/javascript/mastodon/locales/da.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Blokér domænet {domain}",
   "account.block_short": "Bloker",
   "account.blocked": "Blokeret",
-  "account.browse_more_on_origin_server": "Se mere på den oprindelige profil",
   "account.cancel_follow_request": "Annullér anmodning om at følge",
   "account.copy": "Kopiér link til profil",
   "account.direct": "Privat omtale @{name}",
@@ -193,6 +192,8 @@
   "confirmations.unfollow.confirm": "Følg ikke længere",
   "confirmations.unfollow.message": "Er du sikker på, at du ikke længere vil følge {name}?",
   "confirmations.unfollow.title": "Følg ikke længere bruger?",
+  "content_warning.hide": "Skjul indlæg",
+  "content_warning.show": "Vis alligevel",
   "conversation.delete": "Slet samtale",
   "conversation.mark_as_read": "Markér som læst",
   "conversation.open": "Vis samtale",
@@ -300,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Vælg en eksisterende kategori eller opret en ny",
   "filter_modal.select_filter.title": "Filtrér dette indlæg",
   "filter_modal.title.status": "Filtrér et indlæg",
+  "filter_warning.matches_filter": "Matcher filteret “{title}”",
   "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",
@@ -349,6 +351,14 @@
   "hashtag.follow": "Følg hashtag",
   "hashtag.unfollow": "Stop med at følge hashtag",
   "hashtags.and_other": "…og {count, plural, one {}other {# flere}}",
+  "hints.profiles.followers_may_be_missing": "Der kan mangle følgere for denne profil.",
+  "hints.profiles.follows_may_be_missing": "Fulgte kan mangle for denne profil.",
+  "hints.profiles.posts_may_be_missing": "Nogle indlæg kan mangle for denne profil.",
+  "hints.profiles.see_more_followers": "Se flere følgere på {domain}",
+  "hints.profiles.see_more_follows": "Se flere fulgte på {domain}",
+  "hints.profiles.see_more_posts": "Se flere indlæg på {domain}",
+  "hints.threads.replies_may_be_missing": "Der kan mangle svar fra andre servere.",
+  "hints.threads.see_more": "Se flere svar på {domain}",
   "home.column_settings.show_reblogs": "Vis boosts",
   "home.column_settings.show_replies": "Vis svar",
   "home.hide_announcements": "Skjul bekendtgørelser",
@@ -456,8 +466,6 @@
   "mute_modal.title": "Tavsgør bruger?",
   "mute_modal.you_wont_see_mentions": "Indlæg, som nævner vedkommende, vises ikke.",
   "mute_modal.you_wont_see_posts": "Vedkommende kan stadig se dine indlæg, med vedkommendes vise ikke.",
-  "name_and_others": "{name} og {count, plural, one {# anden} other {# andre}}",
-  "name_and_others_with_link": "{name} og <a>{count, plural, one {# anden} other {# andre}}</a>",
   "navigation_bar.about": "Om",
   "navigation_bar.advanced_interface": "Åbn i avanceret webgrænseflade",
   "navigation_bar.blocks": "Blokerede brugere",
@@ -490,9 +498,13 @@
   "notification.admin.report_statuses": "{name} anmeldte {target} angående {category}",
   "notification.admin.report_statuses_other": "{name} anmeldte {target}",
   "notification.admin.sign_up": "{name} tilmeldte sig",
+  "notification.admin.sign_up.name_and_others": "{name} og {count, plural, one {# anden} other {# andre}} tilmeldte sig",
   "notification.favourite": "{name} favoritmarkerede dit indlæg",
+  "notification.favourite.name_and_others_with_link": "{name} og <a>{count, plural, one {# anden} other {# andre}}</a> gjorde dit indlæg til favorit",
   "notification.follow": "{name} begyndte at følge dig",
+  "notification.follow.name_and_others": "{name} og {count, plural, one {# anden} other {# andre}} følger dig",
   "notification.follow_request": "{name} har anmodet om at følge dig",
+  "notification.follow_request.name_and_others": "{name} og {count, plural, one {# anden} other {# andre}} har anmodet om at følger dig",
   "notification.label.mention": "Omtale",
   "notification.label.private_mention": "Privat omtale",
   "notification.label.private_reply": "Privat svar",
@@ -510,6 +522,7 @@
   "notification.own_poll": "Din afstemning er afsluttet",
   "notification.poll": "En afstemning, hvori du har stemt, er slut",
   "notification.reblog": "{name} boostede dit indlæg",
+  "notification.reblog.name_and_others_with_link": "{name} og <a>{count, plural, one {# anden} other {# andre}}</a> boostede dit indlæg",
   "notification.relationships_severance_event": "Mistede forbindelser med {name}",
   "notification.relationships_severance_event.account_suspension": "En admin fra {from} har suspenderet {target}, hvofor opdateringer herfra eller interaktion hermed ikke længer er mulig.",
   "notification.relationships_severance_event.domain_block": "En admin fra {from} har blokeret {target}, herunder {followersCount} tilhængere og {followingCount, plural, one {# konto, der} other {# konti, som}} følges.",
@@ -775,8 +788,6 @@
   "status.favourite": "Favorit",
   "status.favourites": "{count, plural, one {# favorit} other {# favoritter}}",
   "status.filter": "Filtrér dette indlæg",
-  "status.filtered": "Filtreret",
-  "status.hide": "Skjul indlæg",
   "status.history.created": "{name} oprettet {date}",
   "status.history.edited": "{name} redigeret {date}",
   "status.load_more": "Indlæs mere",
@@ -804,10 +815,7 @@
   "status.report": "Anmeld @{name}",
   "status.sensitive_warning": "Følsomt indhold",
   "status.share": "Del",
-  "status.show_filter_reason": "Vis alligevel",
-  "status.show_less": "Vis mindre",
   "status.show_less_all": "Vis mindre for alle",
-  "status.show_more": "Vis mere",
   "status.show_more_all": "Vis mere for alle",
   "status.show_original": "Vis original",
   "status.title.with_attachments": "{user} postede {attachmentCount, plural, one {en vedhæftning} other {{attachmentCount} vedhæftninger}}",
@@ -826,11 +834,6 @@
   "time_remaining.minutes": "{number, plural, one {# minut} other {# minutter}} tilbage",
   "time_remaining.moments": "Få øjeblikke tilbage",
   "time_remaining.seconds": "{number, plural, one {# sekund} other {# sekunder}} tilbage",
-  "timeline_hint.remote_resource_not_displayed": "{resource} fra andre servere vises ikke.",
-  "timeline_hint.resources.followers": "Følgere",
-  "timeline_hint.resources.follows": "Følger",
-  "timeline_hint.resources.replies": "Visse svar",
-  "timeline_hint.resources.statuses": "Ældre indlæg",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} personer}} {days, plural, one {den seneste dag} other {de seneste {days} dage}}",
   "trends.trending_now": "Hot lige nu",
   "ui.beforeunload": "Dit udkast går tabt, hvis du lukker Mastodon.",

app/javascript/mastodon/locales/de.json

@@ -19,7 +19,6 @@
   "account.block_domain": "{domain} sperren",
   "account.block_short": "Blockieren",
   "account.blocked": "Blockiert",
-  "account.browse_more_on_origin_server": "Mehr auf dem Originalprofil durchsuchen",
   "account.cancel_follow_request": "Folgeanfrage zurückziehen",
   "account.copy": "Link zum Profil kopieren",
   "account.direct": "@{name} privat erwähnen",
@@ -97,7 +96,7 @@
   "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} wird dieses Fenster beim nächsten Mal nicht mehr angezeigt",
+  "boost_modal.combo": "Mit {combo} erscheint dieses Fenster beim nächsten Mal nicht mehr",
   "bundle_column_error.copy_stacktrace": "Fehlerbericht kopieren",
   "bundle_column_error.error.body": "Die angeforderte Seite konnte nicht dargestellt werden. Dies könnte auf einen Fehler in unserem Code oder auf ein Browser-Kompatibilitätsproblem zurückzuführen sein.",
   "bundle_column_error.error.title": "Oh nein!",
@@ -185,7 +184,7 @@
   "confirmations.logout.title": "Abmelden?",
   "confirmations.mute.confirm": "Stummschalten",
   "confirmations.redraft.confirm": "Löschen und neu erstellen",
-  "confirmations.redraft.message": "Möchtest du diesen Beitrag wirklich löschen und neu verfassen? Favoriten und geteilte Beiträge gehen verloren, und Antworten auf den ursprünglichen Beitrag verlieren den Zusammenhang.",
+  "confirmations.redraft.message": "Möchtest du diesen Beitrag wirklich löschen und neu verfassen? Alle Favoriten sowie die bisher geteilten Beiträge werden verloren gehen und Antworten auf den ursprünglichen Beitrag verlieren den Zusammenhang.",
   "confirmations.redraft.title": "Beitrag löschen und neu erstellen?",
   "confirmations.reply.confirm": "Antworten",
   "confirmations.reply.message": "Wenn du jetzt darauf antwortest, wird der andere Beitrag, an dem du gerade geschrieben hast, verworfen. Möchtest du wirklich fortfahren?",
@@ -193,6 +192,8 @@
   "confirmations.unfollow.confirm": "Entfolgen",
   "confirmations.unfollow.message": "Möchtest du {name} wirklich entfolgen?",
   "confirmations.unfollow.title": "Profil entfolgen?",
+  "content_warning.hide": "Beitrag ausblenden",
+  "content_warning.show": "Trotzdem anzeigen",
   "conversation.delete": "Unterhaltung löschen",
   "conversation.mark_as_read": "Als gelesen markieren",
   "conversation.open": "Unterhaltung anzeigen",
@@ -300,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Einem vorhandenen Filter hinzufügen oder einen neuen erstellen",
   "filter_modal.select_filter.title": "Diesen Beitrag filtern",
   "filter_modal.title.status": "Beitrag per Filter ausblenden",
+  "filter_warning.matches_filter": "Übereinstimmend mit dem Filter „{title}“",
   "filtered_notifications_banner.pending_requests": "Von {count, plural, =0 {keinem, den} one {einer Person, die} other {# Personen, die}} du möglicherweise kennst",
   "filtered_notifications_banner.title": "Gefilterte Benachrichtigungen",
   "firehose.all": "Alles",
@@ -349,6 +351,14 @@
   "hashtag.follow": "Hashtag folgen",
   "hashtag.unfollow": "Hashtag entfolgen",
   "hashtags.and_other": "… und {count, plural, one{# weiterer} other {# weitere}}",
+  "hints.profiles.followers_may_be_missing": "Möglicherweise werden für dieses Profil nicht alle Follower angezeigt.",
+  "hints.profiles.follows_may_be_missing": "Möglicherweise werden für dieses Profil nicht alle gefolgten Profile angezeigt.",
+  "hints.profiles.posts_may_be_missing": "Möglicherweise werden für dieses Profil nicht alle Beiträge angezeigt.",
+  "hints.profiles.see_more_followers": "Weitere Follower auf {domain} ansehen",
+  "hints.profiles.see_more_follows": "Weitere gefolgte Profile auf {domain} ansehen",
+  "hints.profiles.see_more_posts": "Weitere Beiträge auf {domain} ansehen",
+  "hints.threads.replies_may_be_missing": "Möglicherweise werden für dieses Profil nicht alle Antworten angezeigt.",
+  "hints.threads.see_more": "Weitere Antworten auf {domain} ansehen",
   "home.column_settings.show_reblogs": "Geteilte Beiträge anzeigen",
   "home.column_settings.show_replies": "Antworten anzeigen",
   "home.hide_announcements": "Ankündigungen ausblenden",
@@ -456,8 +466,6 @@
   "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 weiterhin angesehen werden, aber du wirst deren Beiträge nicht mehr sehen.",
-  "name_and_others": "{name} und {count, plural, one {# weitere Person} other {# weitere Personen}}",
-  "name_and_others_with_link": "{name} und <a>{count, plural, one {# weitere Person} other {# weitere Personen}}</a>",
   "navigation_bar.about": "Über",
   "navigation_bar.advanced_interface": "Im erweiterten Webinterface öffnen",
   "navigation_bar.blocks": "Blockierte Profile",
@@ -490,9 +498,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 {# 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 {# weitere Person} other {# weitere Personen}}</a> favorisierten deinen Beitrag",
   "notification.follow": "{name} folgt dir",
+  "notification.follow.name_and_others": "{name} und {count, plural, one {# weitere Person} other {# weitere Personen}} folgen dir",
   "notification.follow_request": "{name} möchte 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",
@@ -510,6 +522,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 {# 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.",
@@ -650,9 +663,9 @@
   "privacy.private.short": "Follower",
   "privacy.public.long": "Alle in und außerhalb von Mastodon",
   "privacy.public.short": "Öffentlich",
-  "privacy.unlisted.additional": "Das Verhalten ist wie bei „Öffentlich“, jedoch erscheint dieser Beitrag nicht in „Live-Feeds“, „Erkunden“, Hashtags oder über die Mastodon-Suchfunktion – selbst wenn du das in den Einstellungen aktiviert hast.",
+  "privacy.unlisted.additional": "Das Verhalten ist wie bei „Öffentlich“, jedoch gibt es einige Einschränkungen. Der Beitrag wird nicht in „Live-Feeds“, „Erkunden“, Hashtags oder über die Mastodon-Suchfunktion auffindbar sein – selbst wenn die zugehörige Einstellung aktiviert wurde.",
   "privacy.unlisted.long": "Weniger im Algorithmus berücksichtigt",
-  "privacy.unlisted.short": "Öffentlich (eingeschränkt)",
+  "privacy.unlisted.short": "Öffentlich (still)",
   "privacy_policy.last_updated": "Stand: {date}",
   "privacy_policy.title": "Datenschutzerklärung",
   "recommended": "Empfohlen",
@@ -775,8 +788,6 @@
   "status.favourite": "Favorisieren",
   "status.favourites": "{count, plural, one {Mal favorisiert} other {Mal favorisiert}}",
   "status.filter": "Beitrag filtern",
-  "status.filtered": "Gefiltert",
-  "status.hide": "Beitrag ausblenden",
   "status.history.created": "{name} erstellte {date}",
   "status.history.edited": "{name} bearbeitete {date}",
   "status.load_more": "Mehr laden",
@@ -804,10 +815,7 @@
   "status.report": "@{name} melden",
   "status.sensitive_warning": "Inhaltswarnung",
   "status.share": "Teilen",
-  "status.show_filter_reason": "Trotzdem anzeigen",
-  "status.show_less": "Weniger anzeigen",
   "status.show_less_all": "Alles einklappen",
-  "status.show_more": "Mehr anzeigen",
   "status.show_more_all": "Alles ausklappen",
   "status.show_original": "Ursprünglichen Beitrag anzeigen",
   "status.title.with_attachments": "{user} veröffentlichte {attachmentCount, plural, one {ein Medium} other {{attachmentCount} Medien}}",
@@ -826,11 +834,6 @@
   "time_remaining.minutes": "noch {number, plural, one {# Minute} other {# Minuten}}",
   "time_remaining.moments": "Wird gleich beendet",
   "time_remaining.seconds": "noch {number, plural, one {# Sekunde} other {# Sekunden}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} von anderen Servern werden nicht angezeigt.",
-  "timeline_hint.resources.followers": "Follower",
-  "timeline_hint.resources.follows": "„Folge ich“",
-  "timeline_hint.resources.replies": "Einige Antworten",
-  "timeline_hint.resources.statuses": "Ältere Beiträge",
   "trends.counter_by_accounts": "{count, plural, one {{counter} Profil} other {{counter} Profile}} {days, plural, one {seit gestern} other {in {days} Tagen}}",
   "trends.trending_now": "Aktuelle Trends",
   "ui.beforeunload": "Dein Entwurf geht verloren, wenn du Mastodon verlässt.",

app/javascript/mastodon/locales/el.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Αποκλεισμός τομέα {domain}",
   "account.block_short": "Αποκλεισμός",
   "account.blocked": "Αποκλεισμένος/η",
-  "account.browse_more_on_origin_server": "Δες περισσότερα στο αρχικό προφίλ",
   "account.cancel_follow_request": "Απόσυρση αιτήματος παρακολούθησης",
   "account.copy": "Αντιγραφή συνδέσμου προφίλ",
   "account.direct": "Ιδιωτική αναφορά @{name}",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Παρακολούθηση ετικέτας",
   "hashtag.unfollow": "Διακοπή παρακολούθησης ετικέτας",
   "hashtags.and_other": "…και {count, plural, one {}other {# ακόμη}}",
+  "hints.profiles.followers_may_be_missing": "Μπορεί να λείπουν ακόλουθοι για αυτό το προφίλ.",
+  "hints.profiles.follows_may_be_missing": "Άτομα που ακολουθούνται μπορεί να λείπουν απ' αυτό το προφίλ.",
+  "hints.profiles.posts_may_be_missing": "Κάποιες αναρτήσεις από αυτό το προφίλ μπορεί να λείπουν.",
+  "hints.profiles.see_more_followers": "Δες περισσότερους ακόλουθους στο {domain}",
+  "hints.profiles.see_more_follows": "Δες περισσότερα άτομα που ακολουθούνται στο {domain}",
+  "hints.profiles.see_more_posts": "Δες περισσότερες αναρτήσεις στο {domain}",
+  "hints.threads.replies_may_be_missing": "Απαντήσεις από άλλους διακομιστές μπορεί να λείπουν.",
+  "hints.threads.see_more": "Δες περισσότερες αναρτήσεις στο {domain}",
   "home.column_settings.show_reblogs": "Εμφάνιση προωθήσεων",
   "home.column_settings.show_replies": "Εμφάνιση απαντήσεων",
   "home.hide_announcements": "Απόκρυψη ανακοινώσεων",
@@ -456,8 +463,6 @@
   "mute_modal.title": "Σίγαση χρήστη;",
   "mute_modal.you_wont_see_mentions": "Δε θα βλέπεις τις αναρτήσεις που τον αναφέρουν.",
   "mute_modal.you_wont_see_posts": "Μπορεί ακόμα να δει τις αναρτήσεις σου, αλλά δε θα βλέπεις τις δικές του.",
-  "name_and_others": "{name} και {count, plural, one {# ακόμη} other {# ακόμη}}",
-  "name_and_others_with_link": "{name} και <a>{count, plural, one {# ακόμη} other {# ακόμη}}</a>",
   "navigation_bar.about": "Σχετικά με",
   "navigation_bar.advanced_interface": "Άνοιγμα σε προηγμένη διεπαφή ιστού",
   "navigation_bar.blocks": "Αποκλεισμένοι χρήστες",
@@ -490,9 +495,13 @@
   "notification.admin.report_statuses": "Ο χρήστης {name} ανέφερε τον χρήστη {target} για {category}",
   "notification.admin.report_statuses_other": "Ο χρήστης {name} ανέφερε τον χρήστη {target}",
   "notification.admin.sign_up": "{name} έχει εγγραφεί",
+  "notification.admin.sign_up.name_and_others": "{name} και {count, plural, one {# ακόμη} other {# ακόμη}} έχουν εγγραφεί",
   "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} και {count, plural, one {# ακόμη} other {# ακόμη}} σε ακολούθησαν",
   "notification.follow_request": "Ο/H {name} ζήτησε να σε ακολουθήσει",
+  "notification.follow_request.name_and_others": "{name} και {count, plural, one {# άλλος} other {# άλλοι}} ζήτησαν να σε ακολουθήσουν",
   "notification.label.mention": "Επισήμανση",
   "notification.label.private_mention": "Ιδιωτική επισήμανση",
   "notification.label.private_reply": "Ιδιωτική απάντηση",
@@ -510,6 +519,7 @@
   "notification.own_poll": "Η δημοσκόπησή σου έληξε",
   "notification.poll": "Μία ψηφοφορία στην οποία συμμετείχες έχει τελειώσει",
   "notification.reblog": "Ο/Η {name} ενίσχυσε τη δημοσίευσή σου",
+  "notification.reblog.name_and_others_with_link": "{name} και <a>{count, plural, one {# ακόμη} 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 {# λογαριασμό} other {# λογαριασμοί}} που ακολουθείς.",
@@ -518,7 +528,17 @@
   "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": "Οι ειδοποιήσεις από αυτόν τον λογαριασμό έχουν φιλτραριστεί επειδή ο λογαριασμός έχει περιοριστεί από έναν συντονιστή.",
   "notification_requests.explainer_for_limited_remote_account": "Οι ειδοποιήσεις από αυτόν τον λογαριασμό έχουν φιλτραριστεί επειδή ο λογαριασμός ή ο διακομιστής του έχει περιοριστεί από έναν συντονιστή.",
   "notification_requests.maximize": "Μεγιστοποίηση",
@@ -765,8 +785,6 @@
   "status.favourite": "Αγαπημένα",
   "status.favourites": "{count, plural, one {# αγαπημένο} other {# αγαπημένα}}",
   "status.filter": "Φιλτράρισμα αυτής της ανάρτησης",
-  "status.filtered": "Φιλτραρισμένα",
-  "status.hide": "Απόκρυψη ανάρτησης",
   "status.history.created": "{name} δημιούργησε στις {date}",
   "status.history.edited": "{name} επεξεργάστηκε στις {date}",
   "status.load_more": "Φόρτωσε περισσότερα",
@@ -794,10 +812,7 @@
   "status.report": "Αναφορά @{name}",
   "status.sensitive_warning": "Ευαίσθητο περιεχόμενο",
   "status.share": "Κοινοποίηση",
-  "status.show_filter_reason": "Εμφάνιση παρ' όλα αυτά",
-  "status.show_less": "Δείξε λιγότερα",
   "status.show_less_all": "Δείξε λιγότερα για όλα",
-  "status.show_more": "Δείξε περισσότερα",
   "status.show_more_all": "Δείξε περισσότερα για όλα",
   "status.show_original": "Εμφάνιση αρχικού",
   "status.title.with_attachments": "{user} δημοσίευσε {attachmentCount, plural, one {ένα συνημμένο} other {{attachmentCount} συνημμένα}}",
@@ -816,11 +831,6 @@
   "time_remaining.minutes": "απομένουν {number, plural, one {# λεπτό} other {# λεπτά}}",
   "time_remaining.moments": "Στιγμές που απομένουν",
   "time_remaining.seconds": "απομένουν {number, plural, one {# δευτερόλεπτο} other {# δευτερόλεπτα}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} από άλλους διακομιστές δεν εμφανίζονται.",
-  "timeline_hint.resources.followers": "Ακόλουθοι",
-  "timeline_hint.resources.follows": "Ακολουθείς",
-  "timeline_hint.resources.replies": "Κάποιες απαντήσεις",
-  "timeline_hint.resources.statuses": "Παλαιότερες αναρτήσεις",
   "trends.counter_by_accounts": "{count, plural, one {{counter} άτομο} other {{counter} άτομα} }{days, plural, one { την τελευταία ημέρα} other { τις τελευταίες {days} ημέρες}}",
   "trends.trending_now": "Δημοφιλή τώρα",
   "ui.beforeunload": "Το προσχέδιό σου θα χαθεί αν φύγεις από το Mastodon.",

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

@@ -19,7 +19,6 @@
   "account.block_domain": "Block domain {domain}",
   "account.block_short": "Block",
   "account.blocked": "Blocked",
-  "account.browse_more_on_origin_server": "Browse more on the original profile",
   "account.cancel_follow_request": "Cancel follow",
   "account.copy": "Copy link to profile",
   "account.direct": "Privately mention @{name}",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Follow hashtag",
   "hashtag.unfollow": "Unfollow hashtag",
   "hashtags.and_other": "…and {count, plural, one {one more} other {# more}}",
+  "hints.profiles.followers_may_be_missing": "Followers for this profile may be missing.",
+  "hints.profiles.follows_may_be_missing": "Follows for this profile may be missing.",
+  "hints.profiles.posts_may_be_missing": "Some posts from this profile may be missing.",
+  "hints.profiles.see_more_followers": "See more followers on {domain}",
+  "hints.profiles.see_more_follows": "See more follows on {domain}",
+  "hints.profiles.see_more_posts": "See more posts on {domain}",
+  "hints.threads.replies_may_be_missing": "Replies from other servers may be missing.",
+  "hints.threads.see_more": "See more replies on {domain}",
   "home.column_settings.show_reblogs": "Show boosts",
   "home.column_settings.show_replies": "Show replies",
   "home.hide_announcements": "Hide announcements",
@@ -366,6 +373,7 @@
   "ignore_notifications_modal.new_accounts_title": "Ignore notifications from new accounts?",
   "ignore_notifications_modal.not_followers_title": "Ignore notifications from people not following you?",
   "ignore_notifications_modal.not_following_title": "Ignore notifications from people you don't follow?",
+  "ignore_notifications_modal.private_mentions_title": "Ignore notifications from unsolicited Private Mentions?",
   "interaction_modal.description.favourite": "With an account on Mastodon, you can favourite this post to let the author know you appreciate it and save it for later.",
   "interaction_modal.description.follow": "With an account on Mastodon, you can follow {name} to receive their posts in your home feed.",
   "interaction_modal.description.reblog": "With an account on Mastodon, you can boost this post to share it with your own followers.",
@@ -455,8 +463,6 @@
   "mute_modal.title": "Mute user?",
   "mute_modal.you_wont_see_mentions": "You won't see posts that mention them.",
   "mute_modal.you_wont_see_posts": "They can still see your posts, but you won't see theirs.",
-  "name_and_others": "{name} and {count, plural, one {# other} other {# others}}",
-  "name_and_others_with_link": "{name} and <a>{count, plural, one {# other} other {# others}}</a>",
   "navigation_bar.about": "About",
   "navigation_bar.advanced_interface": "Open in advanced web interface",
   "navigation_bar.blocks": "Blocked users",
@@ -489,9 +495,13 @@
   "notification.admin.report_statuses": "{name} reported {target} for {category}",
   "notification.admin.report_statuses_other": "{name} reported {target}",
   "notification.admin.sign_up": "{name} signed up",
+  "notification.admin.sign_up.name_and_others": "{name} and {count, plural, one {# other} other {# others}} signed up",
   "notification.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 {count, plural, one {# other} other {# others}} 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",
   "notification.label.private_mention": "Private mention",
   "notification.label.private_reply": "Private reply",
@@ -509,6 +519,7 @@
   "notification.own_poll": "Your poll has ended",
   "notification.poll": "A poll you voted in has ended",
   "notification.reblog": "{name} boosted your status",
+  "notification.reblog.name_and_others_with_link": "{name} and <a>{count, plural, one {# other} other {# others}}</a> boosted your post",
   "notification.relationships_severance_event": "Lost connections with {name}",
   "notification.relationships_severance_event.account_suspension": "An admin from {from} has suspended {target}, which means you can no longer receive updates from them or interact with them.",
   "notification.relationships_severance_event.domain_block": "An admin from {from} has blocked {target}, including {followersCount} of your followers and {followingCount, plural, one {# account} other {# accounts}} you follow.",
@@ -517,9 +528,20 @@
   "notification.status": "{name} just posted",
   "notification.update": "{name} edited a post",
   "notification_requests.accept": "Accept",
+  "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": "You are about to accept {count, plural, one {one notification request} other {# notification requests}}. Are you sure you want to proceed?",
+  "notification_requests.confirm_accept_multiple.title": "Accept notification requests?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Dismiss request} other {Dismiss requests}}",
+  "notification_requests.confirm_dismiss_multiple.message": "You are about to dismiss {count, plural, one {one notification request} other {# notification requests}}. You won't be able to easily access {count, plural, one {it} other {them}} again. Are you sure you want to proceed?",
+  "notification_requests.confirm_dismiss_multiple.title": "Dismiss notification requests?",
   "notification_requests.dismiss": "Dismiss",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Dismiss # request…} other {Dismiss # requests…}}",
+  "notification_requests.edit_selection": "Edit",
+  "notification_requests.exit_selection": "Done",
   "notification_requests.explainer_for_limited_account": "Notifications from this account have been filtered because the account has been limited by a moderator.",
   "notification_requests.explainer_for_limited_remote_account": "Notifications from this account have been filtered because the account or its server has been limited by a moderator.",
+  "notification_requests.maximize": "Maximise",
   "notification_requests.minimize_banner": "Minimize filtered notifications banner",
   "notification_requests.notifications_from": "Notifications from {name}",
   "notification_requests.title": "Filtered notifications",
@@ -561,6 +583,7 @@
   "notifications.permission_denied_alert": "Desktop notifications can't be enabled, as browser permission has been denied before",
   "notifications.permission_required": "Desktop notifications are unavailable because the required permission has not been granted.",
   "notifications.policy.accept": "Accept",
+  "notifications.policy.accept_hint": "Show in notifications",
   "notifications.policy.drop": "Ignore",
   "notifications.policy.drop_hint": "Send to the void, never to be seen again",
   "notifications.policy.filter": "Filter",
@@ -762,8 +785,6 @@
   "status.favourite": "Favourite",
   "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filter this post",
-  "status.filtered": "Filtered",
-  "status.hide": "Hide post",
   "status.history.created": "{name} created {date}",
   "status.history.edited": "{name} edited {date}",
   "status.load_more": "Load more",
@@ -791,10 +812,7 @@
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
   "status.share": "Share",
-  "status.show_filter_reason": "Show anyway",
-  "status.show_less": "Show less",
   "status.show_less_all": "Show less for all",
-  "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
   "status.show_original": "Show original",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {{attachmentCount} attachments}}",
@@ -813,11 +831,6 @@
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
   "time_remaining.moments": "Moments remaining",
   "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
-  "timeline_hint.remote_resource_not_displayed": "{resource} from other servers are not displayed.",
-  "timeline_hint.resources.followers": "Followers",
-  "timeline_hint.resources.follows": "Follows",
-  "timeline_hint.resources.replies": "Some replies",
-  "timeline_hint.resources.statuses": "Older posts",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trending now",
   "ui.beforeunload": "Your draft will be lost if you leave Mastodon.",

app/javascript/mastodon/locales/en.json

@@ -286,6 +286,8 @@
   "confirmations.unfollow.confirm": "Unfollow",
   "confirmations.unfollow.message": "Are you sure you want to unfollow {name}?",
   "confirmations.unfollow.title": "Unfollow user?",
+  "content_warning.hide": "Hide post",
+  "content_warning.show": "Show anyway",
   "conversation.delete": "Delete conversation",
   "conversation.mark_as_read": "Mark as read",
   "conversation.open": "View conversation",
@@ -402,6 +404,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 “{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",
@@ -953,8 +956,6 @@
   "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.featured_tags.add": "Add your featured tag",
   "status.filter": "Filter this post",
-  "status.filtered": "Filtered",
-  "status.hide": "Hide post",
   "status.history.created": "{name} created {date}",
   "status.history.edited": "{name} edited {date}",
   "status.load_more": "Load more",
@@ -988,10 +989,7 @@
   "status.report": "Report @{name}",
   "status.sensitive_warning": "Sensitive content",
   "status.share": "Share",
-  "status.show_filter_reason": "Show anyway",
-  "status.show_less": "Show less",
   "status.show_less_all": "Show less for all",
-  "status.show_more": "Show more",
   "status.show_more_all": "Show more for all",
   "status.show_original": "Show original",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {{attachmentCount} attachments}}",

app/javascript/mastodon/locales/eo.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Bloki la domajnon {domain}",
   "account.block_short": "Bloko",
   "account.blocked": "Blokita",
-  "account.browse_more_on_origin_server": "Foliumi pli ĉe la originala profilo",
   "account.cancel_follow_request": "Nuligi peton por sekvado",
   "account.copy": "Kopii ligilon al profilo",
   "account.direct": "Private mencii @{name}",
@@ -89,9 +88,14 @@
   "announcement.announcement": "Anoncoj",
   "attachments_list.unprocessed": "(neprilaborita)",
   "audio.hide": "Kaŝi aŭdion",
+  "block_modal.remote_users_caveat": "Ni petos al la servilo {domain} respekti vian elekton. Tamen, plenumo ne estas garantiita ĉar iuj serviloj eble manipulas blokojn malsame. Publikaj afiŝoj eble ankoraŭ estas videbla por ne-ensalutintaj uzantoj.",
   "block_modal.show_less": "Montri malpli",
   "block_modal.show_more": "Montri pli",
+  "block_modal.they_cant_mention": "Ili ne povas mencii aŭ sekvi vin.",
+  "block_modal.they_cant_see_posts": "Ili ne povas vidi viajn afiŝojn kaj vi ne povas vidi iliajn.",
+  "block_modal.they_will_know": "Ili povas vidi, ke ili estas blokita.",
   "block_modal.title": "Ĉu bloki uzanton?",
+  "block_modal.you_wont_see_mentions": "Vi ne vidos afiŝojn, ke mencii ilin.",
   "boost_modal.combo": "Vi povas premi {combo} por preterpasi sekvafoje",
   "bundle_column_error.copy_stacktrace": "Kopii la eraran raporton",
   "bundle_column_error.error.body": "La petita paĝo ne povas redonitis. Eble estas eraro.",
@@ -149,29 +153,39 @@
   "compose_form.lock_disclaimer.lock": "ŝlosita",
   "compose_form.placeholder": "Kion vi pensas?",
   "compose_form.poll.duration": "Daŭro de la balotenketo",
+  "compose_form.poll.multiple": "Multobla elekto",
+  "compose_form.poll.option_placeholder": "Opcio {number}",
+  "compose_form.poll.single": "Elektu unu",
   "compose_form.poll.switch_to_multiple": "Ŝanĝi la balotenketon por permesi multajn elektojn",
   "compose_form.poll.switch_to_single": "Ŝanĝi la balotenketon por permesi unu solan elekton",
+  "compose_form.poll.type": "Stilo",
   "compose_form.publish": "Afiŝo",
   "compose_form.publish_form": "Afiŝi",
   "compose_form.reply": "Respondi",
   "compose_form.save_changes": "Ĝisdatigi",
   "compose_form.spoiler.marked": "Forigi la averton de enhavo",
   "compose_form.spoiler.unmarked": "Aldoni averton de enhavo",
+  "compose_form.spoiler_placeholder": "Enhava Averto (nedeviga)",
   "confirmation_modal.cancel": "Nuligi",
   "confirmations.block.confirm": "Bloki",
   "confirmations.delete.confirm": "Forigi",
   "confirmations.delete.message": "Ĉu vi certas, ke vi volas forigi ĉi tiun afiŝon?",
+  "confirmations.delete.title": "Ĉu forigi Afiŝon?",
   "confirmations.delete_list.confirm": "Forigi",
   "confirmations.delete_list.message": "Ĉu vi certas, ke vi volas porĉiame forigi ĉi tiun liston?",
+  "confirmations.delete_list.title": "Ĉu forigi liston?",
   "confirmations.discard_edit_media.confirm": "Forĵeti",
   "confirmations.discard_edit_media.message": "Vi havas nekonservitajn ŝanĝojn de la priskribo aŭ la antaŭmontro de la plurmedio, ĉu vi forĵetu ilin malgraŭe?",
   "confirmations.edit.confirm": "Redakti",
   "confirmations.edit.message": "Redakti nun anstataŭigos la skribatan afiŝon. Ĉu vi certas, ke vi volas daŭrigi?",
+  "confirmations.edit.title": "Ĉu superskribi afiŝon?",
   "confirmations.logout.confirm": "Adiaŭi",
   "confirmations.logout.message": "Ĉu vi certas ke vi volas adiaŭi?",
+  "confirmations.logout.title": "Ĉu elsaluti?",
   "confirmations.mute.confirm": "Silentigi",
   "confirmations.redraft.confirm": "Forigi kaj reskribi",
   "confirmations.redraft.message": "Ĉu vi certas ke vi volas forigi tiun afiŝon kaj reskribi ĝin? Ĉiuj diskonigoj kaj stelumoj estos perditaj, kaj respondoj al la originala mesaĝo estos senparentaj.",
+  "confirmations.redraft.title": "Ĉu forigi kaj redakcii afiŝon?",
   "confirmations.reply.confirm": "Respondi",
   "confirmations.reply.message": "Respondi nun anstataŭigos la skribatan afiŝon. Ĉu vi certas, ke vi volas daŭrigi?",
   "confirmations.unfollow.confirm": "Ne plu sekvi",
@@ -618,8 +632,6 @@
   "status.embed": "Enkorpigi",
   "status.favourite": "Ŝatata",
   "status.filter": "Filtri ĉi tiun afiŝon",
-  "status.filtered": "Filtrita",
-  "status.hide": "Kaŝi mesaĝon",
   "status.history.created": "{name} kreis {date}",
   "status.history.edited": "{name} redaktis {date}",
   "status.load_more": "Ŝargi pli",
@@ -646,10 +658,7 @@
   "status.report": "Raporti @{name}",
   "status.sensitive_warning": "Tikla enhavo",
   "status.share": "Kundividi",
-  "status.show_filter_reason": "Ĉial montri",
-  "status.show_less": "Montri malpli",
   "status.show_less_all": "Montri malpli ĉiun",
-  "status.show_more": "Montri pli",
   "status.show_more_all": "Montri pli ĉiun",
   "status.show_original": "Montru originalon",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
@@ -668,10 +677,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuto} other {# minutoj}} restas",
   "time_remaining.moments": "Momenteto restas",
   "time_remaining.seconds": "{number, plural, one {# sekundo} other {# sekundoj}} restas",
-  "timeline_hint.remote_resource_not_displayed": "{resource} de aliaj serviloj ne estas montrata.",
-  "timeline_hint.resources.followers": "Sekvantoj",
-  "timeline_hint.resources.follows": "Sekvatoj",
-  "timeline_hint.resources.statuses": "Pli malnovaj mesaĝoj",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persono} other {{counter} personoj}} dum la pasinta{days, plural, one { tago} other {j {days} tagoj}}",
   "trends.trending_now": "Nunaj furoraĵoj",
   "ui.beforeunload": "Via malneto perdiĝos se vi eliras de Mastodon.",

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

@@ -19,7 +19,6 @@
   "account.block_domain": "Bloquear dominio {domain}",
   "account.block_short": "Bloquear",
   "account.blocked": "Bloqueado",
-  "account.browse_more_on_origin_server": "Explorar más en el perfil original",
   "account.cancel_follow_request": "Dejar de seguir",
   "account.copy": "Copiar enlace al perfil",
   "account.direct": "Mención privada a @{name}",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "hashtags.and_other": "…y {count, plural, other {# más}}",
+  "hints.profiles.followers_may_be_missing": "Es posible que falten seguidores de este perfil.",
+  "hints.profiles.follows_may_be_missing": "Es posible que falten seguimientos a este perfil.",
+  "hints.profiles.posts_may_be_missing": "Es posible que falten mensajes de este perfil.",
+  "hints.profiles.see_more_followers": "Ver más seguidores en {domain}",
+  "hints.profiles.see_more_follows": "Ver más seguimientos en {domain}",
+  "hints.profiles.see_more_posts": "Ver más mensajes en {domain}",
+  "hints.threads.replies_may_be_missing": "Es posible que falten respuestas de otros servidores.",
+  "hints.threads.see_more": "Ver más respuestas en {domain}",
   "home.column_settings.show_reblogs": "Mostrar adhesiones",
   "home.column_settings.show_replies": "Mostrar respuestas",
   "home.hide_announcements": "Ocultar anuncios",
@@ -456,8 +463,6 @@
   "mute_modal.title": "¿Silenciar usuario?",
   "mute_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
   "mute_modal.you_wont_see_posts": "Todavía pueden ver tus mensajes, pero vos no verás los suyos.",
-  "name_and_others": "{name} y {count, plural, one {# cuenta más} other {# cuentas más}}",
-  "name_and_others_with_link": "{name} y <a>{count, plural, one {# cuenta más} other {# cuentas más}}</a>",
   "navigation_bar.about": "Información",
   "navigation_bar.advanced_interface": "Abrir en interface web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
@@ -490,9 +495,13 @@
   "notification.admin.report_statuses": "{name} denunció a {target} por {category}",
   "notification.admin.report_statuses_other": "{name} denunció a {target}",
   "notification.admin.sign_up": "Se registró {name}",
+  "notification.admin.sign_up.name_and_others": "Se registraron {name} y {count, plural, one {# cuenta más} other {# cuentas más}}",
   "notification.favourite": "{name} marcó tu mensaje como favorito",
+  "notification.favourite.name_and_others_with_link": "{name} y <a>{count, plural, one {# cuenta más} other {# cuentas más}}</a> marcaron tu mensaje como favorito",
   "notification.follow": "{name} te empezó a seguir",
+  "notification.follow.name_and_others": "{name} y {count, plural, one {# cuenta más} other {# cuentas más}} te están siguiendo",
   "notification.follow_request": "{name} solicitó seguirte",
+  "notification.follow_request.name_and_others": "{name} y {count, plural, one {# cuenta más} other {# cuentas más}} solicitaron seguirte",
   "notification.label.mention": "Mención",
   "notification.label.private_mention": "Mención privada",
   "notification.label.private_reply": "Respuesta privada",
@@ -510,6 +519,7 @@
   "notification.own_poll": "Tu encuesta finalizó",
   "notification.poll": "Finalizó una encuesta en la que votaste",
   "notification.reblog": "{name} adhirió a tu mensaje",
+  "notification.reblog.name_and_others_with_link": "{name} y <a>{count, plural, one {# cuenta más} other {# cuentas más}}</a> marcaron tu mensaje como favorito",
   "notification.relationships_severance_event": "Conexiones perdidas con {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrador de {from} suspendió a {target}, lo que significa que ya no podés recibir actualizaciones de esa cuenta o interactuar con la misma.",
   "notification.relationships_severance_event.domain_block": "Un administrador de {from} bloqueó a {target}, incluyendo {followersCount} de tus seguidores y {followingCount, plural, one {# cuenta} other {# cuentas}} que seguís.",
@@ -775,8 +785,6 @@
   "status.favourite": "Marcar como favorito",
   "status.favourites": "{count, plural, one {# voto} other {# votos}}",
   "status.filter": "Filtrar este mensaje",
-  "status.filtered": "Filtrado",
-  "status.hide": "Ocultar mensaje",
   "status.history.created": "Creado por {name}, {date}",
   "status.history.edited": "Editado por {name}, {date}",
   "status.load_more": "Cargar más",
@@ -804,10 +812,7 @@
   "status.report": "Denunciar a @{name}",
   "status.sensitive_warning": "Contenido sensible",
   "status.share": "Compartir",
-  "status.show_filter_reason": "Mostrar de todos modos",
-  "status.show_less": "Mostrar menos",
   "status.show_less_all": "Mostrar menos para todo",
-  "status.show_more": "Mostrar más",
   "status.show_more_all": "Mostrar más para todo",
   "status.show_original": "Mostrar original",
   "status.title.with_attachments": "{user} envió {attachmentCount, plural, one {un adjunto} other {{attachmentCount} adjuntos}}",
@@ -826,11 +831,6 @@
   "time_remaining.minutes": "{number, plural,one {queda # minuto} other {quedan # minutos}}",
   "time_remaining.moments": "Momentos restantes",
   "time_remaining.seconds": "{number, plural,one {queda # segundo} other {quedan # segundos}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} desde otros servidores no se muestran.",
-  "timeline_hint.resources.followers": "Tus seguidores",
-  "timeline_hint.resources.follows": "Las cuentas que seguís",
-  "timeline_hint.resources.replies": "Algunas respuestas",
-  "timeline_hint.resources.statuses": "Mensajes más antiguos",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} en {days, plural, one {el pasado día} other {los pasados {days} días}}",
   "trends.trending_now": "Tendencia ahora",
   "ui.beforeunload": "Tu borrador se perderá si abandonás Mastodon.",

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

@@ -19,7 +19,6 @@
   "account.block_domain": "Bloquear dominio {domain}",
   "account.block_short": "Bloquear",
   "account.blocked": "Bloqueado",
-  "account.browse_more_on_origin_server": "Ver más en el perfil original",
   "account.cancel_follow_request": "Retirar solicitud de seguimiento",
   "account.copy": "Copiar enlace al perfil",
   "account.direct": "Mención privada @{name}",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "hashtags.and_other": "…y {count, plural, other {# más}}",
+  "hints.profiles.followers_may_be_missing": "Puede que no se muestren todos los seguidores de este perfil.",
+  "hints.profiles.follows_may_be_missing": "Puede que no se muestren todas las cuentas seguidas por este perfil.",
+  "hints.profiles.posts_may_be_missing": "Puede que no se muestren todas las publicaciones de este perfil.",
+  "hints.profiles.see_more_followers": "Ver más seguidores en {domain}",
+  "hints.profiles.see_more_follows": "Ver más perfiles seguidos en {domain}",
+  "hints.profiles.see_more_posts": "Ver más publicaciones en {domain}",
+  "hints.threads.replies_may_be_missing": "Puede que no se muestren algunas respuestas de otros servidores.",
+  "hints.threads.see_more": "Ver más respuestas en {domain}",
   "home.column_settings.show_reblogs": "Mostrar retoots",
   "home.column_settings.show_replies": "Mostrar respuestas",
   "home.hide_announcements": "Ocultar anuncios",
@@ -456,8 +463,6 @@
   "mute_modal.title": "¿Silenciar usuario?",
   "mute_modal.you_wont_see_mentions": "No verás publicaciones que los mencionen.",
   "mute_modal.you_wont_see_posts": "Todavía pueden ver tus publicaciones, pero tú no verás las de ellos.",
-  "name_and_others": "{name} y {count, plural, one {# más} other {# más}}",
-  "name_and_others_with_link": "{name} y <a>{count, plural, one {# más} other {# más}}</a>",
   "navigation_bar.about": "Acerca de",
   "navigation_bar.advanced_interface": "Abrir en interfaz web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
@@ -490,9 +495,13 @@
   "notification.admin.report_statuses": "{name} informó de {target} por {category}",
   "notification.admin.report_statuses_other": "{name} informó de {target}",
   "notification.admin.sign_up": "{name} se unio",
+  "notification.admin.sign_up.name_and_others": "{name} y {count, plural, one {# más} other {# más}} se registraron",
   "notification.favourite": "{name} marcó como favorita tu publicación",
+  "notification.favourite.name_and_others_with_link": "{name} y <a>{count, plural, one {# más} other {# más}}</a> marcaron tu publicación como favorita",
   "notification.follow": "{name} te empezó a seguir",
+  "notification.follow.name_and_others": "{name} y {count, plural, one {# más} other {# más}} te siguieron",
   "notification.follow_request": "{name} ha solicitado seguirte",
+  "notification.follow_request.name_and_others": "{name} y {count, plural, one {# más} other {# más}} han solicitado seguirte",
   "notification.label.mention": "Mención",
   "notification.label.private_mention": "Mención privada",
   "notification.label.private_reply": "Respuesta privada",
@@ -510,6 +519,7 @@
   "notification.own_poll": "Tu encuesta ha terminado",
   "notification.poll": "Una encuesta ha terminado",
   "notification.reblog": "{name} ha retooteado tu estado",
+  "notification.reblog.name_and_others_with_link": "{name} y <a>{count, plural, one {# más} other {# más}}</a> impulsaron tu publicación",
   "notification.relationships_severance_event": "Conexiones perdidas con {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspendido {target}, lo que significa que ya no puedes recibir actualizaciones de sus cuentas o interactuar con ellas.",
   "notification.relationships_severance_event.domain_block": "Un administrador de {from} ha bloqueado {target}, incluyendo {followersCount} de tus seguidores y {followingCount, plural, one {# cuenta} other {# cuentas}} que sigues.",
@@ -520,7 +530,15 @@
   "notification_requests.accept": "Aceptar",
   "notification_requests.accept_multiple": "{count, plural, one {Aceptar # solicitud…} other {Aceptar # solicitudes…}}",
   "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Aceptar solicitud} other {Aceptar solicitudes}}",
+  "notification_requests.confirm_accept_multiple.message": "Vas a aceptar {count, plural, one {una solicitud} other {# solicitudes}}. ¿Quieres continuar?",
+  "notification_requests.confirm_accept_multiple.title": "¿Aceptar las solicitudes?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Descartar solicitud} other {Descartar solicitudes}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Vas a descartar {count, plural, one {una solicitud} other {# solicitudes}}. No podrás volver a acceder fácilmente a {count, plural, one {ella} other {ellas}} de nuevo. ¿Seguro que quieres continuar?",
+  "notification_requests.confirm_dismiss_multiple.title": "¿Descartar las solicitudes?",
   "notification_requests.dismiss": "Descartar",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Descartar # solicitud…} other {Descartar # solicitudes…}}",
+  "notification_requests.edit_selection": "Editar",
+  "notification_requests.exit_selection": "Hecho",
   "notification_requests.explainer_for_limited_account": "Las notificaciones de esta cuenta han sido filtradas porque la cuenta ha sido limitada por un moderador.",
   "notification_requests.explainer_for_limited_remote_account": "Las notificaciones de esta cuenta han sido filtradas porque la cuenta o su servidor ha sido limitada por un moderador.",
   "notification_requests.maximize": "Maximizar",
@@ -767,8 +785,6 @@
   "status.favourite": "Favorito",
   "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
   "status.filter": "Filtrar esta publicación",
-  "status.filtered": "Filtrado",
-  "status.hide": "Ocultar toot",
   "status.history.created": "{name} creó {date}",
   "status.history.edited": "{name} editado {date}",
   "status.load_more": "Cargar más",
@@ -796,10 +812,7 @@
   "status.report": "Reportar",
   "status.sensitive_warning": "Contenido sensible",
   "status.share": "Compartir",
-  "status.show_filter_reason": "Mostrar de todos modos",
-  "status.show_less": "Mostrar menos",
   "status.show_less_all": "Mostrar menos para todo",
-  "status.show_more": "Mostrar más",
   "status.show_more_all": "Mostrar más para todo",
   "status.show_original": "Mostrar original",
   "status.title.with_attachments": "{user} ha publicado {attachmentCount, plural, one {un adjunto} other {{attachmentCount} adjuntos}}",
@@ -818,11 +831,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuto restante} other {# minutos restantes}}",
   "time_remaining.moments": "Momentos restantes",
   "time_remaining.seconds": "{number, plural, one {# segundo restante} other {# segundos restantes}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} de otros servidores no se muestran.",
-  "timeline_hint.resources.followers": "Seguidores",
-  "timeline_hint.resources.follows": "Seguidos",
-  "timeline_hint.resources.replies": "Algunas respuestas",
-  "timeline_hint.resources.statuses": "Toots más antiguos",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} en los últimos {days, plural, one {días} other {{days} días}}",
   "trends.trending_now": "Tendencia ahora",
   "ui.beforeunload": "Tu borrador se perderá si sales de Mastodon.",

app/javascript/mastodon/locales/es.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Bloquear dominio {domain}",
   "account.block_short": "Bloquear",
   "account.blocked": "Bloqueado",
-  "account.browse_more_on_origin_server": "Ver más en el perfil original",
   "account.cancel_follow_request": "Retirar solicitud de seguimiento",
   "account.copy": "Copiar enlace al perfil",
   "account.direct": "Mención privada a @{name}",
@@ -349,6 +348,14 @@
   "hashtag.follow": "Seguir etiqueta",
   "hashtag.unfollow": "Dejar de seguir etiqueta",
   "hashtags.and_other": "…y {count, plural, other {# más}}",
+  "hints.profiles.followers_may_be_missing": "Puede que no se muestren todos los seguidores de este perfil.",
+  "hints.profiles.follows_may_be_missing": "Puede que no se muestren todas las cuentas seguidas por este perfil.",
+  "hints.profiles.posts_may_be_missing": "Puede que no se muestren todas las publicaciones de este perfil.",
+  "hints.profiles.see_more_followers": "Ver más seguidores en {domain}",
+  "hints.profiles.see_more_follows": "Ver más perfiles seguidos en {domain}",
+  "hints.profiles.see_more_posts": "Ver más publicaciones en {domain}",
+  "hints.threads.replies_may_be_missing": "Puede que no se muestren algunas respuestas de otros servidores.",
+  "hints.threads.see_more": "Ver más respuestas en {domain}",
   "home.column_settings.show_reblogs": "Mostrar impulsos",
   "home.column_settings.show_replies": "Mostrar respuestas",
   "home.hide_announcements": "Ocultar anuncios",
@@ -456,8 +463,6 @@
   "mute_modal.title": "¿Silenciar usuario?",
   "mute_modal.you_wont_see_mentions": "No verás mensajes que los mencionen.",
   "mute_modal.you_wont_see_posts": "Todavía pueden ver tus publicaciones, pero tú no verás las suyas.",
-  "name_and_others": "{name} y {count, plural, one {# más} other {# más}}",
-  "name_and_others_with_link": "{name} y <a>{count, plural, one {# más} other {# más}}</a>",
   "navigation_bar.about": "Acerca de",
   "navigation_bar.advanced_interface": "Abrir en la interfaz web avanzada",
   "navigation_bar.blocks": "Usuarios bloqueados",
@@ -490,9 +495,13 @@
   "notification.admin.report_statuses": "{name} informó de {target} por {category}",
   "notification.admin.report_statuses_other": "{name} informó de {target}",
   "notification.admin.sign_up": "{name} se registró",
+  "notification.admin.sign_up.name_and_others": "{name} y {count, plural, one {# más} other {# más}} se registraron",
   "notification.favourite": "{name} marcó como favorita tu publicación",
+  "notification.favourite.name_and_others_with_link": "{name} y <a>{count, plural, one {# más} other {# más}}</a> marcaron tu publicación como favorita",
   "notification.follow": "{name} te empezó a seguir",
+  "notification.follow.name_and_others": "{name} y {count, plural, one {# más} other {# más}} te siguieron",
   "notification.follow_request": "{name} ha solicitado seguirte",
+  "notification.follow_request.name_and_others": "{name} y {count, plural, one {# más} other {# más}} han solicitado seguirte",
   "notification.label.mention": "Mención",
   "notification.label.private_mention": "Mención privada",
   "notification.label.private_reply": "Respuesta privada",
@@ -510,6 +519,7 @@
   "notification.own_poll": "Tu encuesta ha terminado",
   "notification.poll": "Una encuesta ha terminado",
   "notification.reblog": "{name} ha impulsado tu publicación",
+  "notification.reblog.name_and_others_with_link": "{name} y <a>{count, plural, one {# más} other {# más}}</a> impulsaron tu publicación",
   "notification.relationships_severance_event": "Conexiones perdidas con {name}",
   "notification.relationships_severance_event.account_suspension": "Un administrador de {from} ha suspendido {target}, lo que significa que ya no puedes recibir actualizaciones de sus cuentas o interactuar con ellas.",
   "notification.relationships_severance_event.domain_block": "Un administrador de {from} ha bloqueado {target}, incluyendo {followersCount} de tus seguidores y {followingCount, plural, one {# cuenta} other {# cuentas}} que sigues.",
@@ -520,7 +530,15 @@
   "notification_requests.accept": "Aceptar",
   "notification_requests.accept_multiple": "{count, plural, one {Aceptar # solicitud…} other {Aceptar # solicitudes…}}",
   "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Aceptar solicitud} other {Aceptar solicitudes}}",
+  "notification_requests.confirm_accept_multiple.message": "Vas a aceptar {count, plural, one {una solicitud} other {# solicitudes}}. ¿Quieres continuar?",
+  "notification_requests.confirm_accept_multiple.title": "¿Aceptar las solicitudes?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Descartar solicitud} other {Descartar solicitudes}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Vas a descartar {count, plural, one {una solicitud} other {# solicitudes}}. No podrás volver a acceder fácilmente a {count, plural, one {ella} other {ellas}} de nuevo. ¿Seguro que quieres continuar?",
+  "notification_requests.confirm_dismiss_multiple.title": "¿Descartar las solicitudes?",
   "notification_requests.dismiss": "Descartar",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Descartar # solicitud…} other {Descartar # solicitudes…}}",
+  "notification_requests.edit_selection": "Editar",
+  "notification_requests.exit_selection": "Hecho",
   "notification_requests.explainer_for_limited_account": "Las notificaciones de esta cuenta han sido filtradas porque la cuenta ha sido limitada por un moderador.",
   "notification_requests.explainer_for_limited_remote_account": "Las notificaciones de esta cuenta han sido filtradas porque la cuenta o su servidor ha sido limitada por un moderador.",
   "notification_requests.maximize": "Maximizar",
@@ -767,8 +785,6 @@
   "status.favourite": "Favorito",
   "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
   "status.filter": "Filtrar esta publicación",
-  "status.filtered": "Filtrado",
-  "status.hide": "Ocultar publicación",
   "status.history.created": "{name} creó {date}",
   "status.history.edited": "{name} editó {date}",
   "status.load_more": "Cargar más",
@@ -796,10 +812,7 @@
   "status.report": "Reportar",
   "status.sensitive_warning": "Contenido sensible",
   "status.share": "Compartir",
-  "status.show_filter_reason": "Mostrar de todos modos",
-  "status.show_less": "Mostrar menos",
   "status.show_less_all": "Mostrar menos para todo",
-  "status.show_more": "Mostrar más",
   "status.show_more_all": "Mostrar más para todo",
   "status.show_original": "Mostrar original",
   "status.title.with_attachments": "{user} ha publicado {attachmentCount, plural, one {un adjunto} other {{attachmentCount} adjuntos}}",
@@ -818,11 +831,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuto restante} other {# minutos restantes}}",
   "time_remaining.moments": "Momentos restantes",
   "time_remaining.seconds": "{number, plural, one {# segundo restante} other {# segundos restantes}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} de otros servidores no se muestran.",
-  "timeline_hint.resources.followers": "Seguidores",
-  "timeline_hint.resources.follows": "Seguidos",
-  "timeline_hint.resources.replies": "Algunas respuestas",
-  "timeline_hint.resources.statuses": "Publicaciones más antiguas",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} en los últimos {days, plural, one {días} other {{days} días}}",
   "trends.trending_now": "Tendencia ahora",
   "ui.beforeunload": "Tu borrador se perderá si sales de Mastodon.",

app/javascript/mastodon/locales/et.json

@@ -18,7 +18,6 @@
   "account.block_domain": "Peida kõik domeenist {domain}",
   "account.block_short": "Blokeerimine",
   "account.blocked": "Blokeeritud",
-  "account.browse_more_on_origin_server": "Vaata rohkem algsel profiilil",
   "account.cancel_follow_request": "Võta jälgimistaotlus tagasi",
   "account.copy": "Kopeeri profiili link",
   "account.direct": "Maini privaatselt @{name}",
@@ -709,8 +708,6 @@
   "status.favourite": "Lemmik",
   "status.favourites": "{count, plural, one {lemmik} other {lemmikud}}",
   "status.filter": "Filtreeri seda postitust",
-  "status.filtered": "Filtreeritud",
-  "status.hide": "Peida postitus",
   "status.history.created": "{name} lõi {date}",
   "status.history.edited": "{name} muutis {date}",
   "status.load_more": "Lae rohkem",
@@ -738,10 +735,7 @@
   "status.report": "Raporteeri @{name}",
   "status.sensitive_warning": "Tundlik sisu",
   "status.share": "Jaga",
-  "status.show_filter_reason": "Näita ikka",
-  "status.show_less": "Peida sisu",
   "status.show_less_all": "Peida kogu tundlik sisu",
-  "status.show_more": "Näita sisu",
   "status.show_more_all": "Näita kogu tundlikku sisu",
   "status.show_original": "Näita algset",
   "status.title.with_attachments": "{user} postitas {attachmentCount, plural, one {manuse} other {{attachmentCount} manust}}",
@@ -760,10 +754,6 @@
   "time_remaining.minutes": "{number, plural, one {# minut} other {# minutit}} jäänud",
   "time_remaining.moments": "Hetked jäänud",
   "time_remaining.seconds": "{number, plural, one {# sekund} other {# sekundit}} jäänud",
-  "timeline_hint.remote_resource_not_displayed": "{resource} teistest serveritest ei kuvata.",
-  "timeline_hint.resources.followers": "Jälgijaid",
-  "timeline_hint.resources.follows": "Jälgimisi",
-  "timeline_hint.resources.statuses": "Eelnevaid postitusi",
   "trends.counter_by_accounts": "{count, plural, one {{counter} inimene} other {{counter} inimest}} viimase {days, plural, one {päeva} other {{days} päeva}} jooksul",
   "trends.trending_now": "Hetkel populaarne",
   "ui.beforeunload": "Mustand läheb kaotsi, kui lahkud Mastodonist.",

app/javascript/mastodon/locales/eu.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Blokeatu {domain} domeinua",
   "account.block_short": "Blokeatu",
   "account.blocked": "Blokeatuta",
-  "account.browse_more_on_origin_server": "Arakatu gehiago jatorrizko profilean",
   "account.cancel_follow_request": "Baztertu jarraitzeko eskaera",
   "account.copy": "Kopiatu profilerako esteka",
   "account.direct": "Aipatu pribatuki @{name}",
@@ -744,8 +743,6 @@
   "status.favourite": "Gogokoa",
   "status.favourites": "{count, plural, one {gogoko} other {gogoko}}",
   "status.filter": "Iragazi bidalketa hau",
-  "status.filtered": "Iragazita",
-  "status.hide": "Tuta ezkutatu",
   "status.history.created": "{name} erabiltzaileak sortua {date}",
   "status.history.edited": "{name} erabiltzaileak editatua {date}",
   "status.load_more": "Kargatu gehiago",
@@ -773,10 +770,7 @@
   "status.report": "Salatu @{name}",
   "status.sensitive_warning": "Kontuz: Eduki hunkigarria",
   "status.share": "Partekatu",
-  "status.show_filter_reason": "Erakutsi hala ere",
-  "status.show_less": "Erakutsi gutxiago",
   "status.show_less_all": "Erakutsi denetarik gutxiago",
-  "status.show_more": "Erakutsi gehiago",
   "status.show_more_all": "Erakutsi denetarik gehiago",
   "status.show_original": "Erakutsi jatorrizkoa",
   "status.title.with_attachments": "{user} erabiltzaileak {attachmentCount, plural, one {eranskin bat} other {{attachmentCount} eranskin}} argitaratu d(it)u",
@@ -795,11 +789,6 @@
   "time_remaining.minutes": "{number, plural, one {minutu #} other {# minutu}} amaitzeko",
   "time_remaining.moments": "Amaitzekotan",
   "time_remaining.seconds": "{number, plural, one {segundo #} other {# segundo}} amaitzeko",
-  "timeline_hint.remote_resource_not_displayed": "Beste zerbitzarietako {resource} ez da bistaratzen.",
-  "timeline_hint.resources.followers": "Jarraitzaileak",
-  "timeline_hint.resources.follows": "Jarraitzen",
-  "timeline_hint.resources.replies": "Erantzun batzuk",
-  "timeline_hint.resources.statuses": "Bidalketa zaharragoak",
   "trends.counter_by_accounts": "{count, plural, one {Pertsona {counter}} other {{counter} pertsona}} azken {days, plural, one {egunean} other {{days} egunetan}}",
   "trends.trending_now": "Joera orain",
   "ui.beforeunload": "Zure zirriborroa galduko da Mastodon uzten baduzu.",

app/javascript/mastodon/locales/fa.json

@@ -18,7 +18,6 @@
   "account.block_domain": "انسداد دامنهٔ {domain}",
   "account.block_short": "انسداد",
   "account.blocked": "مسدود",
-  "account.browse_more_on_origin_server": "مرور بیش‌تر روی نمایهٔ اصلی",
   "account.cancel_follow_request": "رد کردن درخواست پی‌گیری",
   "account.copy": "رونوشت از پیوند به نمایه",
   "account.direct": "اشارهٔ خصوصی به ‪@{name}‬",
@@ -658,8 +657,6 @@
   "status.embed": "جاسازی",
   "status.favourite": "برگزیده‌",
   "status.filter": "پالایش این فرسته",
-  "status.filtered": "پالوده",
-  "status.hide": "نهفتن فرسته",
   "status.history.created": "توسط {name} در {date} ایجاد شد",
   "status.history.edited": "توسط {name} در {date} ویرایش شد",
   "status.load_more": "بار کردن بیش‌تر",
@@ -686,10 +683,7 @@
   "status.report": "گزارش ‎@{name}",
   "status.sensitive_warning": "محتوای حساس",
   "status.share": "هم‌رسانی",
-  "status.show_filter_reason": "به هر روی نشان داده شود",
-  "status.show_less": "نمایش کمتر",
   "status.show_less_all": "نمایش کمتر همه",
-  "status.show_more": "نمایش بیشتر",
   "status.show_more_all": "نمایش بیشتر همه",
   "status.show_original": "نمایش اصلی",
   "status.title.with_attachments": "{user} {attachmentCount, plural, one {یک پیوست} other {{attachmentCount} پیوست}} فرستاد",
@@ -708,10 +702,6 @@
   "time_remaining.minutes": "{number, plural, one {# دقیقه} other {# دقیقه}} باقی مانده",
   "time_remaining.moments": "زمان باقی‌مانده",
   "time_remaining.seconds": "{number, plural, one {# ثانیه} other {# ثانیه}} باقی مانده",
-  "timeline_hint.remote_resource_not_displayed": "{resource} از دیگر کارسازها نمایش داده نمی‌شوند.",
-  "timeline_hint.resources.followers": "پی‌گیرندگان",
-  "timeline_hint.resources.follows": "پی‌گرفتگان",
-  "timeline_hint.resources.statuses": "فرسته‌های قدیمی‌تر",
   "trends.counter_by_accounts": "{count, plural, one {{counter} نفر} other {{counter} نفر}} در {days, plural, one {روز} other {{days} روز}} گذشته",
   "trends.trending_now": "پرطرفدار",
   "ui.beforeunload": "اگر از ماستودون خارج شوید پیش‌نویس شما از دست خواهد رفت.",

app/javascript/mastodon/locales/fi.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Estä verkkotunnus {domain}",
   "account.block_short": "Estä",
   "account.blocked": "Estetty",
-  "account.browse_more_on_origin_server": "Selaa lisää alkuperäisessä profiilissa",
   "account.cancel_follow_request": "Peruuta seurantapyyntö",
   "account.copy": "Kopioi linkki profiiliin",
   "account.direct": "Mainitse @{name} yksityisesti",
@@ -193,6 +192,8 @@
   "confirmations.unfollow.confirm": "Lopeta seuraaminen",
   "confirmations.unfollow.message": "Haluatko varmasti lopettaa profiilin {name} seuraamisen?",
   "confirmations.unfollow.title": "Lopetetaanko käyttäjän seuraaminen?",
+  "content_warning.hide": "Piilota julkaisu",
+  "content_warning.show": "Näytä kuitenkin",
   "conversation.delete": "Poista keskustelu",
   "conversation.mark_as_read": "Merkitse luetuksi",
   "conversation.open": "Näytä keskustelu",
@@ -300,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Käytä olemassa olevaa luokkaa tai luo uusi",
   "filter_modal.select_filter.title": "Suodata tämä julkaisu",
   "filter_modal.title.status": "Suodata julkaisu",
+  "filter_warning.matches_filter": "Vastaa suodatinta ”{title}”",
   "filtered_notifications_banner.pending_requests": "{count, plural, =0 {Ei keneltäkään, jonka} one {1 käyttäjältä, jonka} other {# käyttäjältä, jotka}} saatat tuntea",
   "filtered_notifications_banner.title": "Suodatetut ilmoitukset",
   "firehose.all": "Kaikki",
@@ -349,6 +351,14 @@
   "hashtag.follow": "Seuraa aihetunnistetta",
   "hashtag.unfollow": "Lopeta aihetunnisteen seuraaminen",
   "hashtags.and_other": "…ja {count, plural, other {# lisää}}",
+  "hints.profiles.followers_may_be_missing": "Tämän profiilin seuraajia saattaa puuttua.",
+  "hints.profiles.follows_may_be_missing": "Tämän profiilin seurattuja saattaa puuttua.",
+  "hints.profiles.posts_may_be_missing": "Tämän profiilin julkaisuja saattaa puuttua.",
+  "hints.profiles.see_more_followers": "Näytä lisää seuraajia palvelimella {domain}",
+  "hints.profiles.see_more_follows": "Näytä lisää seurattuja palvelimella {domain}",
+  "hints.profiles.see_more_posts": "Näytä lisää julkaisuja palvelimella {domain}",
+  "hints.threads.replies_may_be_missing": "Muiden palvelinten vastauksia saattaa puuttua.",
+  "hints.threads.see_more": "Näytä lisää vastauksia palvelimella {domain}",
   "home.column_settings.show_reblogs": "Näytä tehostukset",
   "home.column_settings.show_replies": "Näytä vastaukset",
   "home.hide_announcements": "Piilota tiedotteet",
@@ -456,8 +466,6 @@
   "mute_modal.title": "Mykistetäänkö käyttäjä?",
   "mute_modal.you_wont_see_mentions": "Et näe enää julkaisuja, joissa hänet mainitaan.",
   "mute_modal.you_wont_see_posts": "Hän voi yhä nähdä julkaisusi, mutta sinä et näe hänen.",
-  "name_and_others": "{name} ja {count, plural, one {# muu} other {# muuta}}",
-  "name_and_others_with_link": "{name} ja <a>{count, plural, one {# muu} other {# muuta}}</a>",
   "navigation_bar.about": "Tietoja",
   "navigation_bar.advanced_interface": "Avaa edistyneessä selainkäyttöliittymässä",
   "navigation_bar.blocks": "Estetyt käyttäjät",
@@ -490,9 +498,13 @@
   "notification.admin.report_statuses": "{name} raportoi käyttäjän {target}, syynä {category}",
   "notification.admin.report_statuses_other": "{name} raportoi käyttäjän {target}",
   "notification.admin.sign_up": "{name} rekisteröityi",
+  "notification.admin.sign_up.name_and_others": "{name} ja {count, plural, one {# muu} other {# muuta}} rekisteröityivät",
   "notification.favourite": "{name} lisäsi julkaisusi suosikkeihinsa",
+  "notification.favourite.name_and_others_with_link": "{name} ja <a>{count, plural, one {# muu} other {# muuta}}</a> lisäsivät julkaisusi suosikkeihinsa",
   "notification.follow": "{name} seurasi sinua",
+  "notification.follow.name_and_others": "{name} ja {count, plural, one {# muu} other {# muuta}} seurasivat sinua",
   "notification.follow_request": "{name} on pyytänyt lupaa seurata sinua",
+  "notification.follow_request.name_and_others": "{name} ja {count, plural, one {# muu} other {# muuta}} pyysivät saada seurata sinua",
   "notification.label.mention": "Maininta",
   "notification.label.private_mention": "Yksityismaininta",
   "notification.label.private_reply": "Yksityinen vastaus",
@@ -510,6 +522,7 @@
   "notification.own_poll": "Äänestyksesi on päättynyt",
   "notification.poll": "Äänestys, johon osallistuit, on päättynyt",
   "notification.reblog": "{name} tehosti julkaisuasi",
+  "notification.reblog.name_and_others_with_link": "{name} ja <a>{count, plural, one {# muu} other {# muuta}}</a> tehostivat julkaisuasi",
   "notification.relationships_severance_event": "Menetettiin yhteydet palvelimeen {name}",
   "notification.relationships_severance_event.account_suspension": "Palvelimen {from} ylläpitäjä on jäädyttänyt palvelimen {target} vuorovaikutuksen. Enää et voi siis vastaanottaa päivityksiä heiltä tai olla yhteyksissä heidän kanssaan.",
   "notification.relationships_severance_event.domain_block": "Palvelimen {from} ylläpitäjä on estänyt palvelimen {target} vuorovaikutuksen – mukaan lukien {followersCount} seuraajistasi ja {followingCount, plural, one {# seuratuistasi} other {# seuratuistasi}}.",
@@ -775,8 +788,6 @@
   "status.favourite": "Suosikki",
   "status.favourites": "{count, plural, one {suosikki} other {suosikkia}}",
   "status.filter": "Suodata tämä julkaisu",
-  "status.filtered": "Suodatettu",
-  "status.hide": "Piilota julkaisu",
   "status.history.created": "{name} loi {date}",
   "status.history.edited": "{name} muokkasi {date}",
   "status.load_more": "Lataa lisää",
@@ -804,10 +815,7 @@
   "status.report": "Raportoi @{name}",
   "status.sensitive_warning": "Arkaluonteista sisältöä",
   "status.share": "Jaa",
-  "status.show_filter_reason": "Näytä joka tapauksessa",
-  "status.show_less": "Näytä vähemmän",
   "status.show_less_all": "Näytä kaikista vähemmän",
-  "status.show_more": "Näytä enemmän",
   "status.show_more_all": "Näytä kaikista enemmän",
   "status.show_original": "Näytä alkuperäinen",
   "status.title.with_attachments": "{user} liitti {attachmentCount, plural, one {{attachmentCount} tiedoston} other {{attachmentCount} tiedostoa}}",
@@ -826,11 +834,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuutti} other {# minuuttia}} jäljellä",
   "time_remaining.moments": "Hetkiä jäljellä",
   "time_remaining.seconds": "{number, plural, one {# sekunti} other {# sekuntia}} jäljellä",
-  "timeline_hint.remote_resource_not_displayed": "Muiden palvelinten {resource} eivät näy tässä.",
-  "timeline_hint.resources.followers": "seuraajat",
-  "timeline_hint.resources.follows": "seuratut",
-  "timeline_hint.resources.replies": "kaikki vastaukset",
-  "timeline_hint.resources.statuses": "vanhemmat julkaisut",
   "trends.counter_by_accounts": "{count, plural, one {{counter} käyttäjä} other {{counter} käyttäjää}} {days, plural, one {viime päivänä} other {viimeisenä {days} päivänä}}",
   "trends.trending_now": "Suosittua nyt",
   "ui.beforeunload": "Luonnos häviää, jos poistut Mastodonista.",

app/javascript/mastodon/locales/fil.json

@@ -13,7 +13,6 @@
   "account.block_domain": "Hadlangan ang domain na {domain}",
   "account.block_short": "Hadlangan",
   "account.blocked": "Hinadlangan",
-  "account.browse_more_on_origin_server": "Tingnan pa sa pangunahing profile",
   "account.cancel_follow_request": "I-kansela ang pagsunod",
   "account.copy": "I-sipi ang kawing sa profile",
   "account.direct": "Palihim banggitin si @{name}",
@@ -329,9 +328,7 @@
   "status.report": "I-ulat si/ang @{name}",
   "status.sensitive_warning": "Sensitibong nilalaman",
   "status.share": "Ibahagi",
-  "status.show_less": "Magpakita ng mas kaunti",
   "status.show_less_all": "Magpakita ng mas kaunti para sa lahat",
-  "status.show_more": "Magpakita ng higit pa",
   "status.show_more_all": "Magpakita ng higit pa para sa lahat",
   "status.translate": "Isalin",
   "status.translated_from_with": "Isalin mula sa {lang} gamit ang {provider}",
@@ -340,8 +337,5 @@
   "time_remaining.days": "{number, plural, one {# araw} other {# na araw}} ang natitira",
   "time_remaining.hours": "{number, plural, one {# oras} other {# na oras}} ang natitira",
   "time_remaining.minutes": "{number, plural, one {# minuto} other {# na minuto}} ang natitira",
-  "time_remaining.seconds": "{number, plural, one {# segundo} other {# na segundo}} ang natitira",
+  "time_remaining.seconds": "{number, plural, one {# segundo} other {# na segundo}} ang natitira"
-  "timeline_hint.remote_resource_not_displayed": "Hindi ipinapakita ang {resource} mula sa ibang mga serbiro.",
-  "timeline_hint.resources.followers": "Mga tagasunod",
-  "timeline_hint.resources.follows": "Mga sinusundan"
 }

app/javascript/mastodon/locales/fo.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Banna økisnavnið {domain}",
   "account.block_short": "Blokera",
   "account.blocked": "Bannað/ur",
-  "account.browse_more_on_origin_server": "Kaga meira á upprunaligu vangamyndina",
   "account.cancel_follow_request": "Strika fylgjaraumbøn",
   "account.copy": "Avrita leinki til vangan",
   "account.direct": "Umrøð @{name} privat",
@@ -193,6 +192,8 @@
   "confirmations.unfollow.confirm": "Fylg ikki",
   "confirmations.unfollow.message": "Ert tú vís/ur í, at tú vil steðga við at fylgja {name}?",
   "confirmations.unfollow.title": "Gevst at fylgja brúkara?",
+  "content_warning.hide": "Fjal post",
+  "content_warning.show": "Vís kortini",
   "conversation.delete": "Strika samrøðu",
   "conversation.mark_as_read": "Merk sum lisið",
   "conversation.open": "Vís samrøðu",
@@ -300,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Brúka ein verandi bólk ella skapa ein nýggjan",
   "filter_modal.select_filter.title": "Filtrera hendan postin",
   "filter_modal.title.status": "Filtrera ein post",
+  "filter_warning.matches_filter": "Samsvarar við filtrið “{title}”",
   "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",
@@ -349,6 +351,14 @@
   "hashtag.follow": "Fylg frámerki",
   "hashtag.unfollow": "Gevst at fylgja frámerki",
   "hashtags.and_other": "…og {count, plural, other {# afturat}}",
+  "hints.profiles.followers_may_be_missing": "Fylgjarar hjá hesum vanganum kunnu mangla.",
+  "hints.profiles.follows_may_be_missing": "Listin við teimum, sum hesin vangin fylgir, kunnu mangla.",
+  "hints.profiles.posts_may_be_missing": "Summir postar frá hesum vanganum kunnu mangla.",
+  "hints.profiles.see_more_followers": "Sí fleiri fylgjarar á {domain}",
+  "hints.profiles.see_more_follows": "Sí fleiri, ið viðkomandi fylgir, á {domain}",
+  "hints.profiles.see_more_posts": "Sí fleiri postar á {domain}",
+  "hints.threads.replies_may_be_missing": "Svar frá øðrum ambætarum mangla møguliga.",
+  "hints.threads.see_more": "Sí fleiri svar á {domain}",
   "home.column_settings.show_reblogs": "Vís lyft",
   "home.column_settings.show_replies": "Vís svar",
   "home.hide_announcements": "Fjal kunngerðir",
@@ -456,8 +466,6 @@
   "mute_modal.title": "Sløkk brúkara?",
   "mute_modal.you_wont_see_mentions": "Tú sært ikki postar, sum nevna tey.",
   "mute_modal.you_wont_see_posts": "Tey síggja framvegis tínar postar, men tú sært ikki teirra.",
-  "name_and_others": "{name} og {count, plural, one {# annar} other {# onnur}}",
-  "name_and_others_with_link": "{name} og <a>{count, plural, one {# annar} other {# onnur}}</a>",
   "navigation_bar.about": "Um",
   "navigation_bar.advanced_interface": "Lat upp í framkomnum vevmarkamóti",
   "navigation_bar.blocks": "Bannaðir brúkarar",
@@ -490,9 +498,13 @@
   "notification.admin.report_statuses": "{name} meldaði {target} fyri {category}",
   "notification.admin.report_statuses_other": "{name} meldaði {target}",
   "notification.admin.sign_up": "{name} meldaði seg til",
+  "notification.admin.sign_up.name_and_others": "{name} og {count, plural, one {# annar/onnur} other {# onnur}} teknaðu seg",
   "notification.favourite": "{name} dámdi postin hjá tær",
+  "notification.favourite.name_and_others_with_link": "{name} og <a>{count, plural, one {# annar/onnur} other {# onnur}}</a> yndisfrámerktu postin hjá tær",
   "notification.follow": "{name} fylgdi tær",
+  "notification.follow.name_and_others": "{name} og {count, plural, one {# annar/onnur} other {# onnur}} fylgdu tær",
   "notification.follow_request": "{name} biður um at fylgja tær",
+  "notification.follow_request.name_and_others": "{name} og {count, plural, one {# annar/onnur} other {# onnur}} hava biðið um at fylgja tær",
   "notification.label.mention": "Umrøða",
   "notification.label.private_mention": "Privat umrøða",
   "notification.label.private_reply": "Privat svar",
@@ -510,6 +522,7 @@
   "notification.own_poll": "Tín atkvøðugreiðsla er endað",
   "notification.poll": "Ein atkvøðugreiðsla, har tú atkvøddi, er endað",
   "notification.reblog": "{name} lyfti tín post",
+  "notification.reblog.name_and_others_with_link": "{name} og <a>{count, plural, one {# annar/onnur} other {# onnur}}</a> framhevjaðu tín post",
   "notification.relationships_severance_event": "Mist sambond við {name}",
   "notification.relationships_severance_event.account_suspension": "Ein umsitari frá {from} hevur gjørt {target} óvirkna, sum merkir, at tú ikki kanst móttaka dagføringar ella virka saman við teimum longur.",
   "notification.relationships_severance_event.domain_block": "Ein umsitari frá {from} hevur blokerað {target}, íroknað {followersCount} av tínum fylgjarum og {followingCount, plural, one {# kontu} other {# kontur}}, sum tú fylgir.",
@@ -775,8 +788,6 @@
   "status.favourite": "Dámdur postur",
   "status.favourites": "{count, plural, one {yndispostur} other {yndispostar}}",
   "status.filter": "Filtrera hendan postin",
-  "status.filtered": "Filtrerað",
-  "status.hide": "Fjal post",
   "status.history.created": "{name} stovnað {date}",
   "status.history.edited": "{name} rættað {date}",
   "status.load_more": "Tak meira niður",
@@ -804,10 +815,7 @@
   "status.report": "Melda @{name}",
   "status.sensitive_warning": "Viðkvæmt tilfar",
   "status.share": "Deil",
-  "status.show_filter_reason": "Vís kortini",
-  "status.show_less": "Vís minni",
   "status.show_less_all": "Vís øllum minni",
-  "status.show_more": "Vís meira",
   "status.show_more_all": "Vís øllum meira",
   "status.show_original": "Vís upprunaliga",
   "status.title.with_attachments": "{user} postaði {attachmentCount, plural, one {eitt viðhefti} other {{attachmentCount} viðhefti}}",
@@ -826,11 +834,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuttur} other {# minuttir}} eftir",
   "time_remaining.moments": "Lítið bil eftir",
   "time_remaining.seconds": "{number, plural, one {# sekund} other {# sekund}} eftir",
-  "timeline_hint.remote_resource_not_displayed": "{resource} frá øðrum ambætarum verður ikki víst.",
-  "timeline_hint.resources.followers": "Fylgjarar",
-  "timeline_hint.resources.follows": "Fylgir",
-  "timeline_hint.resources.replies": "Nøkur svar",
-  "timeline_hint.resources.statuses": "Gamlir postar",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persónur} other {{counter} persónar}} {days, plural, one {seinasta dagin} other {{days} seinastu dagarnar}}",
   "trends.trending_now": "Rák beint nú",
   "ui.beforeunload": "Kladdan verður mist, um tú fer úr Mastodon.",

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

@@ -19,7 +19,6 @@
   "account.block_domain": "Bloquer le domaine {domain}",
   "account.block_short": "Bloquer",
   "account.blocked": "Bloqué·e",
-  "account.browse_more_on_origin_server": "Parcourir davantage sur le profil original",
   "account.cancel_follow_request": "Retirer cette demande d'abonnement",
   "account.copy": "Copier le lien vers le profil",
   "account.direct": "Mention privée @{name}",
@@ -62,6 +61,7 @@
   "account.requested_follow": "{name} a demandé à vous suivre",
   "account.share": "Partager le profil de @{name}",
   "account.show_reblogs": "Afficher les boosts de @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} message} other {{counter} messages}}",
   "account.unblock": "Débloquer @{name}",
   "account.unblock_domain": "Débloquer le domaine {domain}",
   "account.unblock_short": "Débloquer",
@@ -93,7 +93,7 @@
   "block_modal.they_cant_mention": "Il ne peut pas vous mentionner ou vous suivre.",
   "block_modal.they_cant_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.",
   "block_modal.they_will_know": "Il peut voir qu'il est bloqué.",
-  "block_modal.title": "Bloquer l'utilisateur ?",
+  "block_modal.title": "Bloquer l'utilisateur·rice ?",
   "block_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour sauter ceci la prochaine fois",
   "bundle_column_error.copy_stacktrace": "Copier le rapport d'erreur",
@@ -343,6 +343,8 @@
   "hashtag.follow": "Suivre ce hashtag",
   "hashtag.unfollow": "Ne plus suivre ce hashtag",
   "hashtags.and_other": "…et {count, plural, other {# de plus}}",
+  "hints.profiles.see_more_posts": "Voir plus de messages sur {domain}",
+  "hints.threads.see_more": "Voir plus de réponses sur {domain}",
   "home.column_settings.show_reblogs": "Afficher boosts",
   "home.column_settings.show_replies": "Afficher réponses",
   "home.hide_announcements": "Masquer les annonces",
@@ -410,6 +412,7 @@
   "limited_account_hint.action": "Afficher le profil quand même",
   "limited_account_hint.title": "Ce profil a été masqué par la modération de {domain}.",
   "link_preview.author": "Par {name}",
+  "link_preview.shares": "{count, plural, one {{counter} message} other {{counter} messages}}",
   "lists.account.add": "Ajouter à une liste",
   "lists.account.remove": "Retirer d'une liste",
   "lists.delete": "Supprimer la liste",
@@ -468,8 +471,10 @@
   "notification.favourite": "{name} a ajouté votre publication à ses favoris",
   "notification.follow": "{name} vous suit",
   "notification.follow_request": "{name} a demandé à vous suivre",
+  "notification.label.mention": "Mention",
   "notification.label.private_mention": "Mention privée",
   "notification.label.private_reply": "Répondre en privé",
+  "notification.label.reply": "Réponse",
   "notification.moderation-warning.learn_more": "En savoir plus",
   "notification.moderation_warning": "Vous avez reçu un avertissement de modération",
   "notification.moderation_warning.action_delete_statuses": "Certains de vos messages ont été supprimés.",
@@ -491,6 +496,8 @@
   "notification.update": "{name} a modifié une publication",
   "notification_requests.accept": "Accepter",
   "notification_requests.dismiss": "Rejeter",
+  "notification_requests.edit_selection": "Modifier",
+  "notification_requests.exit_selection": "Fait",
   "notification_requests.notifications_from": "Notifications de {name}",
   "notification_requests.title": "Notifications filtrées",
   "notifications.clear": "Effacer notifications",
@@ -527,6 +534,10 @@
   "notifications.permission_denied": "Les notifications de bureau ne sont pas disponibles en raison d'une demande de permission de navigateur précédemment refusée",
   "notifications.permission_denied_alert": "Les notifications de bureau ne peuvent pas être activées, car l’autorisation du navigateur a précedemment été refusée",
   "notifications.permission_required": "Les notifications de bureau ne sont pas disponibles car l’autorisation requise n’a pas été accordée.",
+  "notifications.policy.drop": "Ignorer",
+  "notifications.policy.filter": "Filtrer",
+  "notifications.policy.filter_limited_accounts_hint": "Limité par les modérateur·rice·s du serveur",
+  "notifications.policy.filter_limited_accounts_title": "Comptes modérés",
   "notifications.policy.filter_new_accounts.hint": "Créés au cours des derniers {days, plural, one {un jour} other {# jours}}",
   "notifications.policy.filter_new_accounts_title": "Nouveaux comptes",
   "notifications.policy.filter_not_followers_hint": "Incluant les personnes qui vous suivent depuis moins de {days, plural, one {un jour} other {# jours}}",
@@ -661,10 +672,13 @@
   "report.unfollow_explanation": "Vous suivez ce compte. Pour ne plus en voir les messages sur votre fil d'accueil, arrêtez de le suivre.",
   "report_notification.attached_statuses": "{count, plural, one {{count} publication liée} other {{count} publications liées}}",
   "report_notification.categories.legal": "Mentions légales",
+  "report_notification.categories.legal_sentence": "contenu illégal",
   "report_notification.categories.other": "Autre",
+  "report_notification.categories.other_sentence": "autre",
   "report_notification.categories.spam": "Spam",
   "report_notification.categories.spam_sentence": "indésirable",
   "report_notification.categories.violation": "Infraction aux règles du serveur",
+  "report_notification.categories.violation_sentence": "infraction de règle",
   "report_notification.open": "Ouvrir le signalement",
   "search.no_recent_searches": "Aucune recherche récente",
   "search.placeholder": "Rechercher",
@@ -692,8 +706,10 @@
   "server_banner.about_active_users": "Personnes utilisant ce serveur au cours des 30 derniers jours (Comptes actifs mensuellement)",
   "server_banner.active_users": "comptes actifs",
   "server_banner.administered_by": "Administré par:",
+  "server_banner.is_one_of_many": "{domain} est l'un des nombreux serveurs Mastodon indépendants que vous pouvez utiliser pour participer au fédiverse.",
   "server_banner.server_stats": "Statistiques du serveur:",
   "sign_in_banner.create_account": "Créer un compte",
+  "sign_in_banner.mastodon_is": "Mastodon est le meilleur moyen de suivre ce qui se passe.",
   "sign_in_banner.sign_in": "Se connecter",
   "sign_in_banner.sso_redirect": "Se connecter ou s’inscrire",
   "status.admin_account": "Ouvrir l’interface de modération pour @{name}",
@@ -715,8 +731,6 @@
   "status.favourite": "Ajouter aux favoris",
   "status.favourites": "{count, plural, one {favori} other {favoris}}",
   "status.filter": "Filtrer cette publication",
-  "status.filtered": "Filtrée",
-  "status.hide": "Masquer le message",
   "status.history.created": "créé par {name} {date}",
   "status.history.edited": "modifié par {name} {date}",
   "status.load_more": "Charger plus",
@@ -744,10 +758,7 @@
   "status.report": "Signaler @{name}",
   "status.sensitive_warning": "Contenu sensible",
   "status.share": "Partager",
-  "status.show_filter_reason": "Afficher quand même",
-  "status.show_less": "Replier",
   "status.show_less_all": "Tout replier",
-  "status.show_more": "Déplier",
   "status.show_more_all": "Tout déplier",
   "status.show_original": "Afficher l’original",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
@@ -766,10 +777,6 @@
   "time_remaining.minutes": "{number, plural, one {# minute restante} other {# minutes restantes}}",
   "time_remaining.moments": "Encore quelques instants",
   "time_remaining.seconds": "{number, plural, one {# seconde restante} other {# secondes restantes}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} des autres serveurs ne sont pas affichés.",
-  "timeline_hint.resources.followers": "Abonné·e·s",
-  "timeline_hint.resources.follows": "Abonnements",
-  "timeline_hint.resources.statuses": "Publications plus anciennes",
   "trends.counter_by_accounts": "{count, plural, one {{counter} personne} other {{counter} personnes}} au cours {days, plural, one {des dernières 24h} other {des {days} derniers jours}}",
   "trends.trending_now": "Présentement populaire",
   "ui.beforeunload": "Votre brouillon sera perdu si vous quittez Mastodon.",

app/javascript/mastodon/locales/fr.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Bloquer le domaine {domain}",
   "account.block_short": "Bloquer",
   "account.blocked": "Bloqué·e",
-  "account.browse_more_on_origin_server": "Parcourir davantage sur le profil original",
   "account.cancel_follow_request": "Annuler le suivi",
   "account.copy": "Copier le lien vers le profil",
   "account.direct": "Mention privée @{name}",
@@ -49,7 +48,7 @@
   "account.mention": "Mentionner @{name}",
   "account.moved_to": "{name} a indiqué que son nouveau compte est maintenant :",
   "account.mute": "Masquer @{name}",
-  "account.mute_notifications_short": "Désactiver les alertes",
+  "account.mute_notifications_short": "Désactiver les notifications",
   "account.mute_short": "Mettre en sourdine",
   "account.muted": "Masqué·e",
   "account.mutual": "Mutuel",
@@ -62,6 +61,7 @@
   "account.requested_follow": "{name} a demandé à vous suivre",
   "account.share": "Partager le profil de @{name}",
   "account.show_reblogs": "Afficher les partages de @{name}",
+  "account.statuses_counter": "{count, plural, one {{counter} message} other {{counter} messages}}",
   "account.unblock": "Débloquer @{name}",
   "account.unblock_domain": "Débloquer le domaine {domain}",
   "account.unblock_short": "Débloquer",
@@ -93,7 +93,7 @@
   "block_modal.they_cant_mention": "Il ne peut pas vous mentionner ou vous suivre.",
   "block_modal.they_cant_see_posts": "Il peut toujours voir vos publications, mais vous ne verrez pas les siennes.",
   "block_modal.they_will_know": "Il peut voir qu'il est bloqué.",
-  "block_modal.title": "Bloquer l'utilisateur ?",
+  "block_modal.title": "Bloquer l'utilisateur·rice ?",
   "block_modal.you_wont_see_mentions": "Vous ne verrez pas les publications qui le mentionne.",
   "boost_modal.combo": "Vous pouvez appuyer sur {combo} pour passer ceci la prochaine fois",
   "bundle_column_error.copy_stacktrace": "Copier le rapport d'erreur",
@@ -343,6 +343,8 @@
   "hashtag.follow": "Suivre le hashtag",
   "hashtag.unfollow": "Ne plus suivre le hashtag",
   "hashtags.and_other": "…et {count, plural, other {# de plus}}",
+  "hints.profiles.see_more_posts": "Voir plus de messages sur {domain}",
+  "hints.threads.see_more": "Voir plus de réponses sur {domain}",
   "home.column_settings.show_reblogs": "Afficher les partages",
   "home.column_settings.show_replies": "Afficher les réponses",
   "home.hide_announcements": "Masquer les annonces",
@@ -410,6 +412,7 @@
   "limited_account_hint.action": "Afficher le profil quand même",
   "limited_account_hint.title": "Ce profil a été masqué par la modération de {domain}.",
   "link_preview.author": "Par {name}",
+  "link_preview.shares": "{count, plural, one {{counter} message} other {{counter} messages}}",
   "lists.account.add": "Ajouter à la liste",
   "lists.account.remove": "Supprimer de la liste",
   "lists.delete": "Supprimer la liste",
@@ -468,8 +471,10 @@
   "notification.favourite": "{name} a ajouté votre message à ses favoris",
   "notification.follow": "{name} vous suit",
   "notification.follow_request": "{name} a demandé à vous suivre",
+  "notification.label.mention": "Mention",
   "notification.label.private_mention": "Mention privée",
   "notification.label.private_reply": "Répondre en privé",
+  "notification.label.reply": "Réponse",
   "notification.moderation-warning.learn_more": "En savoir plus",
   "notification.moderation_warning": "Vous avez reçu un avertissement de modération",
   "notification.moderation_warning.action_delete_statuses": "Certains de vos messages ont été supprimés.",
@@ -491,6 +496,8 @@
   "notification.update": "{name} a modifié un message",
   "notification_requests.accept": "Accepter",
   "notification_requests.dismiss": "Rejeter",
+  "notification_requests.edit_selection": "Modifier",
+  "notification_requests.exit_selection": "Fait",
   "notification_requests.notifications_from": "Notifications de {name}",
   "notification_requests.title": "Notifications filtrées",
   "notifications.clear": "Effacer les notifications",
@@ -527,6 +534,10 @@
   "notifications.permission_denied": "Impossible d’activer les notifications de bureau car l’autorisation a été refusée.",
   "notifications.permission_denied_alert": "Les notifications de bureau ne peuvent pas être activées, car l’autorisation du navigateur a été refusée avant",
   "notifications.permission_required": "Les notifications de bureau ne sont pas disponibles car l’autorisation requise n’a pas été accordée.",
+  "notifications.policy.drop": "Ignorer",
+  "notifications.policy.filter": "Filtrer",
+  "notifications.policy.filter_limited_accounts_hint": "Limité par les modérateur·rice·s du serveur",
+  "notifications.policy.filter_limited_accounts_title": "Comptes modérés",
   "notifications.policy.filter_new_accounts.hint": "Créés au cours des derniers {days, plural, one {un jour} other {# jours}}",
   "notifications.policy.filter_new_accounts_title": "Nouveaux comptes",
   "notifications.policy.filter_not_followers_hint": "Incluant les personnes qui vous suivent depuis moins de {days, plural, one {un jour} other {# jours}}",
@@ -661,10 +672,13 @@
   "report.unfollow_explanation": "Vous suivez ce compte. Désabonnez-vous pour ne plus en voir les messages sur votre fil principal.",
   "report_notification.attached_statuses": "{count, plural, one {{count} message lié} other {{count} messages liés}}",
   "report_notification.categories.legal": "Légal",
+  "report_notification.categories.legal_sentence": "contenu illégal",
   "report_notification.categories.other": "Autre",
+  "report_notification.categories.other_sentence": "autre",
   "report_notification.categories.spam": "Spam",
   "report_notification.categories.spam_sentence": "indésirable",
   "report_notification.categories.violation": "Infraction aux règles du serveur",
+  "report_notification.categories.violation_sentence": "infraction de règle",
   "report_notification.open": "Ouvrir le signalement",
   "search.no_recent_searches": "Aucune recherche récente",
   "search.placeholder": "Rechercher",
@@ -692,8 +706,10 @@
   "server_banner.about_active_users": "Personnes utilisant ce serveur au cours des 30 derniers jours (Comptes actifs mensuellement)",
   "server_banner.active_users": "comptes actifs",
   "server_banner.administered_by": "Administré par :",
+  "server_banner.is_one_of_many": "{domain} est l'un des nombreux serveurs Mastodon indépendants que vous pouvez utiliser pour participer au fédiverse.",
   "server_banner.server_stats": "Statistiques du serveur :",
   "sign_in_banner.create_account": "Créer un compte",
+  "sign_in_banner.mastodon_is": "Mastodon est le meilleur moyen de suivre ce qui se passe.",
   "sign_in_banner.sign_in": "Se connecter",
   "sign_in_banner.sso_redirect": "Se connecter ou s’inscrire",
   "status.admin_account": "Ouvrir l’interface de modération pour @{name}",
@@ -715,8 +731,6 @@
   "status.favourite": "Ajouter aux favoris",
   "status.favourites": "{count, plural, one {favori} other {favoris}}",
   "status.filter": "Filtrer ce message",
-  "status.filtered": "Filtré",
-  "status.hide": "Masquer le message",
   "status.history.created": "créé par {name} {date}",
   "status.history.edited": "modifié par {name} {date}",
   "status.load_more": "Charger plus",
@@ -744,10 +758,7 @@
   "status.report": "Signaler @{name}",
   "status.sensitive_warning": "Contenu sensible",
   "status.share": "Partager",
-  "status.show_filter_reason": "Afficher quand même",
-  "status.show_less": "Replier",
   "status.show_less_all": "Tout replier",
-  "status.show_more": "Déplier",
   "status.show_more_all": "Tout déplier",
   "status.show_original": "Afficher l’original",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
@@ -766,10 +777,6 @@
   "time_remaining.minutes": "{number, plural, one {# minute restante} other {# minutes restantes}}",
   "time_remaining.moments": "Encore quelques instants",
   "time_remaining.seconds": "{number, plural, one {# seconde restante} other {# secondes restantes}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} des autres serveurs ne sont pas affichés.",
-  "timeline_hint.resources.followers": "Les abonnés",
-  "timeline_hint.resources.follows": "Les abonnements",
-  "timeline_hint.resources.statuses": "Messages plus anciens",
   "trends.counter_by_accounts": "{count, plural, one {{counter} pers.} other {{counter} pers.}} sur {days, plural, one {les dernières 24h} other {les {days} derniers jours}}",
   "trends.trending_now": "Tendance en ce moment",
   "ui.beforeunload": "Votre brouillon sera perdu si vous quittez Mastodon.",

app/javascript/mastodon/locales/fy.json

@@ -18,7 +18,6 @@
   "account.block_domain": "Domein {domain} blokkearje",
   "account.block_short": "Blokkearje",
   "account.blocked": "Blokkearre",
-  "account.browse_more_on_origin_server": "Mear op it orizjinele profyl besjen",
   "account.cancel_follow_request": "Folchfersyk annulearje",
   "account.copy": "Keppeling nei profyl kopiearje",
   "account.direct": "Privee fermelde @{name}",
@@ -433,8 +432,6 @@
   "mute_modal.title": "Brûker negearje?",
   "mute_modal.you_wont_see_mentions": "Jo sjogge gjin berjochten mear dy’t dizze account fermelde.",
   "mute_modal.you_wont_see_posts": "De persoan kin jo berjochten noch hieltyd sjen, mar jo sjogge harren berjochten net mear.",
-  "name_and_others": "{name} en {count, plural, one {# oar} other {# oaren}}",
-  "name_and_others_with_link": "{name} en <a>{count, plural, one {# oar} other {# oaren}}</a>",
   "navigation_bar.about": "Oer",
   "navigation_bar.advanced_interface": "Yn avansearre webomjouwing iepenje",
   "navigation_bar.blocks": "Blokkearre brûkers",
@@ -706,8 +703,6 @@
   "status.favourite": "Favoryt",
   "status.favourites": "{count, plural, one {favoryt} other {favoriten}}",
   "status.filter": "Dit berjocht filterje",
-  "status.filtered": "Filtere",
-  "status.hide": "Berjocht ferstopje",
   "status.history.created": "{name} makke dit {date}",
   "status.history.edited": "{name} bewurke dit {date}",
   "status.load_more": "Mear lade",
@@ -735,10 +730,7 @@
   "status.report": "@{name} rapportearje",
   "status.sensitive_warning": "Gefoelige ynhâld",
   "status.share": "Diele",
-  "status.show_filter_reason": "Dochs toane",
-  "status.show_less": "Minder toane",
   "status.show_less_all": "Alles minder toane",
-  "status.show_more": "Mear toane",
   "status.show_more_all": "Alles mear toane",
   "status.show_original": "Orizjineel besjen",
   "status.title.with_attachments": "{user} hat {attachmentCount, plural, one {ien bylage} other {{attachmentCount} bylagen}} tafoege",
@@ -757,10 +749,6 @@
   "time_remaining.minutes": "{number, plural, one {# minút} other {# minuten}} te gean",
   "time_remaining.moments": "Noch krekt efkes te gean",
   "time_remaining.seconds": "{number, plural, one {# sekonde} other {# sekonden}} te gean",
-  "timeline_hint.remote_resource_not_displayed": "{resource} fan oare servers wurde net toand.",
-  "timeline_hint.resources.followers": "Folgers",
-  "timeline_hint.resources.follows": "Folgjend",
-  "timeline_hint.resources.statuses": "Aldere berjochten",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persoan} other {{counter} persoanen}} {days, plural, one {de ôfrûne dei} other {de ôfrûne {days} dagen}}",
   "trends.trending_now": "Aktuele trends",
   "ui.beforeunload": "Jo konsept giet ferlern wannear’t jo Mastodon ferlitte.",

app/javascript/mastodon/locales/ga.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Bac ainm fearainn {domain}",
   "account.block_short": "Bloc",
   "account.blocked": "Bactha",
-  "account.browse_more_on_origin_server": "Brabhsáil níos mó ar an phróifíl bhunaidh",
   "account.cancel_follow_request": "Éirigh as iarratas leanta",
   "account.copy": "Cóipeáil nasc chuig an bpróifíl",
   "account.direct": "Luaigh @{name} go príobháideach",
@@ -456,8 +455,6 @@
   "mute_modal.title": "An bhfuil fonn ort úsáideoir a bhalbhú?",
   "mute_modal.you_wont_see_mentions": "Ní fheicfidh tú postálacha a luann iad.",
   "mute_modal.you_wont_see_posts": "Is féidir leo do phoist a fheiceáil go fóill, ach ní fheicfidh tú a gcuid postanna.",
-  "name_and_others": "{name} and {count, plural, one {# eile} two {# eile} few {# eile} many {# eile} other {# eile}}",
-  "name_and_others_with_link": "{name} agus <a>{count, plural, one {# eile} two {# eile} few {# eile} many {# eile} other {# eile}}</a>",
   "navigation_bar.about": "Maidir le",
   "navigation_bar.advanced_interface": "Oscail i gcomhéadan gréasáin chun cinn",
   "navigation_bar.blocks": "Cuntais bhactha",
@@ -765,8 +762,6 @@
   "status.favourite": "Is fearr leat",
   "status.favourites": "{count, plural, one {a bhfuil grá agat do} two {gráite} few {gráite} many {gráite} other {gráite}}",
   "status.filter": "Déan scagadh ar an bpostáil seo",
-  "status.filtered": "Scagtha",
-  "status.hide": "Cuir postáil i bhfolach",
   "status.history.created": "Chruthaigh {name} {date}",
   "status.history.edited": "Curtha in eagar ag {name} in {date}",
   "status.load_more": "Lódáil a thuilleadh",
@@ -794,10 +789,7 @@
   "status.report": "Tuairiscigh @{name}",
   "status.sensitive_warning": "Ábhar íogair",
   "status.share": "Comhroinn",
-  "status.show_filter_reason": "Taispeáin ar aon nós",
-  "status.show_less": "Taispeáin níos lú",
   "status.show_less_all": "Taispeáin níos lú d'uile",
-  "status.show_more": "Taispeáin níos mó",
   "status.show_more_all": "Taispeáin níos mó d'uile",
   "status.show_original": "Taispeáin bunchóip",
   "status.title.with_attachments": "{user} a sheol {attachmentCount, plural, one {ceangal} two {{attachmentCount} ceangal} few {{attachmentCount} ceangail} many {{attachmentCount} ceangal} other {{attachmentCount} ceangal}}",
@@ -816,11 +808,6 @@
   "time_remaining.minutes": "{number, plural, one {# nóiméad} other {# nóiméad}} fágtha",
   "time_remaining.moments": "Chuimhneacháin fágtha",
   "time_remaining.seconds": "{number, plural, one {# soicind} other {# soicind}} fágtha",
-  "timeline_hint.remote_resource_not_displayed": "Níl {resource} ó fhreastalaithe eile ar taispeáint.",
-  "timeline_hint.resources.followers": "Leantóirí",
-  "timeline_hint.resources.follows": "Cuntais leanta",
-  "timeline_hint.resources.replies": "Roinnt freagraí",
-  "timeline_hint.resources.statuses": "Postáilí níos sine",
   "trends.counter_by_accounts": "{count, plural, one {{counter} duine} other {{counter} duine}} le {days, plural, one {lá} other {{days} lá}} anuas",
   "trends.trending_now": "Ag treochtáil anois",
   "ui.beforeunload": "Caillfear do dhréacht má fhágann tú Mastodon.",

app/javascript/mastodon/locales/gd.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Bac an àrainn {domain}",
   "account.block_short": "Bac",
   "account.blocked": "’Ga bhacadh",
-  "account.browse_more_on_origin_server": "Rùraich barrachd dheth air a’ phròifil thùsail",
   "account.cancel_follow_request": "Sguir dhen leantainn",
   "account.copy": "Dèan lethbhreac dhen cheangal dhan phròifil",
   "account.direct": "Thoir iomradh air @{name} gu prìobhaideach",
@@ -456,8 +455,6 @@
   "mute_modal.title": "A bheil thu airson an cleachdaiche a mhùchadh?",
   "mute_modal.you_wont_see_mentions": "Chan fhaic thu na postaichean a bheir iomradh orra.",
   "mute_modal.you_wont_see_posts": "Chì iad na postaichean agad fhathast ach chan fhaic thu na postaichean aca-san.",
-  "name_and_others": "{name} ’s {count, plural, one {# eile} other {# eile}}",
-  "name_and_others_with_link": "{name} ’s <a>{count, plural, one {# eile} other {# eile}}</a>",
   "navigation_bar.about": "Mu dhèidhinn",
   "navigation_bar.advanced_interface": "Fosgail san eadar-aghaidh-lìn adhartach",
   "navigation_bar.blocks": "Cleachdaichean bacte",
@@ -765,8 +762,6 @@
   "status.favourite": "Cuir ris na h-annsachdan",
   "status.favourites": "{count, plural, one {annsachd} two {annsachd} few {annsachdan} other {annsachd}}",
   "status.filter": "Criathraich am post seo",
-  "status.filtered": "Criathraichte",
-  "status.hide": "Falaich am post",
   "status.history.created": "Chruthaich {name} {date} e",
   "status.history.edited": "Dheasaich {name} {date} e",
   "status.load_more": "Luchdaich barrachd dheth",
@@ -794,10 +789,7 @@
   "status.report": "Dèan gearan mu @{name}",
   "status.sensitive_warning": "Susbaint fhrionasach",
   "status.share": "Co-roinn",
-  "status.show_filter_reason": "Seall e co-dhiù",
-  "status.show_less": "Seall nas lugha dheth",
   "status.show_less_all": "Seall nas lugha dhen a h-uile",
-  "status.show_more": "Seall barrachd dheth",
   "status.show_more_all": "Seall barrachd dhen a h-uile",
   "status.show_original": "Seall an tionndadh tùsail",
   "status.title.with_attachments": "Phostaich {user} {attachmentCount, plural, one {{attachmentCount} cheanglachan} two {{attachmentCount} cheanglachan} few {{attachmentCount} ceanglachain} other {{attachmentCount} ceanglachan}}",
@@ -816,11 +808,6 @@
   "time_remaining.minutes": "{number, plural, one {# mhionaid} two {# mhionaid} few {# mionaidean} other {# mionaid}} air fhàgail",
   "time_remaining.moments": "Cha doir e ach greiseag",
   "time_remaining.seconds": "{number, plural, one {# diog} two {# dhiog} few {# diogan} other {# diog}} air fhàgail",
-  "timeline_hint.remote_resource_not_displayed": "Cha dèid {resource} o fhrithealaichean eile a shealltainn.",
-  "timeline_hint.resources.followers": "luchd-leantainn",
-  "timeline_hint.resources.follows": "an fheadhainn gan leantainn",
-  "timeline_hint.resources.replies": "Cuid de na freagairtean",
-  "timeline_hint.resources.statuses": "postaichean nas sine",
   "trends.counter_by_accounts": "{count, plural, one {{counter} neach} two {{counter} neach} few {{counter} daoine} other {{counter} duine}} {days, plural, one {san {days} latha} two {san {days} latha} few {sna {days} làithean} other {sna {days} latha}} seo chaidh",
   "trends.trending_now": "A’ treandadh an-dràsta",
   "ui.beforeunload": "Caillidh tu an dreachd agad ma dh’fhàgas tu Mastodon an-dràsta.",

app/javascript/mastodon/locales/gl.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Agochar todo de {domain}",
   "account.block_short": "Bloquear",
   "account.blocked": "Bloqueada",
-  "account.browse_more_on_origin_server": "Busca máis no perfil orixinal",
   "account.cancel_follow_request": "Desbotar a solicitude de seguimento",
   "account.copy": "Copiar ligazón ao perfil",
   "account.direct": "Mencionar de xeito privado a @{name}",
@@ -193,6 +192,8 @@
   "confirmations.unfollow.confirm": "Deixar de seguir",
   "confirmations.unfollow.message": "Desexas deixar de seguir a {name}?",
   "confirmations.unfollow.title": "Deixar de seguir á usuaria?",
+  "content_warning.hide": "Agochar publicación",
+  "content_warning.show": "Mostrar igualmente",
   "conversation.delete": "Eliminar conversa",
   "conversation.mark_as_read": "Marcar como lido",
   "conversation.open": "Ver conversa",
@@ -300,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Usar unha categoría existente ou crear unha nova",
   "filter_modal.select_filter.title": "Filtrar esta publicación",
   "filter_modal.title.status": "Filtrar unha publicación",
+  "filter_warning.matches_filter": "Debido ao filtro “{title}”",
   "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",
@@ -349,6 +351,14 @@
   "hashtag.follow": "Seguir cancelo",
   "hashtag.unfollow": "Deixar de seguir cancelo",
   "hashtags.and_other": "…e {count, plural, one {}other {# máis}}",
+  "hints.profiles.followers_may_be_missing": "Poderían faltar seguidoras deste perfil.",
+  "hints.profiles.follows_may_be_missing": "Poderían faltar seguimentos deste perfil.",
+  "hints.profiles.posts_may_be_missing": "Poderían faltar algunhas publicacións deste perfil.",
+  "hints.profiles.see_more_followers": "Mira máis seguidoras en {domain}",
+  "hints.profiles.see_more_follows": "Mira máis seguimentos en {domain}",
+  "hints.profiles.see_more_posts": "Mira máis publicacións en {domain}",
+  "hints.threads.replies_may_be_missing": "Poderían faltar respostas desde outros servidores.",
+  "hints.threads.see_more": "Mira máis respostas en {domain}",
   "home.column_settings.show_reblogs": "Amosar compartidos",
   "home.column_settings.show_replies": "Amosar respostas",
   "home.hide_announcements": "Agochar anuncios",
@@ -456,8 +466,6 @@
   "mute_modal.title": "Acalar usuaria?",
   "mute_modal.you_wont_see_mentions": "Non verás as publicacións que a mencionen.",
   "mute_modal.you_wont_see_posts": "Seguirá podendo ler as túas publicacións, pero non verás as súas.",
-  "name_and_others": "{name} e {count, plural, one {outra máis} other {# máis}}",
-  "name_and_others_with_link": "{name} e <a>{count, plural, one {outra máis} other {# máis}}</a>",
   "navigation_bar.about": "Sobre",
   "navigation_bar.advanced_interface": "Abrir coa interface web avanzada",
   "navigation_bar.blocks": "Usuarias bloqueadas",
@@ -490,9 +498,13 @@
   "notification.admin.report_statuses": "{name} deununciou a {target} por {category}",
   "notification.admin.report_statuses_other": "{name} denunciou a {target}",
   "notification.admin.sign_up": "{name} rexistrouse",
+  "notification.admin.sign_up.name_and_others": "{name} e {count, plural, one {# máis} other {# máis}} crearon unha conta",
   "notification.favourite": "{name} marcou como favorita a túa publicación",
+  "notification.favourite.name_and_others_with_link": "{name} e <a>{count, plural, one {# máis} other {# máis}}</a> favoreceron a túa publicación",
   "notification.follow": "{name} comezou a seguirte",
+  "notification.follow.name_and_others": "{name} e {count, plural, one {# máis} other {# máis}} seguíronte",
   "notification.follow_request": "{name} solicitou seguirte",
+  "notification.follow_request.name_and_others": "{name} e {count, plural, one {# máis} other {# máis}} solicitaron seguirte",
   "notification.label.mention": "Mención",
   "notification.label.private_mention": "Mención privada",
   "notification.label.private_reply": "Resposta privada",
@@ -510,6 +522,7 @@
   "notification.own_poll": "A túa enquisa rematou",
   "notification.poll": "Rematou a enquisa na que votaches",
   "notification.reblog": "{name} compartiu a túa publicación",
+  "notification.reblog.name_and_others_with_link": "{name} e <a>{count, plural, one {# máis} other {# máis}}</a> promoveron a túa publicación",
   "notification.relationships_severance_event": "Perdeuse a conexión con {name}",
   "notification.relationships_severance_event.account_suspension": "A administración de {from} suspendeu a {target}, o que significa que xa non vas recibir actualizacións de esa conta ou interactuar con ela.",
   "notification.relationships_severance_event.domain_block": "A administración de {from} bloqueou a {target}, que inclúe a {followersCount} das túas seguidoras e a {followingCount, plural, one {# conta} other {# contas}} que sigues.",
@@ -775,8 +788,6 @@
   "status.favourite": "Favorecer",
   "status.favourites": "{count, plural, one {favorecemento} other {favorecementos}}",
   "status.filter": "Filtrar esta publicación",
-  "status.filtered": "Filtrado",
-  "status.hide": "Agochar publicación",
   "status.history.created": "{name} creouno o {date}",
   "status.history.edited": "{name} editouno o {date}",
   "status.load_more": "Cargar máis",
@@ -804,10 +815,7 @@
   "status.report": "Denunciar @{name}",
   "status.sensitive_warning": "Contido sensíbel",
   "status.share": "Compartir",
-  "status.show_filter_reason": "Mostrar igualmente",
-  "status.show_less": "Amosar menos",
   "status.show_less_all": "Amosar menos para todos",
-  "status.show_more": "Amosar máis",
   "status.show_more_all": "Amosar máis para todos",
   "status.show_original": "Mostrar o orixinal",
   "status.title.with_attachments": "{user} publicou {attachmentCount, plural, one {un anexo} other {{attachmentCount} anexos}}",
@@ -826,11 +834,6 @@
   "time_remaining.minutes": "Remata en {number, plural, one {# minuto} other {# minutos}}",
   "time_remaining.moments": "A piques de rematar",
   "time_remaining.seconds": "Remata en {number, plural, one {# segundo} other {# segundos}}",
-  "timeline_hint.remote_resource_not_displayed": "Non se mostran {resource} desde outros servidores.",
-  "timeline_hint.resources.followers": "Seguidoras",
-  "timeline_hint.resources.follows": "Seguindo",
-  "timeline_hint.resources.replies": "Algunhas respostas",
-  "timeline_hint.resources.statuses": "Publicacións antigas",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persoa} other {{counter} persoas}} {days, plural, one {no último día} other {nos {days} últimos días}}",
   "trends.trending_now": "Temas populares",
   "ui.beforeunload": "O borrador perderase se saes de Mastodon.",

app/javascript/mastodon/locales/he.json

@@ -19,7 +19,6 @@
   "account.block_domain": "חסמו את קהילת {domain}",
   "account.block_short": "לחסום",
   "account.blocked": "לחסום",
-  "account.browse_more_on_origin_server": "ראה יותר בפרופיל המקורי",
   "account.cancel_follow_request": "משיכת בקשת מעקב",
   "account.copy": "להעתיק קישור לפרופיל",
   "account.direct": "הודעה פרטית אל @{name}",
@@ -349,6 +348,14 @@
   "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": "יתכן כי פרסומים של פרופיל זה חסרים.",
+  "hints.profiles.see_more_followers": "צפיה בעוד עוקבים משרת {domain}",
+  "hints.profiles.see_more_follows": "צפיה בעוד נעקבים בשרת {domain}",
+  "hints.profiles.see_more_posts": "צפיה בעוד פרסומים בשרת {domain}",
+  "hints.threads.replies_may_be_missing": "תגובות משרתים אחרים עלולות להיות חסרות.",
+  "hints.threads.see_more": "צפיה בעוד תגובות משרת {domain}",
   "home.column_settings.show_reblogs": "הצגת הדהודים",
   "home.column_settings.show_replies": "הצגת תגובות",
   "home.hide_announcements": "הסתר הכרזות",
@@ -456,8 +463,6 @@
   "mute_modal.title": "להשתיק משתמש?",
   "mute_modal.you_wont_see_mentions": "לא תראה הודעות שמאזכרות אותם.",
   "mute_modal.you_wont_see_posts": "הם יכולים לראות את הודעותכם, אבל אתם לא תוכלו לראות את שלהם.",
-  "name_and_others": "{name} ועוד {count, plural,one {אחד נוסף}other {# נוספים}}",
-  "name_and_others_with_link": "{name} ועוד <a>{count, plural,one {אחד נוסף}other {# נוספים}}</a>",
   "navigation_bar.about": "אודות",
   "navigation_bar.advanced_interface": "פתח במנשק ווב מתקדם",
   "navigation_bar.blocks": "משתמשים חסומים",
@@ -490,9 +495,13 @@
   "notification.admin.report_statuses": "{name} דווחו על {target} בגין {category}",
   "notification.admin.report_statuses_other": "{name} דיווח.ה על {target}",
   "notification.admin.sign_up": "{name} נרשמו",
+  "notification.admin.sign_up.name_and_others": "{name} ועוד {count, plural,one {אחד אחר}other {# אחרים}} נרשמו",
   "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} ועוד {count, plural,one {אחד אחר}other {# אחרים}} עקבו אחריך",
   "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": "תשובה בפרטי",
@@ -510,6 +519,7 @@
   "notification.own_poll": "הסקר שלך הסתיים",
   "notification.poll": "סקר שהצבעת בו הסתיים",
   "notification.reblog": "הודעתך הודהדה על ידי {name}",
+  "notification.reblog.name_and_others_with_link": "{name} ועוד <a>{count, plural,one {אחד נוסף}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 {חשבון אחד} two {שני חשבונות} many {# חשבונות} other {# חשבונות}} מבין נעקביך.",
@@ -518,7 +528,17 @@
   "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": "התראות על פעולות חשבון זה סוננו כי חשבון זה הוגבל על ידי מנהלי הדיונים.",
   "notification_requests.explainer_for_limited_remote_account": "התראות על פעולות חשבון זה סוננו כי חשבון זה או השרת שלו הוגבלו על ידי מנהלי הדיונים.",
   "notification_requests.maximize": "הגדלה למקסימום",
@@ -765,8 +785,6 @@
   "status.favourite": "חיבוב",
   "status.favourites": "{count, plural, one {חיבוב אחד} two {זוג חיבובים} other {# חיבובים}}",
   "status.filter": "סנן הודעה זו",
-  "status.filtered": "סונן",
-  "status.hide": "הסתרת חיצרוץ",
   "status.history.created": "{name} יצר/ה {date}",
   "status.history.edited": "{name} ערך/ה {date}",
   "status.load_more": "עוד",
@@ -794,10 +812,7 @@
   "status.report": "דיווח על @{name}",
   "status.sensitive_warning": "תוכן רגיש",
   "status.share": "שיתוף",
-  "status.show_filter_reason": "הראה בכל זאת",
-  "status.show_less": "הראה פחות",
   "status.show_less_all": "להציג פחות מהכל",
-  "status.show_more": "הראה יותר",
   "status.show_more_all": "להציג יותר מהכל",
   "status.show_original": "הצגת מקור",
   "status.title.with_attachments": "{user} פרסם.ה {attachmentCount, plural, one {צרופה} other {{attachmentCount} צרופות}}",
@@ -816,11 +831,6 @@
   "time_remaining.minutes": "נותרו {number, plural, one {# דקה} other {# דקות}}",
   "time_remaining.moments": "רגעים נותרו",
   "time_remaining.seconds": "נותרו {number, plural, one {# שניה} other {# שניות}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} משרתים אחרים לא מוצגים.",
-  "timeline_hint.resources.followers": "עוקבים",
-  "timeline_hint.resources.follows": "נעקבים",
-  "timeline_hint.resources.replies": "מספר תשובות",
-  "timeline_hint.resources.statuses": "הודעות ישנות יותר",
   "trends.counter_by_accounts": "{count, plural, one {אדם אחד} other {{count} א.נשים}} {days, plural, one {מאז אתמול} two {ביומיים האחרונים} other {במשך {days} הימים האחרונים}}",
   "trends.trending_now": "נושאים חמים",
   "ui.beforeunload": "הטיוטא תאבד אם תעזבו את מסטודון.",

app/javascript/mastodon/locales/hi.json

@@ -18,7 +18,6 @@
   "account.block_domain": "{domain} के सारी चीज़े छुपाएं",
   "account.block_short": "ब्लॉक किया गया",
   "account.blocked": "ब्लॉक",
-  "account.browse_more_on_origin_server": "मूल प्रोफ़ाइल पर अधिक ब्राउज़ करें",
   "account.cancel_follow_request": "फॉलो रिक्वेस्ट वापस लें",
   "account.copy": "प्रोफाइल पर लिंक कॉपी करें",
   "account.direct": "निजि तरीके से उल्लेख करे @{name}",
@@ -518,13 +517,10 @@
   "status.reply": "जवाब",
   "status.sensitive_warning": "संवेदनशील विषय वस्तु",
   "status.share": "शेयर करें",
-  "status.show_less": "कम दिखाएँ",
-  "status.show_more": "और दिखाएँ",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.translated_from_with": "{provider} का उपयोग करते हुये {lang} से अनुवादित किया गया",
   "tabs_bar.home": "होम",
   "tabs_bar.notifications": "सूचनाएँ",
-  "timeline_hint.resources.statuses": "Older toots",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",

app/javascript/mastodon/locales/hr.json

@@ -18,7 +18,6 @@
   "account.block_domain": "Blokiraj domenu {domain}",
   "account.block_short": "Blokiraj",
   "account.blocked": "Blokirano",
-  "account.browse_more_on_origin_server": "Pogledajte više na izvornom profilu",
   "account.cancel_follow_request": "Withdraw follow request",
   "account.copy": "Kopiraj vezu u profil",
   "account.direct": "Privatno spomeni @{name}",
@@ -461,8 +460,6 @@
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "Umetni",
   "status.filter": "Filtriraj ovu objavu",
-  "status.filtered": "Filtrirano",
-  "status.hide": "Sakrij objavu",
   "status.history.created": "Kreirao/la {name} prije {date}",
   "status.history.edited": "Uredio/la {name} prije {date}",
   "status.load_more": "Učitaj više",
@@ -488,9 +485,6 @@
   "status.report": "Prijavi @{name}",
   "status.sensitive_warning": "Osjetljiv sadržaj",
   "status.share": "Podijeli",
-  "status.show_filter_reason": "Svejedno prikaži",
-  "status.show_less": "Pokaži manje",
-  "status.show_more": "Pokaži više",
   "status.show_original": "Prikaži original",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.translate": "Prevedi",
@@ -505,10 +499,6 @@
   "time_remaining.hours": "{number, plural, one {preostao # sat} few {preostalo # sata} other {preostalo # sati}}",
   "time_remaining.minutes": "{number, plural, one {preostala # minuta} few {preostale # minute} other {preostalo # minuta}}",
   "time_remaining.seconds": "{number, plural, one {preostala # sekunda} few {preostale # sekunde} other {preostalo # sekundi}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} s drugih poslužitelja nisu prikazani.",
-  "timeline_hint.resources.followers": "Pratitelji",
-  "timeline_hint.resources.follows": "Praćenja",
-  "timeline_hint.resources.statuses": "Stariji tootovi",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "trends.trending_now": "Popularno",
   "ui.beforeunload": "Vaša skica bit će izgubljena ako napustite Mastodon.",

app/javascript/mastodon/locales/hu.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Domain letiltása: {domain}",
   "account.block_short": "Letiltás",
   "account.blocked": "Letiltva",
-  "account.browse_more_on_origin_server": "További böngészés az eredeti profilon",
   "account.cancel_follow_request": "Követési kérés visszavonása",
   "account.copy": "Hivatkozás másolása a profilba",
   "account.direct": "@{name} személyes említése",
@@ -193,6 +192,8 @@
   "confirmations.unfollow.confirm": "Követés visszavonása",
   "confirmations.unfollow.message": "Biztos, hogy vissza szeretnéd vonni {name} követését?",
   "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",
   "conversation.delete": "Beszélgetés törlése",
   "conversation.mark_as_read": "Megjelölés olvasottként",
   "conversation.open": "Beszélgetés megtekintése",
@@ -300,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Válassz egy meglévő kategóriát, vagy hozz létre egy újat",
   "filter_modal.select_filter.title": "E bejegyzés szűrése",
   "filter_modal.title.status": "Egy bejegyzés szűrése",
+  "filter_warning.matches_filter": "Megfelel a szűrőnek: „{title}”",
   "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",
@@ -349,6 +351,14 @@
   "hashtag.follow": "Hashtag követése",
   "hashtag.unfollow": "Hashtag követésének megszüntetése",
   "hashtags.and_other": "…és {count, plural, other {# további}}",
+  "hints.profiles.followers_may_be_missing": "A profil követői lehet, hogy hiányoznak.",
+  "hints.profiles.follows_may_be_missing": "A profil követései lehet, hogy hiányoznak.",
+  "hints.profiles.posts_may_be_missing": "A profil egyes bejegyzései lehet, hogy hiányoznak.",
+  "hints.profiles.see_more_followers": "További követők megtekintése itt: {domain}",
+  "hints.profiles.see_more_follows": "További követések megtekintése itt: {domain}",
+  "hints.profiles.see_more_posts": "További bejegyzések megtekintése itt: {domain}",
+  "hints.threads.replies_may_be_missing": "A más kiszolgálókról érkező válaszok lehet, hogy hiányoznak.",
+  "hints.threads.see_more": "További válaszok megtekintése itt: {domain}",
   "home.column_settings.show_reblogs": "Megtolások megjelenítése",
   "home.column_settings.show_replies": "Válaszok megjelenítése",
   "home.hide_announcements": "Közlemények elrejtése",
@@ -456,8 +466,6 @@
   "mute_modal.title": "Elnémítsuk a felhasználót?",
   "mute_modal.you_wont_see_mentions": "Nem látsz majd őt említő bejegyzéseket.",
   "mute_modal.you_wont_see_posts": "Továbbra is látni fogja a bejegyzéseidet, de te nem fogod látni az övéit.",
-  "name_and_others": "{name} és {count, plural, one {# másik} other {# másik}}",
-  "name_and_others_with_link": "{name} és <a>{count, plural, one {# másik} other {# másik}}</a>",
   "navigation_bar.about": "Névjegy",
   "navigation_bar.advanced_interface": "Megnyitás a speciális webes felületben",
   "navigation_bar.blocks": "Letiltott felhasználók",
@@ -490,9 +498,13 @@
   "notification.admin.report_statuses": "{name} jelentette: {target}, ezért: {category}",
   "notification.admin.report_statuses_other": "{name} jelentette: {target}",
   "notification.admin.sign_up": "{name} regisztrált",
+  "notification.admin.sign_up.name_and_others": "{name} és {count, plural, one {# másik} other {# másik}} regisztrált",
   "notification.favourite": "{name} kedvencnek jelölte a bejegyzésedet",
+  "notification.favourite.name_and_others_with_link": "{name} és <a>{count, plural, one {# másik} other {# másik}}</a> kedvencnek jelölte a bejegyzésedet",
   "notification.follow": "{name} követ téged",
+  "notification.follow.name_and_others": "{name} és {count, plural, one {# másik} other {# másik}} követni kezdett",
   "notification.follow_request": "{name} követni szeretne téged",
+  "notification.follow_request.name_and_others": "{name} és {count, plural, one {# másik} other {# másik}} kérte, hogy követhessen",
   "notification.label.mention": "Említés",
   "notification.label.private_mention": "Privát említés",
   "notification.label.private_reply": "Privát válasz",
@@ -510,6 +522,7 @@
   "notification.own_poll": "A szavazásod véget ért",
   "notification.poll": "Véget ért egy szavazás, melyben részt vettél",
   "notification.reblog": "{name} megtolta a bejegyzésedet",
+  "notification.reblog.name_and_others_with_link": "{name} és <a>{count, plural, one {# másik} other {# másik}}</a> megtolta a bejegyzésedet",
   "notification.relationships_severance_event": "Elvesztek a kapcsolatok vele: {name}",
   "notification.relationships_severance_event.account_suspension": "Egy admin a(z) {from} kiszolgálóról felfüggesztette {target} fiókját, ami azt jelenti, hogy mostantól nem fogsz róla értesítést kapni, és nem fogsz tudni vele kapcsolatba lépni.",
   "notification.relationships_severance_event.domain_block": "Egy admin a(z) {from} kiszolgálón letiltotta {target} domaint, beleértve {followersCount} követőt és {followingCount, plural, one {#} other {#}} követett fiókot.",
@@ -775,8 +788,6 @@
   "status.favourite": "Kedvenc",
   "status.favourites": "{count, plural, one {kedvenc} other {kedvenc}}",
   "status.filter": "E bejegyzés szűrése",
-  "status.filtered": "Megszűrt",
-  "status.hide": "Bejegyzés elrejtése",
   "status.history.created": "{name} létrehozta: {date}",
   "status.history.edited": "{name} szerkesztette: {date}",
   "status.load_more": "Többet",
@@ -804,10 +815,7 @@
   "status.report": "@{name} bejelentése",
   "status.sensitive_warning": "Kényes tartalom",
   "status.share": "Megosztás",
-  "status.show_filter_reason": "Megjelenítés mindenképp",
-  "status.show_less": "Kevesebb megjelenítése",
   "status.show_less_all": "Kevesebbet mindenhol",
-  "status.show_more": "Többet",
   "status.show_more_all": "Többet mindenhol",
   "status.show_original": "Eredeti megjelenítése",
   "status.title.with_attachments": "{user} {attachmentCount, plural, one {mellékletet} other {{attachmentCount} mellékletet}} küldött be.",
@@ -826,11 +834,6 @@
   "time_remaining.minutes": "{number, plural, one {# perc} other {# perc}} van hátra",
   "time_remaining.moments": "Pillanatok vannak hátra",
   "time_remaining.seconds": "{number, plural, one {# másodperc} other {# másodperc}} van hátra",
-  "timeline_hint.remote_resource_not_displayed": "a más kiszolgálókról származó {resource} tartalmak nem jelennek meg.",
-  "timeline_hint.resources.followers": "Követő",
-  "timeline_hint.resources.follows": "Követett",
-  "timeline_hint.resources.replies": "Néhány válasz",
-  "timeline_hint.resources.statuses": "Régi bejegyzések",
   "trends.counter_by_accounts": "{count, plural, one {{counter} ember} other {{counter} ember}} az elmúlt {days, plural,one {napban} other {{days} napban}}",
   "trends.trending_now": "Most felkapott",
   "ui.beforeunload": "A piszkozatod el fog veszni, ha elhagyod a Mastodont.",

app/javascript/mastodon/locales/hy.json

@@ -14,7 +14,6 @@
   "account.block_domain": "Թաքցնել ամէնը հետեւեալ տիրոյթից՝ {domain}",
   "account.block_short": "Արգելափակել",
   "account.blocked": "Արգելափակուած է",
-  "account.browse_more_on_origin_server": "Դիտել աւելին իրական պրոֆիլում",
   "account.cancel_follow_request": "Withdraw follow request",
   "account.direct": "Մասնաւոր յիշատակում @{name}",
   "account.disable_notifications": "Ծանուցումները անջատել @{name} գրառումների համար",
@@ -453,8 +452,6 @@
   "status.embed": "Ներդնել",
   "status.favourite": "Հավանել",
   "status.filter": "Զտել այս գրառումը",
-  "status.filtered": "Զտուած",
-  "status.hide": "Թաքցնել գրառումը",
   "status.history.created": "{name}-ը ստեղծել է՝ {date}",
   "status.history.edited": "{name}-ը խմբագրել է՝ {date}",
   "status.load_more": "Բեռնել աւելին",
@@ -479,10 +476,7 @@
   "status.report": "Բողոքել @{name}֊ից",
   "status.sensitive_warning": "Կասկածելի բովանդակութիւն",
   "status.share": "Կիսուել",
-  "status.show_filter_reason": "Ցոյց տալ բոլոր դէպքերում",
-  "status.show_less": "Պակաս",
   "status.show_less_all": "Թաքցնել բոլոր նախազգուշացնումները",
-  "status.show_more": "Աւելին",
   "status.show_more_all": "Ցուցադրել բոլոր նախազգուշացնումները",
   "status.show_original": "Ցոյց տալ բնօրինակը",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
@@ -497,10 +491,6 @@
   "time_remaining.minutes": "{number, plural, one {# րոպէ} other {# րոպէ}} անց",
   "time_remaining.moments": "Մնացել է մի քանի վարկեան",
   "time_remaining.seconds": "{number, plural, one {# վարկեան} other {# վարկեան}} անց",
-  "timeline_hint.remote_resource_not_displayed": "{resource} այլ սպասարկիչներից չեն ցուցադրվել:",
-  "timeline_hint.resources.followers": "Հետեւորդ",
-  "timeline_hint.resources.follows": "Հետեւել",
-  "timeline_hint.resources.statuses": "Հին գրառումներ",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "trends.trending_now": "Այժմ արդիական",
   "ui.beforeunload": "Քո սեւագիրը կը կորի, եթէ լքես Մաստոդոնը։",

app/javascript/mastodon/locales/ia.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Blocar dominio {domain}",
   "account.block_short": "Blocar",
   "account.blocked": "Blocate",
-  "account.browse_more_on_origin_server": "Explorar plus sur le profilo original",
   "account.cancel_follow_request": "Cancellar sequimento",
   "account.copy": "Copiar ligamine a profilo",
   "account.direct": "Mentionar privatemente @{name}",
@@ -442,8 +441,6 @@
   "mute_modal.title": "Silentiar le usator?",
   "mute_modal.you_wont_see_mentions": "Tu non videra le messages que mentiona iste persona.",
   "mute_modal.you_wont_see_posts": "Iste persona pote totevia vider tu messages, ma tu non videra le sues.",
-  "name_and_others": "{name} e {count, plural, one {# altere} other {# alteres}}",
-  "name_and_others_with_link": "{name} e <a>{count, plural, one {# altere} other {# alteres}}</a>",
   "navigation_bar.about": "A proposito",
   "navigation_bar.advanced_interface": "Aperir in le interfacie web avantiate",
   "navigation_bar.blocks": "Usatores blocate",
@@ -731,8 +728,6 @@
   "status.favourite": "Adder al favorites",
   "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filtrar iste message",
-  "status.filtered": "Filtrate",
-  "status.hide": "Celar le message",
   "status.history.created": "create per {name} le {date}",
   "status.history.edited": "modificate per {name} le {date}",
   "status.load_more": "Cargar plus",
@@ -760,10 +755,7 @@
   "status.report": "Reportar @{name}",
   "status.sensitive_warning": "Contento sensibile",
   "status.share": "Compartir",
-  "status.show_filter_reason": "Monstrar in omne caso",
-  "status.show_less": "Monstrar minus",
   "status.show_less_all": "Monstrar minus pro totes",
-  "status.show_more": "Monstrar plus",
   "status.show_more_all": "Monstrar plus pro totes",
   "status.show_original": "Monstrar original",
   "status.title.with_attachments": "{user} ha publicate {attachmentCount, plural, one {un annexo} other {{attachmentCount} annexos}}",
@@ -782,10 +774,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuta} other {# minutas}} restante",
   "time_remaining.moments": "Qualque momentos restante",
   "time_remaining.seconds": "{number, plural, one {# secunda} other {# secundas}} restante",
-  "timeline_hint.remote_resource_not_displayed": "Le {resource} de altere servitores non appare hic.",
-  "timeline_hint.resources.followers": "Sequitores",
-  "timeline_hint.resources.follows": "Sequites",
-  "timeline_hint.resources.statuses": "Messages ancian",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} in le passate {days, plural, one {die} other {{days} dies}}",
   "trends.trending_now": "Ora in tendentias",
   "ui.beforeunload": "Tu esbosso essera predite si tu exi de Mastodon.",

app/javascript/mastodon/locales/id.json

@@ -18,7 +18,6 @@
   "account.block_domain": "Blokir domain {domain}",
   "account.block_short": "Blokir",
   "account.blocked": "Terblokir",
-  "account.browse_more_on_origin_server": "Lihat lebih lanjut di profil asli",
   "account.cancel_follow_request": "Batalkan permintaan ikut",
   "account.copy": "Salin tautan ke profil",
   "account.direct": "Sebut secara pribadi @{name}",
@@ -572,8 +571,6 @@
   "status.edited_x_times": "Diedit {count, plural, other {{count} kali}}",
   "status.embed": "Tanam",
   "status.filter": "Saring kiriman ini",
-  "status.filtered": "Disaring",
-  "status.hide": "Sembunyikan pos",
   "status.history.created": "{name} membuat {date}",
   "status.history.edited": "{name} mengedit {date}",
   "status.load_more": "Tampilkan semua",
@@ -598,10 +595,7 @@
   "status.report": "Laporkan @{name}",
   "status.sensitive_warning": "Konten sensitif",
   "status.share": "Bagikan",
-  "status.show_filter_reason": "Tampilkan saja",
-  "status.show_less": "Tampilkan lebih sedikit",
   "status.show_less_all": "Tampilkan lebih sedikit untuk semua",
-  "status.show_more": "Tampilkan semua",
   "status.show_more_all": "Tampilkan lebih banyak untuk semua",
   "status.show_original": "Tampilkan yang asli",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
@@ -619,10 +613,6 @@
   "time_remaining.minutes": "{number, plural, other {# menit}} tersisa",
   "time_remaining.moments": "Momen tersisa",
   "time_remaining.seconds": "{number, plural, other {# detik}} tersisa",
-  "timeline_hint.remote_resource_not_displayed": "{resource} dari server lain tidak ditampilkan.",
-  "timeline_hint.resources.followers": "Pengikut",
-  "timeline_hint.resources.follows": "Ikuti",
-  "timeline_hint.resources.statuses": "Kiriman lama",
   "trends.counter_by_accounts": "{count, plural, other {{counter} orang}} dalam {days, plural, other {{days} hari}} terakhir",
   "trends.trending_now": "Sedang tren sekarang",
   "ui.beforeunload": "Draf Anda akan hilang jika Anda keluar dari Mastodon.",

app/javascript/mastodon/locales/ie.json

@@ -18,7 +18,6 @@
   "account.block_domain": "Bloccar dominia {domain}",
   "account.block_short": "Bloccar",
   "account.blocked": "Bloccat",
-  "account.browse_more_on_origin_server": "Navigar plu sur li profil original",
   "account.cancel_follow_request": "Anullar sequer",
   "account.copy": "Copiar ligament al profil",
   "account.direct": "Privatmen mentionar @{name}",
@@ -704,8 +703,6 @@
   "status.favourite": "Favoritisar",
   "status.favourites": "{count, plural, one {favorit} other {favorites}}",
   "status.filter": "Filtrar ti-ci posta",
-  "status.filtered": "Filtrat",
-  "status.hide": "Celar posta",
   "status.history.created": "creat de {name} ye {date}",
   "status.history.edited": "modificat de {name} ye {date}",
   "status.load_more": "Cargar plu",
@@ -733,10 +730,7 @@
   "status.report": "Raportar @{name}",
   "status.sensitive_warning": "Sensitiv contenete",
   "status.share": "Partir",
-  "status.show_filter_reason": "Monstrar totvez",
-  "status.show_less": "Monstrar minu",
   "status.show_less_all": "Monstrar minu por omno",
-  "status.show_more": "Monstrar plu",
   "status.show_more_all": "Monstrar plu por omno",
   "status.show_original": "Monstrar li original",
   "status.title.with_attachments": "{user} postat {attachmentCount, plural, one {un atachament} other {{attachmentCount} atachamentes}}",
@@ -755,10 +749,6 @@
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} resta",
   "time_remaining.moments": "Momentes resta",
   "time_remaining.seconds": "{number, plural, one {# second} other {# secondes}} resta",
-  "timeline_hint.remote_resource_not_displayed": "{resource} de altri servitores ne es monstrat.",
-  "timeline_hint.resources.followers": "Sequitores",
-  "timeline_hint.resources.follows": "Sequetes",
-  "timeline_hint.resources.statuses": "Plu old postas",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} persones}} durant li ultim {days, plural, one {die} other {{days} dies}}",
   "trends.trending_now": "Actualmen populari",
   "ui.beforeunload": "Tui íncomplet posta va esser perdit si tu lassa Mastodon.",

app/javascript/mastodon/locales/ig.json

@@ -154,7 +154,6 @@
   "status.translate": "Tụgharịa",
   "tabs_bar.home": "Be",
   "tabs_bar.notifications": "Nziọkwà",
-  "timeline_hint.resources.followers": "Ndị na-eso",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "trends.trending_now": "Na-ewu ewu kịta",
   "upload_form.audio_description": "Describe for people with hearing loss",

app/javascript/mastodon/locales/io.json

@@ -17,7 +17,6 @@
   "account.block_domain": "Blokusar {domain}",
   "account.block_short": "Blokusar",
   "account.blocked": "Blokusita",
-  "account.browse_more_on_origin_server": "Videz pluse che la originala profilo",
   "account.cancel_follow_request": "Desendez sequodemando",
   "account.copy": "Kopiez ligilo al profilo",
   "account.direct": "Private mencionez @{name}",
@@ -594,8 +593,6 @@
   "status.embed": "Eninsertez",
   "status.favourite": "Favorizar",
   "status.filter": "Filtragez ca posto",
-  "status.filtered": "Filtrita",
-  "status.hide": "Celez posto",
   "status.history.created": "{name} kreis ye {date}",
   "status.history.edited": "{name} modifikis ye {date}",
   "status.load_more": "Kargar pluse",
@@ -622,10 +619,7 @@
   "status.report": "Denuncar @{name}",
   "status.sensitive_warning": "Trubliva kontenajo",
   "status.share": "Partigez",
-  "status.show_filter_reason": "Jus montrez",
-  "status.show_less": "Montrar mine",
   "status.show_less_all": "Montrez min por omno",
-  "status.show_more": "Montrar plue",
   "status.show_more_all": "Montrez pluse por omno",
   "status.show_original": "Montrez originalo",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
@@ -644,10 +638,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuto} other {# minuti}} restas",
   "time_remaining.moments": "Poka sekundi restas",
   "time_remaining.seconds": "{number, plural, one {# sekundo} other {# sekundi}} restas",
-  "timeline_hint.remote_resource_not_displayed": "{resource} de altra servili ne montresas.",
-  "timeline_hint.resources.followers": "Sequanti",
-  "timeline_hint.resources.follows": "Sequati",
-  "timeline_hint.resources.statuses": "Older toots",
   "trends.counter_by_accounts": "{count, plural,one {{counter} persono} other {{counter} personi}} en antea {days, plural,one {dio} other {{days} dii}}",
   "trends.trending_now": "Tendencigas nun",
   "ui.beforeunload": "Vua skisato perdesos se vu ekiras Mastodon.",

app/javascript/mastodon/locales/is.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Útiloka lénið {domain}",
   "account.block_short": "Útiloka",
   "account.blocked": "Útilokaður",
-  "account.browse_more_on_origin_server": "Skoða nánari upplýsingar á notandasniðinu",
   "account.cancel_follow_request": "Taka fylgjendabeiðni til baka",
   "account.copy": "Afrita tengil í notandasnið",
   "account.direct": "Einkaspjall við @{name}",
@@ -193,6 +192,8 @@
   "confirmations.unfollow.confirm": "Hætta að fylgja",
   "confirmations.unfollow.message": "Ertu viss um að þú viljir hætta að fylgjast með {name}?",
   "confirmations.unfollow.title": "Hætta að fylgjast með viðkomandi?",
+  "content_warning.hide": "Fela færslu",
+  "content_warning.show": "Birta samt",
   "conversation.delete": "Eyða samtali",
   "conversation.mark_as_read": "Merkja sem lesið",
   "conversation.open": "Skoða samtal",
@@ -300,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Notaðu fyrirliggjandi flokk eða útbúðu nýjan",
   "filter_modal.select_filter.title": "Sía þessa færslu",
   "filter_modal.title.status": "Sía færslu",
+  "filter_warning.matches_filter": "Samsvarar síunni“{title}”",
   "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",
@@ -349,6 +351,14 @@
   "hashtag.follow": "Fylgjast með myllumerki",
   "hashtag.unfollow": "Hætta að fylgjast með myllumerki",
   "hashtags.and_other": "…og {count, plural, other {# til viðbótar}}",
+  "hints.profiles.followers_may_be_missing": "Fylgjendur frá þessum notanda gæti vantað.",
+  "hints.profiles.follows_may_be_missing": "Aðila sem þessi notandi fylgist með gæti vantað.",
+  "hints.profiles.posts_may_be_missing": "Sumar færslur frá þessum notanda gæti vantað.",
+  "hints.profiles.see_more_followers": "Sjá fleiri fylgjendur á {domain}",
+  "hints.profiles.see_more_follows": "Sjá fleiri sem þú fylgist með á {domain}",
+  "hints.profiles.see_more_posts": "Sjá fleiri færslur á {domain}",
+  "hints.threads.replies_may_be_missing": "Svör af öðrum netþjónum gæti vantað.",
+  "hints.threads.see_more": "Sjá fleiri svör á {domain}",
   "home.column_settings.show_reblogs": "Sýna endurbirtingar",
   "home.column_settings.show_replies": "Birta svör",
   "home.hide_announcements": "Fela auglýsingar",
@@ -456,8 +466,6 @@
   "mute_modal.title": "Þagga niður í notanda?",
   "mute_modal.you_wont_see_mentions": "Þú munt ekki sjá færslur sem minnast á viðkomandi aðila.",
   "mute_modal.you_wont_see_posts": "Viðkomandi geta áfram séð færslurnar þínar en þú munt ekki sjá færslurnar þeirra.",
-  "name_and_others": "{name} og {count, plural, one {# annar} other {# aðrir}}",
-  "name_and_others_with_link": "{name} og <a>{count, plural, one {# annar} other {# aðrir}}</a>",
   "navigation_bar.about": "Um hugbúnaðinn",
   "navigation_bar.advanced_interface": "Opna í ítarlegu vefviðmóti",
   "navigation_bar.blocks": "Útilokaðir notendur",
@@ -490,9 +498,13 @@
   "notification.admin.report_statuses": "{name} kærði {target} fyrir {category}",
   "notification.admin.report_statuses_other": "{name} kærði {target}",
   "notification.admin.sign_up": "{name} skráði sig",
+  "notification.admin.sign_up.name_and_others": "{name} og {count, plural, one {# í viðbót hefur} other {# í viðbót hafa}} skráð sig",
   "notification.favourite": "{name} setti færsluna þína í eftirlæti",
+  "notification.favourite.name_and_others_with_link": "{name} og <a>{count, plural, one {# í viðbót hefur} other {# í viðbót hafa}}</a> sett færsluna þína í eftirlæti",
   "notification.follow": "{name} fylgist með þér",
+  "notification.follow.name_and_others": "{name} og {count, plural, one {# í viðbót fylgdist} other {# í viðbót fylgdust}} með þér",
   "notification.follow_request": "{name} hefur beðið um að fylgjast með þér",
+  "notification.follow_request.name_and_others": "{name} og {count, plural, one {# í viðbót hefur} other {# í viðbót hafa}} beðið um að fylgjast með þér",
   "notification.label.mention": "Minnst á",
   "notification.label.private_mention": "Einkaspjall",
   "notification.label.private_reply": "Einkasvar",
@@ -510,6 +522,7 @@
   "notification.own_poll": "Könnuninni þinni er lokið",
   "notification.poll": "Könnun sem þú greiddir atkvæði í er lokið",
   "notification.reblog": "{name} endurbirti færsluna þína",
+  "notification.reblog.name_and_others_with_link": "{name} og <a>{count, plural, one {# í viðbót hefur} other {# í viðbót hafa}}</a> endurbirt færsluna þína",
   "notification.relationships_severance_event": "Missti tengingar við {name}",
   "notification.relationships_severance_event.account_suspension": "Stjórnandi á {from} hefur fryst {target}, sem þýðir að þú færð ekki lengur skilaboð frá viðkomandi né átt í samskiptum við viðkomandi.",
   "notification.relationships_severance_event.domain_block": "Stjórnandi á {from} hefur lokað á {target} og þar með {followersCount} fylgjendur þína auk {followingCount, plural, one {# aðgangs} other {# aðganga}} sem þú fylgist með.",
@@ -775,8 +788,6 @@
   "status.favourite": "Eftirlæti",
   "status.favourites": "{count, plural, one {eftirlæti} other {eftirlæti}}",
   "status.filter": "Sía þessa færslu",
-  "status.filtered": "Síað",
-  "status.hide": "Fela færslu",
   "status.history.created": "{name} útbjó {date}",
   "status.history.edited": "{name} breytti {date}",
   "status.load_more": "Hlaða inn meiru",
@@ -804,10 +815,7 @@
   "status.report": "Kæra @{name}",
   "status.sensitive_warning": "Viðkvæmt efni",
   "status.share": "Deila",
-  "status.show_filter_reason": "Birta samt",
-  "status.show_less": "Sýna minna",
   "status.show_less_all": "Sýna minna fyrir allt",
-  "status.show_more": "Sýna meira",
   "status.show_more_all": "Sýna meira fyrir allt",
   "status.show_original": "Sýna upprunalega",
   "status.title.with_attachments": "{user} birti {attachmentCount, plural, one {viðhengi} other {{attachmentCount} viðhengi}}",
@@ -826,11 +834,6 @@
   "time_remaining.minutes": "{number, plural, one {# mínúta} other {# mínútur}} eftir",
   "time_remaining.moments": "Tími eftir",
   "time_remaining.seconds": "{number, plural, one {# sekúnda} other {# sekúndur}} eftir",
-  "timeline_hint.remote_resource_not_displayed": "{resource} frá öðrum netþjónum er ekki birt.",
-  "timeline_hint.resources.followers": "Fylgjendur",
-  "timeline_hint.resources.follows": "Fylgist með",
-  "timeline_hint.resources.replies": "Sum svör",
-  "timeline_hint.resources.statuses": "Eldri færslur",
   "trends.counter_by_accounts": "{count, plural, one {{counter} aðili} other {{counter} manns}} {days, plural, one {síðasta sólarhringinn} other {síðustu {days} daga}}",
   "trends.trending_now": "Vinsælt núna",
   "ui.beforeunload": "Drögin tapast ef þú ferð út úr Mastodon.",

app/javascript/mastodon/locales/it.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Blocca dominio {domain}",
   "account.block_short": "Blocca",
   "account.blocked": "Bloccato",
-  "account.browse_more_on_origin_server": "Sfoglia di più sul profilo originale",
   "account.cancel_follow_request": "Annulla la richiesta di seguire",
   "account.copy": "Copia link del profilo",
   "account.direct": "Menziona privatamente @{name}",
@@ -193,6 +192,8 @@
   "confirmations.unfollow.confirm": "Smetti di seguire",
   "confirmations.unfollow.message": "Sei sicuro di voler smettere di seguire {name}?",
   "confirmations.unfollow.title": "Smettere di seguire l'utente?",
+  "content_warning.hide": "Nascondi post",
+  "content_warning.show": "Mostra comunque",
   "conversation.delete": "Elimina conversazione",
   "conversation.mark_as_read": "Segna come letto",
   "conversation.open": "Visualizza conversazione",
@@ -300,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Usa una categoria esistente o creane una nuova",
   "filter_modal.select_filter.title": "Filtra questo post",
   "filter_modal.title.status": "Filtra un post",
+  "filter_warning.matches_filter": "Corrisponde al filtro \"{title}\"",
   "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",
@@ -349,6 +351,14 @@
   "hashtag.follow": "Segui l'hashtag",
   "hashtag.unfollow": "Smetti di seguire l'hashtag",
   "hashtags.and_other": "…e {count, plural, other {# in più}}",
+  "hints.profiles.followers_may_be_missing": "I seguaci per questo profilo potrebbero essere mancanti.",
+  "hints.profiles.follows_may_be_missing": "I profili seguiti per questo profilo potrebbero essere mancanti.",
+  "hints.profiles.posts_may_be_missing": "Alcuni post da questo profilo potrebbero essere mancanti.",
+  "hints.profiles.see_more_followers": "Vedi altri seguaci su {domain}",
+  "hints.profiles.see_more_follows": "Vedi altri profili seguiti su {domain}",
+  "hints.profiles.see_more_posts": "Vedi altri post su {domain}",
+  "hints.threads.replies_may_be_missing": "Le risposte da altri server potrebbero essere mancanti.",
+  "hints.threads.see_more": "Vedi altre risposte su {domain}",
   "home.column_settings.show_reblogs": "Mostra reblog",
   "home.column_settings.show_replies": "Mostra risposte",
   "home.hide_announcements": "Nascondi annunci",
@@ -456,8 +466,6 @@
   "mute_modal.title": "Silenziare l'utente?",
   "mute_modal.you_wont_see_mentions": "Non vedrai i post che li menzionano.",
   "mute_modal.you_wont_see_posts": "Possono ancora vedere i tuoi post, ma tu non vedrai i loro.",
-  "name_and_others": "{name} e {count, plural, one {# un altro} other {# altri}}",
-  "name_and_others_with_link": "{name} e <a>{count, plural, one {# un altro} other {# altri}}</a>",
   "navigation_bar.about": "Info",
   "navigation_bar.advanced_interface": "Apri nell'interfaccia web avanzata",
   "navigation_bar.blocks": "Utenti bloccati",
@@ -490,9 +498,13 @@
   "notification.admin.report_statuses": "{name} ha segnalato {target} per {category}",
   "notification.admin.report_statuses_other": "{name} ha segnalato {target}",
   "notification.admin.sign_up": "{name} si è iscritto",
+  "notification.admin.sign_up.name_and_others": "Si sono iscritti: {name} e {count, plural, one {# altro utente} other {altri # utenti}}",
   "notification.favourite": "{name} ha aggiunto il tuo post ai preferiti",
+  "notification.favourite.name_and_others_with_link": "{name} e <a>{count, plural, one {# altro} other {altri #}}</a> hanno aggiunto il tuo post ai preferiti",
   "notification.follow": "{name} ha iniziato a seguirti",
+  "notification.follow.name_and_others": "{name} e {count, plural, one {# altro} other {altri #}} hanno iniziato a seguirti",
   "notification.follow_request": "{name} ha richiesto di seguirti",
+  "notification.follow_request.name_and_others": "{name} e {count, plural, one {# altro} other {altri #}} hanno richiesto di seguirti",
   "notification.label.mention": "Menziona",
   "notification.label.private_mention": "Menzione privata",
   "notification.label.private_reply": "Rispondi in privato",
@@ -510,6 +522,7 @@
   "notification.own_poll": "Il tuo sondaggio è terminato",
   "notification.poll": "Un sondaggio in cui hai votato è terminato",
   "notification.reblog": "{name} ha rebloggato il tuo post",
+  "notification.reblog.name_and_others_with_link": "{name} e <a>{count,  plural, one {# altro} other {altri #}}</a> hanno condiviso il tuo post",
   "notification.relationships_severance_event": "Connessioni perse con {name}",
   "notification.relationships_severance_event.account_suspension": "Un amministratore da {from} ha sospeso {target}, il che significa che non puoi più ricevere aggiornamenti da loro o interagire con loro.",
   "notification.relationships_severance_event.domain_block": "Un amministratore da {from} ha bloccato {target}, inclusi {followersCount} dei tuoi seguaci e {followingCount, plural, one {# account} other {# account}} che segui.",
@@ -518,7 +531,17 @@
   "notification.status": "{name} ha appena pubblicato un post",
   "notification.update": "{name} ha modificato un post",
   "notification_requests.accept": "Accetta",
+  "notification_requests.accept_multiple": "{count, plural, one {Accetta # richiesta…} other {Accetta # richieste…}}",
+  "notification_requests.confirm_accept_multiple.button": "{count, plural, one {Accetta la richiesta} other {Accetta le richieste}}",
+  "notification_requests.confirm_accept_multiple.message": "Stai per accettare {count, plural, one {una richiesta di notifica} other {# richieste di notifica}}. Si è sicuri di voler procedere?",
+  "notification_requests.confirm_accept_multiple.title": "Accettare le richieste di notifica?",
+  "notification_requests.confirm_dismiss_multiple.button": "{count, plural, one {Ignora la richiesta} other {Ignora le richieste}}",
+  "notification_requests.confirm_dismiss_multiple.message": "Stai per ignorare {count, plural, one {una richiesta di notifica} other {# richieste di notifiche}}. Non potrai più accedere facilmente ad {count, plural, one {essa} other {esse}}. Si è sicuri di voler procedere?",
+  "notification_requests.confirm_dismiss_multiple.title": "Ignorare le richieste di notifica?",
   "notification_requests.dismiss": "Ignora",
+  "notification_requests.dismiss_multiple": "{count, plural, one {Ignora # richiesta…} other {Ignora # richieste…}}",
+  "notification_requests.edit_selection": "Modifica",
+  "notification_requests.exit_selection": "Fatto",
   "notification_requests.explainer_for_limited_account": "Le notifiche provenienti da questo account sono state filtrate perché l'account è stato limitato da un moderatore.",
   "notification_requests.explainer_for_limited_remote_account": "Le notifiche provenienti da questo account sono state filtrate perché l'account o il suo server sono stati limitati da un moderatore.",
   "notification_requests.maximize": "Ingrandisci",
@@ -765,8 +788,6 @@
   "status.favourite": "Preferito",
   "status.favourites": "{count, plural, one {preferito} other {preferiti}}",
   "status.filter": "Filtra questo post",
-  "status.filtered": "Filtrato",
-  "status.hide": "Nascondi il post",
   "status.history.created": "Creato da {name} il {date}",
   "status.history.edited": "Modificato da {name} il {date}",
   "status.load_more": "Carica altro",
@@ -794,10 +815,7 @@
   "status.report": "Segnala @{name}",
   "status.sensitive_warning": "Contenuto sensibile",
   "status.share": "Condividi",
-  "status.show_filter_reason": "Mostra comunque",
-  "status.show_less": "Mostra meno",
   "status.show_less_all": "Mostra meno per tutti",
-  "status.show_more": "Mostra di più",
   "status.show_more_all": "Mostra di più per tutti",
   "status.show_original": "Mostra originale",
   "status.title.with_attachments": "{user} ha pubblicato {attachmentCount, plural, one {un allegato} other {{attachmentCount} allegati}}",
@@ -816,11 +834,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuto} other {# minuti}} left",
   "time_remaining.moments": "Restano pochi istanti",
   "time_remaining.seconds": "{number, plural, one {# secondo} other {# secondi}} left",
-  "timeline_hint.remote_resource_not_displayed": "{resource} da altri server non sono mostrati.",
-  "timeline_hint.resources.followers": "Seguaci",
-  "timeline_hint.resources.follows": "Segue",
-  "timeline_hint.resources.replies": "Alcune risposte",
-  "timeline_hint.resources.statuses": "Post meno recenti",
   "trends.counter_by_accounts": "{count, plural, one {{count} persona} other {{count} persone}} {days, plural, one {nell'ultimo giorno} other {negli ultimi {days} giorni}}",
   "trends.trending_now": "Ora in tendenza",
   "ui.beforeunload": "La tua bozza andrà persa, se abbandoni Mastodon.",

app/javascript/mastodon/locales/ja.json

@@ -30,7 +30,6 @@
   "account.block_domain": "{domain}全体をブロック",
   "account.block_short": "ブロック",
   "account.blocked": "ブロック済み",
-  "account.browse_more_on_origin_server": "リモートで表示",
   "account.cancel_follow_request": "フォローリクエストの取り消し",
   "account.copy": "プロフィールへのリンクをコピー",
   "account.direct": "@{name}さんに非公開でメンション",
@@ -536,8 +535,6 @@
   "mute_modal.title": "ユーザーをミュートしますか？",
   "mute_modal.you_wont_see_mentions": "宛先に相手が入っている投稿も閲覧できなくなります。",
   "mute_modal.you_wont_see_posts": "相手はあなたの投稿を今までどおり閲覧できますが、あなたは相手の投稿を閲覧できなくなります。",
-  "name_and_others": "{count, plural, other {#人のユーザー}}と{name}",
-  "name_and_others_with_link": "<a>{count, plural, other {#人のユーザー}}</a>と{name}",
   "navigation_bar.about": "概要",
   "navigation_bar.advanced_interface": "上級者向けUIに戻る",
   "navigation_bar.antennas": "アンテナ",
@@ -892,8 +889,6 @@
   "status.favourites": "{count, plural, one {お気に入り} other {お気に入り}}",
   "status.featured_tags.add": "おすすめハッシュタグを追加",
   "status.filter": "この投稿をフィルターする",
-  "status.filtered": "フィルターされました",
-  "status.hide": "投稿を非表示",
   "status.history.created": "{name}さんが{date}に作成",
   "status.history.edited": "{name}さんが{date}に編集",
   "status.load_more": "もっと見る",
@@ -926,10 +921,7 @@
   "status.report": "@{name}さんを通報",
   "status.sensitive_warning": "閲覧注意",
   "status.share": "共有",
-  "status.show_filter_reason": "表示する",
-  "status.show_less": "隠す",
   "status.show_less_all": "全て隠す",
-  "status.show_more": "もっと見る",
   "status.show_more_all": "全て見る",
   "status.show_original": "原文を表示",
   "status.title.with_attachments": "{user}さんの投稿 {attachmentCount, plural, other {({attachmentCount}件のメディア)}}",
@@ -948,11 +940,6 @@
   "time_remaining.minutes": "残り{number}分",
   "time_remaining.moments": "まもなく終了",
   "time_remaining.seconds": "残り{number}秒",
-  "timeline_hint.remote_resource_not_displayed": "他のサーバーの{resource}は表示されません。",
-  "timeline_hint.resources.followers": "フォロワー",
-  "timeline_hint.resources.follows": "フォロー",
-  "timeline_hint.resources.replies": "返信の一部",
-  "timeline_hint.resources.statuses": "以前の投稿",
   "trends.counter_by_accounts": "過去{days, plural, one {{days}日} other {{days}日}}に{count, plural, one {{counter}人} other {{counter} 人}}",
   "trends.trending_now": "トレンドタグ",
   "ui.beforeunload": "Mastodonから離れると送信前の投稿は失われます。",

app/javascript/mastodon/locales/ka.json

@@ -224,7 +224,6 @@
   "status.delete": "წაშლა",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "ჩართვა",
-  "status.filtered": "ფილტრირებული",
   "status.load_more": "მეტის ჩატვირთვა",
   "status.media_hidden": "მედია დამალულია",
   "status.mention": "ასახელე @{name}",
@@ -244,16 +243,13 @@
   "status.report": "დაარეპორტე @{name}",
   "status.sensitive_warning": "მგრძნობიარე კონტენტი",
   "status.share": "გაზიარება",
-  "status.show_less": "აჩვენე ნაკლები",
   "status.show_less_all": "აჩვენე ნაკლები ყველაზე",
-  "status.show_more": "აჩვენე მეტი",
   "status.show_more_all": "აჩვენე მეტი ყველაზე",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.unmute_conversation": "საუბარზე გაჩუმების მოშორება",
   "status.unpin": "პროფილიდან პინის მოშორება",
   "tabs_bar.home": "სახლი",
   "tabs_bar.notifications": "შეტყობინებები",
-  "timeline_hint.resources.statuses": "Older toots",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "ui.beforeunload": "თქვენი დრაფტი გაუქმდება თუ დატოვებთ მასტოდონს.",
   "upload_area.title": "გადმოწიეთ და ჩააგდეთ ასატვირთათ",

app/javascript/mastodon/locales/kab.json

@@ -15,7 +15,6 @@
   "account.block_domain": "Ffer kra i d-yekkan seg {domain}",
   "account.block_short": "Sewḥel",
   "account.blocked": "Yettusewḥel",
-  "account.browse_more_on_origin_server": "Snirem ugar deg umeɣnu aneẓli",
   "account.cancel_follow_request": "Sefsex taḍfart",
   "account.copy": "Nɣel assaɣ ɣer umaɣnu",
   "account.direct": "Bder-d @{name} weḥd-s",
@@ -585,8 +584,6 @@
   "status.favourite": "Amenyaf",
   "status.favourites": "{count, plural, one {n usmenyaf} other {n ismenyafen}}",
   "status.filter": "Sizdeg tassufeɣt-a",
-  "status.filtered": "Yettwasizdeg",
-  "status.hide": "Ffer tasuffeɣt",
   "status.history.created": "Yerna-t {name} {date}",
   "status.history.edited": "Ibeddel-it {name} {date}",
   "status.load_more": "Sali ugar",
@@ -613,10 +610,7 @@
   "status.report": "Cetki ɣef @{name}",
   "status.sensitive_warning": "Agbur amḥulfu",
   "status.share": "Bḍu",
-  "status.show_filter_reason": "Ssken-d akken yebɣu yili",
-  "status.show_less": "Ssken-d drus",
   "status.show_less_all": "Semẓi akk tisuffɣin",
-  "status.show_more": "Ssken-d ugar",
   "status.show_more_all": "Ẓerr ugar lebda",
   "status.show_original": "Sken aɣbalu",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
@@ -632,11 +626,6 @@
   "time_remaining.minutes": "Mazal {number, plural, one {# n tesdat} other {# n tesdatin}}",
   "time_remaining.moments": "Akuden i d-yeqqimen",
   "time_remaining.seconds": "Mazal {number, plural, one {# n tasint} other {# n tsinin}} id yugran",
-  "timeline_hint.remote_resource_not_displayed": "{resource} seg yiqeddacen-nniḍen ur d-ttwaskanent ara.",
-  "timeline_hint.resources.followers": "Imeḍfaṛen",
-  "timeline_hint.resources.follows": "T·Yeṭafaṛ",
-  "timeline_hint.resources.replies": "Kra tririyin",
-  "timeline_hint.resources.statuses": "Tisuffaɣ tiqdimin",
   "trends.counter_by_accounts": "{count, plural, one {{counter} wemdan} other {{counter} medden}} deg {days, plural, one {ass} other {{days} wussan}} iɛeddan",
   "trends.trending_now": "Ayen mucaɛen tura",
   "ui.beforeunload": "Arewway-ik·im ad iruḥ ma yella tefeɣ-d deg Maṣṭudun.",

app/javascript/mastodon/locales/kk.json

@@ -18,7 +18,6 @@
   "account.block_domain": "{domain} доменін бұғаттау",
   "account.block_short": "Бұғаттау",
   "account.blocked": "Бұғатталған",
-  "account.browse_more_on_origin_server": "Бастапқы профильден шолу",
   "account.cancel_follow_request": "Withdraw follow request",
   "account.disable_notifications": "@{name} постары туралы ескертпеу",
   "account.domain_blocked": "Домен бұғатталған",
@@ -318,7 +317,6 @@
   "status.detailed_status": "Толық пікірталас көрінісі",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "Embеd",
-  "status.filtered": "Фильтрленген",
   "status.load_more": "Тағы әкел",
   "status.media_hidden": "Жабық медиа",
   "status.mention": "Аталым @{name}",
@@ -340,9 +338,7 @@
   "status.report": "Шағым @{name}",
   "status.sensitive_warning": "Нәзік контент",
   "status.share": "Бөлісу",
-  "status.show_less": "Аздап көрсет",
   "status.show_less_all": "Бәрін аздап көрсет",
-  "status.show_more": "Толығырақ",
   "status.show_more_all": "Бәрін толығымен",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.unmute_conversation": "Пікірталасты үнсіз қылмау",
@@ -354,10 +350,6 @@
   "time_remaining.minutes": "{number, plural, one {# минут} other {# минут}}",
   "time_remaining.moments": "Қалған уақыт",
   "time_remaining.seconds": "{number, plural, one {# секунд} other {# секунд}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} басқа серверлерде көрсетілмейді.",
-  "timeline_hint.resources.followers": "Оқырман",
-  "timeline_hint.resources.follows": "Жазылым",
-  "timeline_hint.resources.statuses": "Ескі посттары",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "trends.trending_now": "Тренд тақырыптар",
   "ui.beforeunload": "Mastodon желісінен шықсаңыз, нобайыңыз сақталмайды.",

app/javascript/mastodon/locales/kn.json

@@ -101,7 +101,6 @@
   "status.pinned": "Pinned toot",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
-  "timeline_hint.resources.statuses": "Older toots",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",

app/javascript/mastodon/locales/ko.json

@@ -19,7 +19,6 @@
   "account.block_domain": "{domain} 도메인 차단",
   "account.block_short": "차단",
   "account.blocked": "차단함",
-  "account.browse_more_on_origin_server": "원본 프로필에서 더 탐색하기",
   "account.cancel_follow_request": "팔로우 취소",
   "account.copy": "프로필 링크 복사",
   "account.direct": "@{name} 님에게 개인적으로 멘션",
@@ -349,6 +348,14 @@
   "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": "이 프로필의 게시물은 일부 누락되었을 수 있습니다.",
+  "hints.profiles.see_more_followers": "{domain}에서 더 많은 팔로워 보기",
+  "hints.profiles.see_more_follows": "{domain}에서 더 많은 팔로우 보기",
+  "hints.profiles.see_more_posts": "{domain}에서 더 많은 게시물 보기",
+  "hints.threads.replies_may_be_missing": "다른 서버의 답글은 일부 누락되었을 수 있습니다.",
+  "hints.threads.see_more": "{domain}에서 더 많은 답글 보기",
   "home.column_settings.show_reblogs": "부스트 표시",
   "home.column_settings.show_replies": "답글 표시",
   "home.hide_announcements": "공지사항 숨기기",
@@ -456,8 +463,6 @@
   "mute_modal.title": "사용자를 뮤트할까요?",
   "mute_modal.you_wont_see_mentions": "그를 멘션하는 게시물을 더는 보지 않게 됩니다.",
   "mute_modal.you_wont_see_posts": "내가 작성한 게시물을 볼 수는 있지만, 나는 그가 작성한 것을 보지 않게 됩니다.",
-  "name_and_others": "{name} 외 {count, plural, other {# 명}}",
-  "name_and_others_with_link": "{name} 외 <a>{count, plural, other {# 명}}</a>",
   "navigation_bar.about": "정보",
   "navigation_bar.advanced_interface": "고급 웹 인터페이스에서 열기",
   "navigation_bar.blocks": "차단한 사용자",
@@ -775,8 +780,6 @@
   "status.favourite": "좋아요",
   "status.favourites": "{count, plural, other {좋아요}}",
   "status.filter": "이 게시물을 필터",
-  "status.filtered": "필터로 걸러짐",
-  "status.hide": "게시물 숨기기",
   "status.history.created": "{name} 님이 {date}에 처음 게시함",
   "status.history.edited": "{name} 님이 {date}에 수정함",
   "status.load_more": "더 보기",
@@ -804,10 +807,7 @@
   "status.report": "@{name} 신고하기",
   "status.sensitive_warning": "민감한 내용",
   "status.share": "공유",
-  "status.show_filter_reason": "그냥 표시하기",
-  "status.show_less": "접기",
   "status.show_less_all": "모두 접기",
-  "status.show_more": "펼치기",
   "status.show_more_all": "모두 펼치기",
   "status.show_original": "원본 보기",
   "status.title.with_attachments": "{user} 님이 {attachmentCount, plural, one {첨부파일} other {{attachmentCount}개의 첨부파일}}과 함께 게시함",
@@ -826,11 +826,6 @@
   "time_remaining.minutes": "{number} 분 남음",
   "time_remaining.moments": "남은 시간",
   "time_remaining.seconds": "{number} 초 남음",
-  "timeline_hint.remote_resource_not_displayed": "다른 서버의 {resource} 표시할 수 없습니다.",
-  "timeline_hint.resources.followers": "팔로워는",
-  "timeline_hint.resources.follows": "팔로우는",
-  "timeline_hint.resources.replies": "몇몇 답글은",
-  "timeline_hint.resources.statuses": "이전 게시물은",
   "trends.counter_by_accounts": "이전 {days}일 동안 {counter} 명의 사용자",
   "trends.trending_now": "지금 유행 중",
   "ui.beforeunload": "지금 나가면 저장되지 않은 항목을 잃게 됩니다.",

app/javascript/mastodon/locales/ku.json

@@ -17,7 +17,6 @@
   "account.block": "@{name} asteng bike",
   "account.block_domain": "Navpera {domain} asteng bike",
   "account.blocked": "Astengkirî",
-  "account.browse_more_on_origin_server": "Li pelên resen bêtir bigere",
   "account.cancel_follow_request": "Daxwaza şopandinê vekişîne",
   "account.direct": "Bi taybetî qale @{name} bike",
   "account.disable_notifications": "Êdî min agahdar neke gava @{name} diweşîne",
@@ -502,8 +501,6 @@
   "status.edited_x_times": "{count, plural, one {{count} car} other {{count} car}} hate serrastkirin",
   "status.embed": "Bi cih bike",
   "status.filter": "Vê şandiyê parzûn bike",
-  "status.filtered": "Parzûnkirî",
-  "status.hide": "Şandiyê veşêre",
   "status.history.created": "{name} {date} afirand",
   "status.history.edited": "{name} {date} serrast kir",
   "status.load_more": "Bêtir bar bike",
@@ -528,10 +525,7 @@
   "status.report": "@{name} ragihîne",
   "status.sensitive_warning": "Naveroka hestiyarî",
   "status.share": "Parve bike",
-  "status.show_filter_reason": "Bi her awayî nîşan bide",
-  "status.show_less": "Kêmtir nîşan bide",
   "status.show_less_all": "Ji bo hemîyan kêmtir nîşan bide",
-  "status.show_more": "Bêtir nîşan bide",
   "status.show_more_all": "Bêtir nîşan bide bo hemûyan",
   "status.show_original": "A resen nîşan bide",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
@@ -549,10 +543,6 @@
   "time_remaining.minutes": "{number, plural, one {# xulek} other {# xulek}} maye",
   "time_remaining.moments": "Demên mayî",
   "time_remaining.seconds": "{number, plural, one {# çirke} other {# çirke}} maye",
-  "timeline_hint.remote_resource_not_displayed": "{resource} Ji rajekerên din nayê dîtin.",
-  "timeline_hint.resources.followers": "Şopîner",
-  "timeline_hint.resources.follows": "Dişopîne",
-  "timeline_hint.resources.statuses": "Şandiyên kevn",
   "trends.counter_by_accounts": "{count, plural, one {{counter} kes} other {{counter} kes}} berî {days, plural, one {roj} other {{days} roj}}",
   "trends.trending_now": "Rojev",
   "ui.beforeunload": "Ger ji Mastodonê veketi wê reşnivîsa te jî winda bibe.",

app/javascript/mastodon/locales/kw.json

@@ -6,7 +6,6 @@
   "account.block": "Lettya @{name}",
   "account.block_domain": "Lettya gorfarth {domain}",
   "account.blocked": "Lettys",
-  "account.browse_more_on_origin_server": "Peuri moy y'n profil derowel",
   "account.cancel_follow_request": "Withdraw follow request",
   "account.disable_notifications": "Hedhi ow gwarnya pan wra @{name} postya",
   "account.domain_blocked": "Gorfarth lettys",
@@ -320,7 +319,6 @@
   "status.detailed_status": "Gwel kesklapp a-vanyl",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "Staga",
-  "status.filtered": "Sidhlys",
   "status.load_more": "Karga moy",
   "status.media_hidden": "Myski kudhys",
   "status.mention": "Meneges @{name}",
@@ -342,9 +340,7 @@
   "status.report": "Reportya @{name}",
   "status.sensitive_warning": "Dalgh tender",
   "status.share": "Kevrenna",
-  "status.show_less": "Diskwedhes le",
   "status.show_less_all": "Diskwedhes le rag puptra",
-  "status.show_more": "Diskwedhes moy",
   "status.show_more_all": "Diskwedhes moy rag puptra",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "status.unmute_conversation": "Antawhe kesklapp",
@@ -356,10 +352,6 @@
   "time_remaining.minutes": "{number, plural, one {# vynysen} other {# a vynysennow}} gesys",
   "time_remaining.moments": "Polsyow gesys",
   "time_remaining.seconds": "{number, plural, one {# eylen} other {# eylen}} gesys",
-  "timeline_hint.remote_resource_not_displayed": "Nyns yw {resource} a'n leurennow erel displetys.",
-  "timeline_hint.resources.followers": "Holyoryon",
-  "timeline_hint.resources.follows": "Holyansow",
-  "timeline_hint.resources.statuses": "Kottha postow",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "trends.trending_now": "Tuedhegus lemmyn",
   "ui.beforeunload": "Agas kysnkrif a vydh kellys mar kwrewgh diberth a Mastodon.",

app/javascript/mastodon/locales/la.json

@@ -234,8 +234,6 @@
   "time_remaining.hours": "{number, plural, one {# hora} other {# horae}} restant",
   "time_remaining.minutes": "{number, plural, one {# minutum} other {# minuta}} restant",
   "time_remaining.seconds": "{number, plural, one {# secundum} other {# secunda}} restant",
-  "timeline_hint.remote_resource_not_displayed": "{resource} ab aliīs servīs nōn ostenduntur.",
-  "timeline_hint.resources.statuses": "Contributa pristina",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persōna} other {{counter} persōnae}} in {days, plural, one {diē prīdiē} other {diēbus praeteritīs {days}}}",
   "ui.beforeunload": "Si Mastodon discesseris, tua epitome peribit.",
   "units.short.billion": "{count} millia milionum",

app/javascript/mastodon/locales/lad.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Bloka el domeno {domain}",
   "account.block_short": "Bloka",
   "account.blocked": "Blokado",
-  "account.browse_more_on_origin_server": "Ve mas en el profil orijinal",
   "account.cancel_follow_request": "Anula solisitud de segir",
   "account.copy": "Kopia atadijo de profil",
   "account.direct": "Enmenta a @{name} en privado",
@@ -705,8 +704,6 @@
   "status.embed": "Inkrusta",
   "status.favourite": "Te plaze",
   "status.filter": "Filtra esta publikasyon",
-  "status.filtered": "Filtrado",
-  "status.hide": "Eskonde publikasyon",
   "status.history.created": "{name} kriyo {date}",
   "status.history.edited": "{name} edito {date}",
   "status.load_more": "Eskarga mas",
@@ -733,10 +730,7 @@
   "status.report": "Raporta @{name}",
   "status.sensitive_warning": "Kontenido sensivle",
   "status.share": "Partaja",
-  "status.show_filter_reason": "Amostra entanto",
-  "status.show_less": "Amostra manko",
   "status.show_less_all": "Amostra manko para todo",
-  "status.show_more": "Amostra mas",
   "status.show_more_all": "Amostra mas para todo",
   "status.show_original": "Amostra orijinal",
   "status.title.with_attachments": "{user} publiko {attachmentCount, plural, one {un anekso} other {{attachmentCount} aneksos}}",
@@ -755,11 +749,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuto restante} other {# minutos restantes}}",
   "time_remaining.moments": "Momentos restantes",
   "time_remaining.seconds": "{number, plural, one {# sigundo restante} other {# sigundos restantes}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} de otros sirvidores no se amostran.",
-  "timeline_hint.resources.followers": "Suivantes",
-  "timeline_hint.resources.follows": "Segidos",
-  "timeline_hint.resources.replies": "Algunas repuestas",
-  "timeline_hint.resources.statuses": "Publikasyones mas viejas",
   "trends.counter_by_accounts": "{count, plural, one {{counter} kuento} other {{counter} kuentos}} en los ultimos {days, plural, one {diyas} other {{days} diyas}}",
   "trends.trending_now": "Trendes",
   "ui.beforeunload": "La publikasyon ke estas eskriviendo se pedrera si sales de Mastodon.",

app/javascript/mastodon/locales/lt.json

@@ -1,11 +1,11 @@
 {
   "about.blocks": "Prižiūrimi serveriai",
-  "about.contact": "Kontaktuoti:",
+  "about.contact": "Kontaktai:",
   "about.disclaimer": "„Mastodon“ – tai nemokama atvirojo kodo programinė įranga ir „Mastodon“ gGmbH prekės ženklas.",
   "about.domain_blocks.no_reason_available": "Priežastis nepateikta",
   "about.domain_blocks.preamble": "„Mastodon“ paprastai leidžia peržiūrėti turinį ir bendrauti su naudotojais iš bet kurio kito fediverse esančio serverio. Šios yra išimtys, kurios buvo padarytos šiame konkrečiame serveryje.",
-  "about.domain_blocks.silenced.explanation": "Paprastai nematysi profilių ir turinio iš šio serverio, nebent jį aiškiai ieškosi arba pasirinksi jį sekdamas (-a).",
+  "about.domain_blocks.silenced.explanation": "Paprastai nematysi profilių ir turinio iš šio serverio, nebent jį aiškiai ieškosi arba pasirinksi jį sekant.",
-  "about.domain_blocks.silenced.title": "Ribota",
+  "about.domain_blocks.silenced.title": "Apribota",
   "about.domain_blocks.suspended.explanation": "Jokie duomenys iš šio serverio nebus apdorojami, saugomi ar keičiami, todėl bet kokia sąveika ar bendravimas su šio serverio naudotojais bus neįmanomas.",
   "about.domain_blocks.suspended.title": "Pristabdyta",
   "about.not_available": "Ši informacija nebuvo pateikta šiame serveryje.",
@@ -16,15 +16,14 @@
   "account.badges.bot": "Automatizuotas",
   "account.badges.group": "Grupė",
   "account.block": "Blokuoti @{name}",
-  "account.block_domain": "Blokuoti domeną {domain}",
+  "account.block_domain": "Blokuoti serverį {domain}",
   "account.block_short": "Blokuoti",
   "account.blocked": "Užblokuota",
-  "account.browse_more_on_origin_server": "Naršyti daugiau originaliame profilyje",
   "account.cancel_follow_request": "Atšaukti sekimą",
   "account.copy": "Kopijuoti nuorodą į profilį",
   "account.direct": "Privačiai paminėti @{name}",
   "account.disable_notifications": "Nustoti man pranešti, kai @{name} paskelbia",
-  "account.domain_blocked": "Užblokuotas domenas",
+  "account.domain_blocked": "Užblokuotas serveris",
   "account.edit_profile": "Redaguoti profilį",
   "account.enable_notifications": "Pranešti man, kai @{name} paskelbia",
   "account.endorse": "Rodyti profilyje",
@@ -40,7 +39,7 @@
   "account.following_counter": "{count, plural, one {{counter} sekimas} few {{counter} sekimai} many {{counter} sekimo} other {{counter} sekimų}}",
   "account.follows.empty": "Šis naudotojas dar nieko neseka.",
   "account.go_to_profile": "Eiti į profilį",
-  "account.hide_reblogs": "Slėpti pakėlimus iš @{name}",
+  "account.hide_reblogs": "Slėpti pasidalinimus iš @{name}",
   "account.in_memoriam": "Atminimui.",
   "account.joined_short": "Prisijungė",
   "account.languages": "Keisti prenumeruojamas kalbas",
@@ -55,24 +54,24 @@
   "account.muted": "Nutildytas",
   "account.mutual": "Bendri",
   "account.no_bio": "Nėra pateikto aprašymo.",
-  "account.open_original_page": "Atidaryti originalinį puslapį",
+  "account.open_original_page": "Atidaryti originalų puslapį",
   "account.posts": "Įrašai",
   "account.posts_with_replies": "Įrašai ir atsakymai",
   "account.report": "Pranešti apie @{name}",
-  "account.requested": "Laukiama patvirtinimo. Spustelėk, jei nori atšaukti sekimo prašymą",
+  "account.requested": "Laukiama patvirtinimo. Spustelėk, kad atšauktum sekimo prašymą",
   "account.requested_follow": "{name} paprašė tave sekti",
   "account.share": "Bendrinti @{name} profilį",
-  "account.show_reblogs": "Rodyti pakėlimus iš @{name}",
+  "account.show_reblogs": "Rodyti pasidalinimus iš @{name}",
   "account.statuses_counter": "{count, plural, one {{counter} įrašas} few {{counter} įrašai} many {{counter} įrašo} other {{counter} įrašų}}",
   "account.unblock": "Atblokuoti @{name}",
-  "account.unblock_domain": "Atblokuoti domeną {domain}",
+  "account.unblock_domain": "Atblokuoti serverį {domain}",
   "account.unblock_short": "Atblokuoti",
   "account.unendorse": "Nerodyti profilyje",
   "account.unfollow": "Nebesekti",
   "account.unmute": "Atšaukti nutildymą @{name}",
   "account.unmute_notifications_short": "Atšaukti nutildymą pranešimams",
   "account.unmute_short": "Atšaukti nutildymą",
-  "account_note.placeholder": "Spustelėk norint pridėti pastabą.",
+  "account_note.placeholder": "Spustelėk, kad pridėtum pastabą.",
   "admin.dashboard.daily_retention": "Naudotojų pasilikimo rodiklis pagal dieną po registracijos",
   "admin.dashboard.monthly_retention": "Naudotojų pasilikimo rodiklis pagal mėnesį po registracijos",
   "admin.dashboard.retention.average": "Vidurkis",
@@ -82,8 +81,8 @@
   "admin.impact_report.instance_followers": "Sekėjai, kuriuos prarastų mūsų naudotojai",
   "admin.impact_report.instance_follows": "Sekėjai, kuriuos prarastų jų naudotojai",
   "admin.impact_report.title": "Poveikio apibendrinimas",
-  "alert.rate_limited.message": "Bandyk vėliau po {retry_time, time, medium}.",
+  "alert.rate_limited.message": "Bandyk vėl po {retry_time, time, medium}.",
-  "alert.rate_limited.title": "Sparta ribota.",
+  "alert.rate_limited.title": "Sparta apribota.",
   "alert.unexpected.message": "Įvyko netikėta klaida.",
   "alert.unexpected.title": "Ups!",
   "announcement.announcement": "Skelbimas",
@@ -94,7 +93,7 @@
   "block_modal.show_more": "Rodyti daugiau",
   "block_modal.they_cant_mention": "Jie negali tave paminėti ar sekti.",
   "block_modal.they_cant_see_posts": "Jie negali matyti tavo įrašus, o tu nematysi jų.",
-  "block_modal.they_will_know": "Jie mato, kad yra užblokuoti.",
+  "block_modal.they_will_know": "Jie gali matyti, kad yra užblokuoti.",
   "block_modal.title": "Blokuoti naudotoją?",
   "block_modal.you_wont_see_mentions": "Nematysi įrašus, kuriuose jie paminimi.",
   "boost_modal.combo": "Galima paspausti {combo}, kad praleisti tai kitą kartą",
@@ -104,24 +103,24 @@
   "bundle_column_error.network.body": "Bandant užkrauti šį puslapį įvyko klaida. Tai galėjo atsitikti dėl laikinos tavo interneto ryšio arba šio serverio problemos.",
   "bundle_column_error.network.title": "Tinklo klaida",
   "bundle_column_error.retry": "Bandyti dar kartą",
-  "bundle_column_error.return": "Grįžti į pagrindinį",
+  "bundle_column_error.return": "Atgal į pagrindinį",
-  "bundle_column_error.routing.body": "Prašyto puslapio nepavyko rasti. Ar esi tikras (-a), kad adreso juostoje nurodytas URL adresas yra teisingas?",
+  "bundle_column_error.routing.body": "Paprašyto puslapio nepavyko rasti. Ar esi tikras (-a), kad adreso juostoje nurodytas URL adresas yra teisingas?",
   "bundle_column_error.routing.title": "404",
   "bundle_modal_error.close": "Uždaryti",
-  "bundle_modal_error.message": "Kraunant šį komponentą kažkas nepavyko.",
+  "bundle_modal_error.message": "Įkeliant šį komponentą kažkas nutiko ne taip.",
   "bundle_modal_error.retry": "Bandyti dar kartą",
-  "closed_registrations.other_server_instructions": "Kadangi Mastodon yra decentralizuotas, gali susikurti paskyrą kitame serveryje ir vis tiek bendrauti su šiuo serveriu.",
+  "closed_registrations.other_server_instructions": "Kadangi „Mastodon“ yra decentralizuotas, gali susikurti paskyrą kitame serveryje ir vis tiek bendrauti su šiuo serveriu.",
-  "closed_registrations_modal.description": "Sukurti paskyrą {domain} šiuo metu neįmanoma, bet nepamiršk, kad norint naudotis Mastodon nebūtina turėti paskyrą domene {domain}.",
+  "closed_registrations_modal.description": "Sukurti paskyrą serveryje {domain} šiuo metu neįmanoma, bet nepamiršk, kad norint naudotis „Mastodon“ nebūtina turėti paskyrą serveryje {domain}.",
   "closed_registrations_modal.find_another_server": "Rasti kitą serverį",
-  "closed_registrations_modal.preamble": "Mastodon yra decentralizuotas, todėl nesvarbu, kur susikursi paskyrą, galėsi sekti ir bendrauti su bet kuriuo šiame serveryje esančiu asmeniu. Jį gali net savarankiškai talpinti!",
+  "closed_registrations_modal.preamble": "„Mastodon“ yra decentralizuotas, todėl nesvarbu, kur susikursi paskyrą, galėsi sekti ir bendrauti su bet kuriuo šiame serveryje esančiu asmeniu. Jį gali net savarankiškai talpinti!",
-  "closed_registrations_modal.title": "Užsiregistruoti Mastodon",
+  "closed_registrations_modal.title": "Užsiregistruoti platformoje „Mastodon“",
   "column.about": "Apie",
   "column.blocks": "Užblokuoti naudotojai",
   "column.bookmarks": "Žymės",
   "column.community": "Vietinė laiko skalė",
   "column.direct": "Privatūs paminėjimai",
   "column.directory": "Naršyti profilius",
-  "column.domain_blocks": "Užblokuoti domenai",
+  "column.domain_blocks": "Užblokuoti serveriai",
   "column.favourites": "Mėgstami",
   "column.firehose": "Tiesioginiai srautai",
   "column.follow_requests": "Sekimo prašymai",
@@ -131,15 +130,15 @@
   "column.notifications": "Pranešimai",
   "column.pins": "Prisegti įrašai",
   "column.public": "Federacinė laiko skalė",
-  "column_back_button.label": "Grįžti",
+  "column_back_button.label": "Atgal",
   "column_header.hide_settings": "Slėpti nustatymus",
-  "column_header.moveLeft_settings": "Judinti stulpelį į kairę",
+  "column_header.moveLeft_settings": "Perkelti stulpelį į kairę",
-  "column_header.moveRight_settings": "Judinti stulpelį į dešinę",
+  "column_header.moveRight_settings": "Perkelti stulpelį į dešinę",
   "column_header.pin": "Prisegti",
   "column_header.show_settings": "Rodyti nustatymus",
   "column_header.unpin": "Atsegti",
   "column_subheading.settings": "Nustatymai",
-  "community.column_settings.local_only": "Tik vietinė",
+  "community.column_settings.local_only": "Tik vietinis",
   "community.column_settings.media_only": "Tik medija",
   "community.column_settings.remote_only": "Tik nuotolinis",
   "compose.language.change": "Keisti kalbą",
@@ -148,7 +147,7 @@
   "compose.published.open": "Atidaryti",
   "compose.saved.body": "Įrašas išsaugotas.",
   "compose_form.direct_message_warning_learn_more": "Sužinoti daugiau",
-  "compose_form.encryption_warning": "Mastodon įrašai nėra visapusiškai šifruojami. Per Mastodon nesidalyk jokia slapta informacija.",
+  "compose_form.encryption_warning": "„Mastodon“ įrašai nėra visapusiškai šifruojami. Per „Mastodon“ nesidalyk jokia slapta informacija.",
   "compose_form.hashtag_warning": "Šis įrašas nebus įtrauktas į jokį saitažodį, nes ji nėra vieša. Tik viešų įrašų galima ieškoti pagal saitažodį.",
   "compose_form.lock_disclaimer": "Tavo paskyra nėra {locked}. Bet kas gali sekti tave ir peržiūrėti tik sekėjams skirtus įrašus.",
   "compose_form.lock_disclaimer.lock": "užrakinta",
@@ -157,8 +156,8 @@
   "compose_form.poll.multiple": "Keli pasirinkimai",
   "compose_form.poll.option_placeholder": "{number} parinktis",
   "compose_form.poll.single": "Pasirinkti vieną",
-  "compose_form.poll.switch_to_multiple": "Keisti apklausą, kad būtų galima pasirinkti kelis pasirinkimus",
+  "compose_form.poll.switch_to_multiple": "Keisti apklausą, kad būtų leidžiama pasirinkti kelis pasirinkimus",
-  "compose_form.poll.switch_to_single": "Keisti apklausą, kad būtų galima pasirinkti vieną pasirinkimą",
+  "compose_form.poll.switch_to_single": "Keisti apklausą, kad būtų leidžiama pasirinkti vieną pasirinkimą",
   "compose_form.poll.type": "Stilius",
   "compose_form.publish": "Skelbti",
   "compose_form.publish_form": "Naujas įrašas",
@@ -173,10 +172,10 @@
   "confirmations.delete.message": "Ar tikrai nori ištrinti šį įrašą?",
   "confirmations.delete.title": "Ištrinti įrašą?",
   "confirmations.delete_list.confirm": "Ištrinti",
-  "confirmations.delete_list.message": "Ar tikrai nori visam laikui ištrinti šį sąrašą?",
+  "confirmations.delete_list.message": "Ar tikrai nori negrįžtamai ištrinti šį sąrašą?",
   "confirmations.delete_list.title": "Ištrinti sąrašą?",
   "confirmations.discard_edit_media.confirm": "Atmesti",
-  "confirmations.discard_edit_media.message": "Turi neišsaugotų medijos aprašymo ar peržiūros pakeitimų, vis tiek juos atmesti?",
+  "confirmations.discard_edit_media.message": "Turi neišsaugotų medijos aprašymo ar peržiūros pakeitimų. Vis tiek juos atmesti?",
   "confirmations.edit.confirm": "Redaguoti",
   "confirmations.edit.message": "Redaguojant dabar, bus perrašyta šiuo metu kuriama žinutė. Ar tikrai nori tęsti?",
   "confirmations.edit.title": "Perrašyti įrašą?",
@@ -184,8 +183,8 @@
   "confirmations.logout.message": "Ar tikrai nori atsijungti?",
   "confirmations.logout.title": "Atsijungti?",
   "confirmations.mute.confirm": "Nutildyti",
-  "confirmations.redraft.confirm": "Ištrinti ir perrašyti",
+  "confirmations.redraft.confirm": "Ištrinti ir iš naujo parengti",
-  "confirmations.redraft.message": "Ar tikrai nori ištrinti šį įrašą ir parašyti jį iš naujo? Bus prarastos mėgstamai ir pakėlimai, o atsakymai į originalinį įrašą taps liekamojais.",
+  "confirmations.redraft.message": "Ar tikrai nori ištrinti šį įrašą ir parengti jį iš naujo? Bus prarasti mėgstami ir pasidalinimai, o atsakymai į originalų įrašą bus panaikinti.",
   "confirmations.redraft.title": "Ištrinti ir iš naujo parengti įrašą?",
   "confirmations.reply.confirm": "Atsakyti",
   "confirmations.reply.message": "Atsakant dabar, bus perrašyta šiuo metu kuriama žinutė. Ar tikrai nori tęsti?",
@@ -193,6 +192,8 @@
   "confirmations.unfollow.confirm": "Nebesekti",
   "confirmations.unfollow.message": "Ar tikrai nori nebesekti {name}?",
   "confirmations.unfollow.title": "Nebesekti naudotoją?",
+  "content_warning.hide": "Slėpti įrašą",
+  "content_warning.show": "Rodyti vis tiek",
   "conversation.delete": "Ištrinti pokalbį",
   "conversation.mark_as_read": "Žymėti kaip skaitytą",
   "conversation.open": "Peržiūrėti pokalbį",
@@ -203,33 +204,33 @@
   "directory.federated": "Iš žinomų fediversų",
   "directory.local": "Tik iš {domain}",
   "directory.new_arrivals": "Nauji atvykėliai",
-  "directory.recently_active": "Neseniai aktyvus (-i)",
+  "directory.recently_active": "Neseniai aktyvus",
   "disabled_account_banner.account_settings": "Paskyros nustatymai",
-  "disabled_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu yra išjungta.",
+  "disabled_account_banner.text": "Tavo paskyra {disabledAccount} šiuo metu išjungta.",
   "dismissable_banner.community_timeline": "Tai – naujausi vieši įrašai iš žmonių, kurių paskyros talpinamos {domain}.",
   "dismissable_banner.dismiss": "Atmesti",
   "dismissable_banner.explore_links": "Tai – naujienos, kuriomis šiandien daugiausiai bendrinamasi socialiniame žiniatinklyje. Naujesnės naujienų istorijos, kurias paskelbė daugiau skirtingų žmonių, vertinamos aukščiau.",
-  "dismissable_banner.explore_statuses": "Tai – įrašai iš viso socialinio žiniatinklio, kurie šiandien sulaukia daug dėmesio. Naujesni įrašai, turintys daugiau pakėlimų ir mėgstamų, vertinami aukščiau.",
+  "dismissable_banner.explore_statuses": "Tai – įrašai iš viso socialinio žiniatinklio, kurie šiandien sulaukia daug dėmesio. Naujesni įrašai, turintys daugiau pasidalinimų ir mėgstamų, vertinami aukščiau.",
   "dismissable_banner.explore_tags": "Tai – saitažodžiai, kurie šiandien sulaukia daug dėmesio socialiniame žiniatinklyje. Saitažodžiai, kuriuos naudoja daugiau skirtingų žmonių, vertinami aukščiau.",
   "dismissable_banner.public_timeline": "Tai – naujausi vieši įrašai iš žmonių socialiniame žiniatinklyje, kuriuos seka {domain} žmonės.",
   "domain_block_modal.block": "Blokuoti serverį",
-  "domain_block_modal.block_account_instead": "Blokuoti {name} vietoj to",
+  "domain_block_modal.block_account_instead": "Blokuoti @{name} vietoj to",
-  "domain_block_modal.they_can_interact_with_old_posts": "Žmonės iš šio serverio gali sąveikauti su tavo senomis įrašomis.",
+  "domain_block_modal.they_can_interact_with_old_posts": "Žmonės iš šio serverio gali bendrauti su tavo senomis įrašomis.",
   "domain_block_modal.they_cant_follow": "Niekas iš šio serverio negali tavęs sekti.",
   "domain_block_modal.they_wont_know": "Jie nežinos, kad buvo užblokuoti.",
-  "domain_block_modal.title": "Blokuoti domeną?",
+  "domain_block_modal.title": "Blokuoti serverį?",
   "domain_block_modal.you_will_lose_followers": "Visi tavo sekėjai iš šio serverio bus pašalinti.",
   "domain_block_modal.you_wont_see_posts": "Nematysi naudotojų įrašų ar pranešimų šiame serveryje.",
-  "domain_pill.activitypub_lets_connect": "Tai leidžia tau prisijungti ir bendrauti su žmonėmis ne tik Mastodon, bet ir įvairiose socialinėse programėlėse.",
+  "domain_pill.activitypub_lets_connect": "Tai leidžia tau prisijungti ir bendrauti su žmonėmis ne tik „Mastodon“ platformoje, bet ir įvairiose socialinėse programėlėse.",
-  "domain_pill.activitypub_like_language": "ActivityPub – tai tarsi kalba, kuria Mastodon kalba su kitais socialiniais tinklais.",
+  "domain_pill.activitypub_like_language": "„ActivityPub“ – tai tarsi kalba, kuria „Mastodon“ kalba su kitais socialiniais tinklais.",
   "domain_pill.server": "Serveris",
   "domain_pill.their_handle": "Jų socialinis medijos vardas:",
   "domain_pill.their_server": "Jų skaitmeniniai namai, kuriuose saugomi visi jų įrašai.",
-  "domain_pill.their_username": "Jų unikalus identifikatorius jų serveryje. Skirtinguose serveriuose galima rasti naudotojų, turinčių tą patį naudotojo vardą.",
+  "domain_pill.their_username": "Jų unikalus identifikatorius jų serveryje. Skirtinguose serveriuose galima rasti naudotojų su tuo pačiu naudotojo vardu.",
   "domain_pill.username": "Naudotojo vardas",
   "domain_pill.whats_in_a_handle": "Kas yra socialiniame medijos varde?",
-  "domain_pill.who_they_are": "Kadangi socialines medijos vardai nurodo, kas žmogus yra ir kur jie yra, gali sąveikauti su žmonėmis visame socialiniame žiniatinklyje, kurį sudaro <button>ActivityPub veikiančios platformos</button>.",
+  "domain_pill.who_they_are": "Kadangi socialines medijos vardai pasako, kas ir kur jie yra, galima bendrauti su žmonėmis visame socialiniame žiniatinklyje, kurį sudaro <button>„ActivityPub“ veikiančios platformos</button>.",
-  "domain_pill.who_you_are": "Kadangi tavo socialinis medijos vardas nurodo, kas esi ir kur esi, žmonės gali sąveikauti su tavimi visame socialiniame tinkle, kurį sudaro <button>ActivityPub veikiančios platformos</button>.",
+  "domain_pill.who_you_are": "Kadangi tavo socialinis medijos vardas pasako, kas ir kur esi, žmonės gali bendrauti su tavimi visame socialiniame žiniatinklyje, kurį sudaro <button>„ActivityPub“ veikiančios platformos</button>.",
   "domain_pill.your_handle": "Tavo socialinis medijos vardas:",
   "domain_pill.your_server": "Tavo skaitmeniniai namai, kuriuose saugomi visi tavo įrašai. Nepatinka šis? Bet kada perkelk serverius ir atsivesk ir savo sekėjus.",
   "domain_pill.your_username": "Tavo unikalus identifikatorius šiame serveryje. Skirtinguose serveriuose galima rasti naudotojų su tuo pačiu naudotojo vardu.",
@@ -258,7 +259,7 @@
   "empty_column.bookmarked_statuses": "Dar neturi nė vienos įrašo pridėtos žymės. Kai vieną iš jų pridėsi į žymes, jis bus rodomas čia.",
   "empty_column.community": "Vietinė laiko skalė yra tuščia. Parašyk ką nors viešai, kad pradėtum sąveikauti.",
   "empty_column.direct": "Dar neturi jokių privačių paminėjimų. Kai išsiųsi arba gausi vieną iš jų, jis bus rodomas čia.",
-  "empty_column.domain_blocks": "Dar nėra užblokuotų domenų.",
+  "empty_column.domain_blocks": "Kol kas nėra užblokuotų serverių.",
   "empty_column.explore_statuses": "Šiuo metu niekas nėra tendencinga. Patikrink vėliau!",
   "empty_column.favourited_statuses": "Dar neturi mėgstamų įrašų. Kai vieną iš jų pamėgsi, jis bus rodomas čia.",
   "empty_column.favourites": "Šio įrašo dar niekas nepamėgo. Kai kas nors tai padarys, jie bus rodomi čia.",
@@ -300,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Naudok esamą kategoriją arba sukurk naują.",
   "filter_modal.select_filter.title": "Filtruoti šį įrašą",
   "filter_modal.title.status": "Filtruoti įrašą",
+  "filter_warning.matches_filter": "Atitinka filtrą „{title}“",
   "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",
@@ -349,6 +351,14 @@
   "hashtag.follow": "Sekti saitažodį",
   "hashtag.unfollow": "Nebesekti saitažodį",
   "hashtags.and_other": "…ir {count, plural, one {# daugiau} few {# daugiau} many {# daugiau}other {# daugiau}}",
+  "hints.profiles.followers_may_be_missing": "Sekėjai šiai profiliui gali būti nepateikti.",
+  "hints.profiles.follows_may_be_missing": "Sekimai šiai profiliui gali būti nepateikti.",
+  "hints.profiles.posts_may_be_missing": "Kai kurie įrašai iš šio profilio gali būti nepateikti.",
+  "hints.profiles.see_more_followers": "Žiūrėti daugiau sekėjų serveryje {domain}",
+  "hints.profiles.see_more_follows": "Žiūrėti daugiau sekimų serveryje {domain}",
+  "hints.profiles.see_more_posts": "Žiūrėti daugiau įrašų serveryje {domain}",
+  "hints.threads.replies_may_be_missing": "Atsakymai iš kitų serverių gali būti nepateikti.",
+  "hints.threads.see_more": "Žiūrėti daugiau atsakymų serveryje {domain}",
   "home.column_settings.show_reblogs": "Rodyti pakėlimus",
   "home.column_settings.show_replies": "Rodyti atsakymus",
   "home.hide_announcements": "Slėpti skelbimus",
@@ -456,8 +466,6 @@
   "mute_modal.title": "Nutildyti naudotoją?",
   "mute_modal.you_wont_see_mentions": "Nematysi įrašus, kuriuose jie paminimi.",
   "mute_modal.you_wont_see_posts": "Jie vis tiek gali matyti tavo įrašus, bet tu nematysi jų.",
-  "name_and_others": "{name} ir {count, plural, one {# kitas} few {# kiti} many {# kito} other {# kitų}}",
-  "name_and_others_with_link": "{name} ir <a>{count, plural, one {# kitas} few {# kiti} many {# kito} other {# kitų}}</a>",
   "navigation_bar.about": "Apie",
   "navigation_bar.advanced_interface": "Atidaryti išplėstinę žiniatinklio sąsają",
   "navigation_bar.blocks": "Užblokuoti naudotojai",
@@ -770,8 +778,6 @@
   "status.favourite": "Pamėgti",
   "status.favourites": "{count, plural, one {mėgstamas} few {mėgstamai} many {mėgstamų} other {mėgstamų}}",
   "status.filter": "Filtruoti šį įrašą",
-  "status.filtered": "Filtruota",
-  "status.hide": "Slėpti įrašą",
   "status.history.created": "{name} sukurta {date}",
   "status.history.edited": "{name} redaguota {date}",
   "status.load_more": "Krauti daugiau",
@@ -798,10 +804,7 @@
   "status.report": "Pranešti apie @{name}",
   "status.sensitive_warning": "Jautrus turinys",
   "status.share": "Bendrinti",
-  "status.show_filter_reason": "Rodyti vis tiek",
-  "status.show_less": "Rodyti mažiau",
   "status.show_less_all": "Rodyti mažiau visiems",
-  "status.show_more": "Rodyti daugiau",
   "status.show_more_all": "Rodyti daugiau visiems",
   "status.show_original": "Rodyti originalą",
   "status.title.with_attachments": "{user} paskelbė {attachmentCount, plural, one {priedą} few {{attachmentCount} priedus} many {{attachmentCount} priedo} other {{attachmentCount} priedų}}",
@@ -820,11 +823,6 @@
   "time_remaining.minutes": "liko {number, plural, one {# minutė} few {# minutės} many {# minutės} other {# minučių}}",
   "time_remaining.moments": "liko akimirkos",
   "time_remaining.seconds": "liko {number, plural, one {# sekundė} few {# sekundės} many {# sekundės} other {# sekundžių}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} iš kitų serverių nerodomi.",
-  "timeline_hint.resources.followers": "Sekėjai",
-  "timeline_hint.resources.follows": "Seka",
-  "timeline_hint.resources.replies": "Kai kurie atsakymai",
-  "timeline_hint.resources.statuses": "Senesni įrašai",
   "trends.counter_by_accounts": "{count, plural, one {{counter} žmogus} few {{counter} žmonės} many {{counter} žmogus} other {{counter} žmonių}} per {days, plural, one {dieną} few {{days} dienas} many {{days} dienas} other {{days} dienų}}",
   "trends.trending_now": "Tendencinga dabar",
   "ui.beforeunload": "Jei paliksi Mastodon, tavo juodraštis bus prarastas.",

app/javascript/mastodon/locales/lv.json

@@ -18,7 +18,6 @@
   "account.block_domain": "Bloķēt domēnu {domain}",
   "account.block_short": "Bloķēt",
   "account.blocked": "Bloķēts",
-  "account.browse_more_on_origin_server": "Pārlūkot vairāk sākotnējā profilā",
   "account.cancel_follow_request": "Atsaukt sekošanas pieprasījumu",
   "account.copy": "Ievietot saiti uz profilu starpliktuvē",
   "account.direct": "Pieminēt @{name} privāti",
@@ -655,8 +654,6 @@
   "status.favourite": "Izlasē",
   "status.favourites": "{count, plural, zero {izlasēs} one {izlasē} other {izlasēs}}",
   "status.filter": "Filtrē šo ziņu",
-  "status.filtered": "Filtrēts",
-  "status.hide": "Slēpt ierakstu",
   "status.history.created": "{name} izveidoja {date}",
   "status.history.edited": "{name} laboja {date}",
   "status.load_more": "Ielādēt vairāk",
@@ -684,10 +681,7 @@
   "status.report": "Ziņot par @{name}",
   "status.sensitive_warning": "Sensitīvs saturs",
   "status.share": "Kopīgot",
-  "status.show_filter_reason": "Tomēr rādīt",
-  "status.show_less": "Rādīt mazāk",
   "status.show_less_all": "Rādīt mazāk visiem",
-  "status.show_more": "Rādīt vairāk",
   "status.show_more_all": "Rādīt vairāk visiem",
   "status.show_original": "Rādīt oriģinālu",
   "status.title.with_attachments": "{user} publicējis {attachmentCount, plural, one {pielikumu} other {{attachmentCount} pielikumus}}",
@@ -706,10 +700,6 @@
   "time_remaining.minutes": "{number, plural, one {Atlikusi # minūte} other {Atlikušas # minūtes}}",
   "time_remaining.moments": "Atlikuši daži mirkļi",
   "time_remaining.seconds": "Atlikušas {number, plural, one {# sekunde} other {# sekundes}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} no citiem serveriem nav parādīti.",
-  "timeline_hint.resources.followers": "Sekotāji",
-  "timeline_hint.resources.follows": "Seko",
-  "timeline_hint.resources.statuses": "Vecāki ieraksti",
   "trends.counter_by_accounts": "{count, plural, zero {{counter} cilvēku} one {{counter} cilvēks} other {{counter} cilvēki}} {days, plural, one {{day} dienā} other {{days} dienās}}",
   "trends.trending_now": "Pašlaik populāri",
   "ui.beforeunload": "Ja pametīsit Mastodonu, jūsu melnraksts tiks zaudēts.",

app/javascript/mastodon/locales/mk.json

@@ -245,7 +245,6 @@
   "time_remaining.minutes": "{number, plural, one {# минута} other {# минути}} {number, plural, one {остана} other {останаа}}",
   "time_remaining.moments": "Уште некои мига",
   "time_remaining.seconds": "{number, plural, one {# секунда} other {# секунди}} {number, plural, one {остана} other {останаа}}",
-  "timeline_hint.resources.statuses": "Older toots",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",

app/javascript/mastodon/locales/ml.json

@@ -11,7 +11,6 @@
   "account.block": "@{name} -നെ തടയുക",
   "account.block_domain": "{domain} എന്ന മേഖല തടയുക",
   "account.blocked": "തടഞ്ഞു",
-  "account.browse_more_on_origin_server": "യഥാർത്ഥ പ്രൊഫൈലിലേക്ക് പോവുക",
   "account.cancel_follow_request": "Withdraw follow request",
   "account.disable_notifications": "@{name} പോസ്റ്റുചെയ്യുന്നത് എന്നെ അറിയിക്കുന്നത് നിർത്തുക",
   "account.domain_blocked": "മേഖല തടഞ്ഞു",
@@ -310,7 +309,6 @@
   "status.detailed_status": "വിശദമായ സംഭാഷണ കാഴ്‌ച",
   "status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
   "status.embed": "ഉൾച്ചേർക്കുക",
-  "status.filtered": "ഫിൽട്ടർ ചെയ്‌തു",
   "status.load_more": "കൂടുതൽ ലോഡു ചെയ്യുക",
   "status.media_hidden": "മീഡിയ മറച്ചു",
   "status.mention": "@{name} സൂചിപ്പിക്കുക",
@@ -328,17 +326,12 @@
   "status.reply": "മറുപടി",
   "status.report": "@{name}--നെ റിപ്പോർട്ട് ചെയ്യുക",
   "status.share": "പങ്കിടുക",
-  "status.show_less": "കുറച്ച് കാണിക്കുക",
-  "status.show_more": "കൂടുതകൽ കാണിക്കുക",
   "status.show_more_all": "എല്ലാവർക്കുമായി കൂടുതൽ കാണിക്കുക",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
   "tabs_bar.home": "ഹോം",
   "tabs_bar.notifications": "അറിയിപ്പുകൾ",
   "time_remaining.days": "{number, plural, one {# ദിവസം} other {# ദിവസങ്ങൾ}} ബാക്കി",
   "time_remaining.hours": "{number, plural, one {# മണിക്കൂർ} other {# മണിക്കൂർ}} ശേഷിക്കുന്നു",
-  "timeline_hint.resources.followers": "പിന്തുടരുന്നവർ",
-  "timeline_hint.resources.follows": "പിന്തുടരുന്നു",
-  "timeline_hint.resources.statuses": "പഴയ ടൂട്ടുകൾ",
   "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.million": "{count}ദശലക്ഷം",

app/javascript/mastodon/locales/mr.json

@@ -18,7 +18,6 @@
   "account.block_domain": "{domain} पासून सर्व लपवा",
   "account.block_short": "अवरोध",
   "account.blocked": "ब्लॉक केले आहे",
-  "account.browse_more_on_origin_server": "मूळ प्रोफाइलवर अधिक ब्राउझ करा",
   "account.cancel_follow_request": "फॉलो विनंती मागे घ्या",
   "account.copy": "दुवा कॉपी करा",
   "account.direct": "खाजगीरित्या उल्लेखीत @{name}",
@@ -236,7 +235,6 @@
   "status.pinned": "Pinned toot",
   "status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
-  "timeline_hint.resources.statuses": "Older toots",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",

app/javascript/mastodon/locales/ms.json

@@ -18,7 +18,6 @@
   "account.block_domain": "Sekat domain {domain}",
   "account.block_short": "Malay",
   "account.blocked": "Disekat",
-  "account.browse_more_on_origin_server": "Layari selebihnya di profil asal",
   "account.cancel_follow_request": "Menarik balik permintaan mengikut",
   "account.copy": "Salin pautan ke profil",
   "account.direct": "Sebut secara persendirian @{name}",
@@ -616,8 +615,6 @@
   "status.embed": "Benaman",
   "status.favourite": "Kegemaran",
   "status.filter": "Tapiskan hantaran ini",
-  "status.filtered": "Ditapis",
-  "status.hide": "Sembunyikan pos",
   "status.history.created": "{name} mencipta pada {date}",
   "status.history.edited": "{name} menyunting pada {date}",
   "status.load_more": "Muatkan lagi",
@@ -644,10 +641,7 @@
   "status.report": "Laporkan @{name}",
   "status.sensitive_warning": "Kandungan sensitif",
   "status.share": "Kongsi",
-  "status.show_filter_reason": "Paparkan juga",
-  "status.show_less": "Tunjukkan kurang",
   "status.show_less_all": "Tunjukkan kurang untuk semua",
-  "status.show_more": "Tunjukkan lebih",
   "status.show_more_all": "Tunjukkan lebih untuk semua",
   "status.show_original": "Paparkan yang asal",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
@@ -666,10 +660,6 @@
   "time_remaining.minutes": "Tinggal {number, plural, other {# minit}}",
   "time_remaining.moments": "Tinggal beberapa saat",
   "time_remaining.seconds": "Tinggal {number, plural, other {# saat}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} dari pelayan lain tidak dipaparkan.",
-  "timeline_hint.resources.followers": "Pengikut",
-  "timeline_hint.resources.follows": "Ikutan",
-  "timeline_hint.resources.statuses": "Hantaran lebih lama",
   "trends.counter_by_accounts": "{count, plural, other {{counter} orang}} dalam {days, plural, other {{days} hari}} yang lalu",
   "trends.trending_now": "Sohor kini",
   "ui.beforeunload": "Rangka anda akan terhapus jika anda meninggalkan Mastodon.",

app/javascript/mastodon/locales/my.json

@@ -18,7 +18,6 @@
   "account.block_domain": " {domain} ဒိုမိန်းကိုပိတ်မည်",
   "account.block_short": "ပိတ်ဆို့",
   "account.blocked": "ဘလော့ထားသည်",
-  "account.browse_more_on_origin_server": "မူရင်းပရိုဖိုင်တွင် ပိုမိုကြည့်ရှုပါ။",
   "account.cancel_follow_request": "စောင့်ကြည့်မှု ပယ်ဖျက်ခြင်း",
   "account.copy": "လင့်ခ်ကို ပရိုဖိုင်သို့ ကူးယူပါ",
   "account.direct": "@{name} သီးသန့် သိရှိနိုင်အောင် မန်းရှင်းခေါ်မည်",
@@ -594,8 +593,6 @@
   "status.embed": "Embed",
   "status.favourite": "Favorite",
   "status.filter": "ဤပို့စ်ကို စစ်ထုတ်ပါ",
-  "status.filtered": "စစ်ထုတ်ထားသည်",
-  "status.hide": "ပို့စ်ကိုပိတ်ထားမည်",
   "status.history.created": "{name} က {date} က ဖန်တီးခဲ့သည်",
   "status.history.edited": "{name} က {date} က ပြင်ဆင်ခဲ့သည်",
   "status.load_more": "ပို၍ဆောင်ရွက်ပါ",
@@ -622,10 +619,7 @@
   "status.report": "@{name} ကို တိုင်ကြားရန်",
   "status.sensitive_warning": "သတိထားရသော အကြောင်းအရာ",
   "status.share": "မျှဝေ",
-  "status.show_filter_reason": "မည်သို့ပင်ဖြစ်စေ ပြပါ",
-  "status.show_less": "အနည်းငယ်သာ ပြပါ",
   "status.show_less_all": "အားလုံးအတွက် အနည်းငယ်သာ ပြပါ",
-  "status.show_more": "ပိုမိုပြရန်",
   "status.show_more_all": "အားလုံးအတွက် ပိုပြပါ",
   "status.show_original": "မူရင်းပြပါ",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {{attachmentCount} attachments}}",
@@ -644,10 +638,6 @@
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minutes}} left",
   "time_remaining.moments": "အခိုက်အတန့်များ ကျန်ရှိနေသေးသည်",
   "time_remaining.seconds": "{number, plural, one {# second} other {# seconds}} left",
-  "timeline_hint.remote_resource_not_displayed": "အခြားဆာဗာများမှ {resource} ကို ပြသမည်မဟုတ်ပါ။",
-  "timeline_hint.resources.followers": "စောင့်ကြည့်သူများ",
-  "timeline_hint.resources.follows": "စောင့်ကြည့်မယ်",
-  "timeline_hint.resources.statuses": "ပို့စ်အဟောင်းများ",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "လက်ရှိခေတ်စားနေသော ပို့စ်များ",
   "ui.beforeunload": "Mastodon မှ ထွက်ခွာပါက သင့်မူကြမ်း ဆုံးရှုံးသွားပါမည်။",

app/javascript/mastodon/locales/ne.json

@@ -15,7 +15,6 @@
   "account.block_domain": "{domain} डोमेनलाई ब्लक गर्नुहोस्",
   "account.block_short": "ब्लक",
   "account.blocked": "ब्लक गरिएको",
-  "account.browse_more_on_origin_server": "मूल प्रोफाइलमा थप ब्राउज गर्नुहोस्",
   "account.cancel_follow_request": "फलो अनुरोध रद्द गर्नुहोस",
   "account.copy": "प्रोफाइलको लिङ्क प्रतिलिपि गर्नुहोस्",
   "account.direct": "@{name} लाई निजी रूपमा उल्लेख गर्नुहोस्",

app/javascript/mastodon/locales/nl.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Alles van {domain} blokkeren",
   "account.block_short": "Blokkeren",
   "account.blocked": "Geblokkeerd",
-  "account.browse_more_on_origin_server": "Zie meer op het originele profiel",
   "account.cancel_follow_request": "Ontvolgen",
   "account.copy": "Link naar profiel kopiëren",
   "account.direct": "@{name} een privébericht sturen",
@@ -193,6 +192,8 @@
   "confirmations.unfollow.confirm": "Ontvolgen",
   "confirmations.unfollow.message": "Weet je het zeker dat je {name} wilt ontvolgen?",
   "confirmations.unfollow.title": "Gebruiker ontvolgen?",
+  "content_warning.hide": "Bericht verbergen",
+  "content_warning.show": "Alsnog tonen",
   "conversation.delete": "Gesprek verwijderen",
   "conversation.mark_as_read": "Als gelezen markeren",
   "conversation.open": "Gesprek tonen",
@@ -300,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Een bestaande categorie gebruiken of een nieuwe aanmaken",
   "filter_modal.select_filter.title": "Dit bericht filteren",
   "filter_modal.title.status": "Een bericht filteren",
+  "filter_warning.matches_filter": "Komt overeen met filter “{title}”",
   "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",
@@ -349,6 +351,14 @@
   "hashtag.follow": "Hashtag volgen",
   "hashtag.unfollow": "Hashtag ontvolgen",
   "hashtags.and_other": "…en {count, plural, one {}other {# meer}}",
+  "hints.profiles.followers_may_be_missing": "Volgers voor dit profiel kunnen ontbreken.",
+  "hints.profiles.follows_may_be_missing": "De volgers voor dit profiel kunnen ontbreken.",
+  "hints.profiles.posts_may_be_missing": "Er ontbreken mogelijk berichten van dit profiel.",
+  "hints.profiles.see_more_followers": "Bekijk meer volgers op {domain}",
+  "hints.profiles.see_more_follows": "Bekijk meer gevolgde accounts op {domain}",
+  "hints.profiles.see_more_posts": "Bekijk meer berichten op {domain}",
+  "hints.threads.replies_may_be_missing": "Antwoorden van andere servers kunnen ontbreken.",
+  "hints.threads.see_more": "Bekijk meer reacties op {domain}",
   "home.column_settings.show_reblogs": "Boosts tonen",
   "home.column_settings.show_replies": "Reacties tonen",
   "home.hide_announcements": "Mededelingen verbergen",
@@ -456,8 +466,6 @@
   "mute_modal.title": "Gebruiker negeren?",
   "mute_modal.you_wont_see_mentions": "Je ziet geen berichten meer die dit account vermelden.",
   "mute_modal.you_wont_see_posts": "De persoon kan nog steeds jouw berichten zien, maar diens berichten zie je niet meer.",
-  "name_and_others": "{name} en {count, plural, one {# ander} other {# anderen}}",
-  "name_and_others_with_link": "{name} en <a>{count, plural, one {# ander} other {# anderen}}</a>",
   "navigation_bar.about": "Over",
   "navigation_bar.advanced_interface": "In geavanceerde webinterface openen",
   "navigation_bar.blocks": "Geblokkeerde gebruikers",
@@ -490,9 +498,13 @@
   "notification.admin.report_statuses": "{name} rapporteerde {target} voor {category}",
   "notification.admin.report_statuses_other": "{name} rapporteerde {target}",
   "notification.admin.sign_up": "{name} heeft zich geregistreerd",
+  "notification.admin.sign_up.name_and_others": "{name} en {count, plural, one {# ander} other {# anderen}} hebben zich geregistreerd",
   "notification.favourite": "{name} markeerde jouw bericht als favoriet",
+  "notification.favourite.name_and_others_with_link": "{name} en <a>{count, plural, one {# ander} other {# anderen}}</a> hebben jouw bericht als favoriet gemarkeerd",
   "notification.follow": "{name} volgt jou nu",
+  "notification.follow.name_and_others": "{name} en {count, plural, one {# ander} other {# anderen}} hebben je gevolgd",
   "notification.follow_request": "{name} wil jou graag volgen",
+  "notification.follow_request.name_and_others": "{name} en {count, plural, one {# ander} other {# anderen}} hebben gevraagd om je te volgen",
   "notification.label.mention": "Vermelding",
   "notification.label.private_mention": "Privébericht",
   "notification.label.private_reply": "Privéreactie",
@@ -510,6 +522,7 @@
   "notification.own_poll": "Jouw peiling is beëindigd",
   "notification.poll": "Een peiling waaraan jij hebt meegedaan is beëindigd",
   "notification.reblog": "{name} boostte jouw bericht",
+  "notification.reblog.name_and_others_with_link": "{name} en <a>{count, plural, one {# ander} other {# anderen}}</a> hebben jouw bericht geboost",
   "notification.relationships_severance_event": "Verloren verbindingen met {name}",
   "notification.relationships_severance_event.account_suspension": "Een beheerder van {from} heeft {target} geschorst, wat betekent dat je geen updates meer van hen kunt ontvangen of met hen kunt communiceren.",
   "notification.relationships_severance_event.domain_block": "Een beheerder van {from} heeft {target} geblokkeerd, inclusief {followersCount} van jouw volgers en {followingCount, plural, one {# account} other {# accounts}} die jij volgt.",
@@ -775,8 +788,6 @@
   "status.favourite": "Favoriet",
   "status.favourites": "{count, plural, one {favoriet} other {favorieten}}",
   "status.filter": "Dit bericht filteren",
-  "status.filtered": "Gefilterd",
-  "status.hide": "Bericht verbergen",
   "status.history.created": "{name} plaatste dit {date}",
   "status.history.edited": "{name} bewerkte dit {date}",
   "status.load_more": "Meer laden",
@@ -804,10 +815,7 @@
   "status.report": "@{name} rapporteren",
   "status.sensitive_warning": "Gevoelige inhoud",
   "status.share": "Delen",
-  "status.show_filter_reason": "Alsnog tonen",
-  "status.show_less": "Minder tonen",
   "status.show_less_all": "Alles minder tonen",
-  "status.show_more": "Meer tonen",
   "status.show_more_all": "Alles meer tonen",
   "status.show_original": "Origineel bekijken",
   "status.title.with_attachments": "{user} heeft {attachmentCount, plural, one {een bijlage} other {{attachmentCount} bijlagen}} toegevoegd",
@@ -826,11 +834,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuut} other {# minuten}} te gaan",
   "time_remaining.moments": "Nog enkele ogenblikken resterend",
   "time_remaining.seconds": "{number, plural, one {# seconde} other {# seconden}} te gaan",
-  "timeline_hint.remote_resource_not_displayed": "{resource} van andere servers worden niet getoond.",
-  "timeline_hint.resources.followers": "Volgers",
-  "timeline_hint.resources.follows": "Volgend",
-  "timeline_hint.resources.replies": "Enkele reacties",
-  "timeline_hint.resources.statuses": "Oudere berichten",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persoon} other {{counter} mensen}} {days, plural, one {in het afgelopen etmaal} other {in de afgelopen {days} dagen}}",
   "trends.trending_now": "Huidige trends",
   "ui.beforeunload": "Je concept gaat verloren wanneer je Mastodon verlaat.",

app/javascript/mastodon/locales/nn.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Skjul alt frå {domain}",
   "account.block_short": "Blokker",
   "account.blocked": "Blokkert",
-  "account.browse_more_on_origin_server": "Sjå gjennom meir på den opphavlege profilen",
   "account.cancel_follow_request": "Trekk attende fylgeførespurnad",
   "account.copy": "Kopier lenka til profilen",
   "account.direct": "Nevn @{name} privat",
@@ -193,6 +192,7 @@
   "confirmations.unfollow.confirm": "Slutt å fylgja",
   "confirmations.unfollow.message": "Er du sikker på at du vil slutta å fylgja {name}?",
   "confirmations.unfollow.title": "Slutt å fylgja brukaren?",
+  "content_warning.hide": "Gøym innlegg",
   "conversation.delete": "Slett samtale",
   "conversation.mark_as_read": "Marker som lesen",
   "conversation.open": "Sjå samtale",
@@ -456,8 +456,6 @@
   "mute_modal.title": "Demp brukaren?",
   "mute_modal.you_wont_see_mentions": "Du vil ikkje sjå innlegg som nemner dei.",
   "mute_modal.you_wont_see_posts": "Dei kan framleis sjå innlegga dine, men du vil ikkje sjå deira.",
-  "name_and_others": "{name} og {count, plural, one {# annan} other {# andre}}",
-  "name_and_others_with_link": "{name} og <a>{count, plural, one {# annan} other {# andre}}</a>",
   "navigation_bar.about": "Om",
   "navigation_bar.advanced_interface": "Opne i avansert nettgrensesnitt",
   "navigation_bar.blocks": "Blokkerte brukarar",
@@ -765,8 +763,6 @@
   "status.favourite": "Favoritt",
   "status.favourites": "{count, plural, one {favoritt} other {favorittar}}",
   "status.filter": "Filtrer dette innlegget",
-  "status.filtered": "Filtrert",
-  "status.hide": "Skjul innlegget",
   "status.history.created": "{name} oppretta {date}",
   "status.history.edited": "{name} redigerte {date}",
   "status.load_more": "Last inn meir",
@@ -794,10 +790,7 @@
   "status.report": "Rapporter @{name}",
   "status.sensitive_warning": "Ømtolig innhald",
   "status.share": "Del",
-  "status.show_filter_reason": "Vis likevel",
-  "status.show_less": "Vis mindre",
   "status.show_less_all": "Vis mindre for alle",
-  "status.show_more": "Vis meir",
   "status.show_more_all": "Vis meir for alle",
   "status.show_original": "Vis original",
   "status.title.with_attachments": "{user} la ut {attachmentCount, plural, one {eitt vedlegg} other {{attachmentCount} vedlegg}}",
@@ -816,11 +809,6 @@
   "time_remaining.minutes": "{number, plural, one {# minutt} other {# minutt}} igjen",
   "time_remaining.moments": "Kort tid igjen",
   "time_remaining.seconds": "{number, plural, one {# sekund} other {# sekund}} igjen",
-  "timeline_hint.remote_resource_not_displayed": "{resource} frå andre tenarar blir ikkje vist.",
-  "timeline_hint.resources.followers": "Fylgjarar",
-  "timeline_hint.resources.follows": "Fylgjer",
-  "timeline_hint.resources.replies": "Nokre svar",
-  "timeline_hint.resources.statuses": "Eldre tut",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} folk}} siste {days, plural, one {døgnet} other {{days} dagane}}",
   "trends.trending_now": "Populært no",
   "ui.beforeunload": "Kladden din forsvinn om du forlèt Mastodon no.",

app/javascript/mastodon/locales/no.json

@@ -18,7 +18,6 @@
   "account.block_domain": "Blokker domenet {domain}",
   "account.block_short": "Blokker",
   "account.blocked": "Blokkert",
-  "account.browse_more_on_origin_server": "Bla mer på den opprinnelige profilen",
   "account.cancel_follow_request": "Avbryt følgeforespørselen",
   "account.copy": "Kopier lenke til profil",
   "account.direct": "Nevn @{name} privat",
@@ -618,8 +617,6 @@
   "status.embed": "Bygge inn",
   "status.favourite": "Favoritt",
   "status.filter": "Filtrer dette innlegget",
-  "status.filtered": "Filtrert",
-  "status.hide": "Skjul innlegg",
   "status.history.created": "{name} opprettet {date}",
   "status.history.edited": "{name} redigerte {date}",
   "status.load_more": "Last mer",
@@ -646,10 +643,7 @@
   "status.report": "Rapporter @{name}",
   "status.sensitive_warning": "Følsomt innhold",
   "status.share": "Del",
-  "status.show_filter_reason": "Vis likevel",
-  "status.show_less": "Vis mindre",
   "status.show_less_all": "Vis mindre for alle",
-  "status.show_more": "Vis mer",
   "status.show_more_all": "Vis mer for alle",
   "status.show_original": "Vis original",
   "status.title.with_attachments": "{user} postet {attachmentCount, plural, one {et vedlegg} other {{attachmentCount} vedlegg}}",
@@ -668,10 +662,6 @@
   "time_remaining.minutes": "{number, plural, one {# minutt} other {# minutter}} igjen",
   "time_remaining.moments": "Gjenværende øyeblikk",
   "time_remaining.seconds": "{number, plural, one {# sekund} other {# sekunder}} igjen",
-  "timeline_hint.remote_resource_not_displayed": "{resource} fra andre servere vises ikke.",
-  "timeline_hint.resources.followers": "Følgere",
-  "timeline_hint.resources.follows": "Følger",
-  "timeline_hint.resources.statuses": "Eldre innlegg",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} folk}} {days, plural, one {den siste dagen} other {de siste {days} dagene}}",
   "trends.trending_now": "Trender nå",
   "ui.beforeunload": "Din kladd vil bli forkastet om du forlater Mastodon.",

app/javascript/mastodon/locales/oc.json

@@ -15,7 +15,6 @@
   "account.block_domain": "Tot amagar del domeni {domain}",
   "account.block_short": "Blocar",
   "account.blocked": "Blocat",
-  "account.browse_more_on_origin_server": "Navigar sul perfil original",
   "account.cancel_follow_request": "Retirar la demanda d’abonament",
   "account.copy": "Copiar lo ligam del perfil",
   "account.direct": "Mencionar @{name} en privat",
@@ -510,8 +509,6 @@
   "status.embed": "Embarcar",
   "status.favourite": "Apondre als favorits",
   "status.filter": "Filtrar aquesta publicacion",
-  "status.filtered": "Filtrat",
-  "status.hide": "Amagar la publicacion",
   "status.history.created": "{name} o creèt lo {date}",
   "status.history.edited": "{name} o modifiquèt lo {date}",
   "status.load_more": "Cargar mai",
@@ -538,10 +535,7 @@
   "status.report": "Senhalar @{name}",
   "status.sensitive_warning": "Contengut sensible",
   "status.share": "Partejar",
-  "status.show_filter_reason": "Afichar de tot biais",
-  "status.show_less": "Tornar plegar",
   "status.show_less_all": "Los tornar plegar totes",
-  "status.show_more": "Desplegar",
   "status.show_more_all": "Los desplegar totes",
   "status.show_original": "Veire l’original",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
@@ -560,10 +554,6 @@
   "time_remaining.minutes": "demòra{number, plural, one { # minuta} other {n # minutas}}",
   "time_remaining.moments": "Moments restants",
   "time_remaining.seconds": "demòra{number, plural, one { # segonda} other {n # segondas}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} suls autres servidors son pas afichats.",
-  "timeline_hint.resources.followers": "Seguidors",
-  "timeline_hint.resources.follows": "Abonaments",
-  "timeline_hint.resources.statuses": "Tuts mai ancians",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persona} other {{counter} personas}} dins los darrièrs {days, plural, one {jorn} other {{days} jorns}}",
   "trends.trending_now": "Tendéncia del moment",
   "ui.beforeunload": "Vòstre brolhon serà perdut se quitatz Mastodon.",

app/javascript/mastodon/locales/pa.json

@@ -341,17 +341,11 @@
   "status.report": "@{name} ਦੀ ਰਿਪੋਰਟ ਕਰੋ",
   "status.sensitive_warning": "ਸੰਵੇਦਨਸ਼ੀਲ ਸਮੱਗਰੀ",
   "status.share": "ਸਾਂਝਾ ਕਰੋ",
-  "status.show_filter_reason": "ਕਿਵੇਂ ਵੀ ਵੇਖਾਓ",
-  "status.show_less": "ਘੱਟ ਦਿਖਾਓ",
-  "status.show_more": "ਹੋਰ ਦਿਖਾਓ",
   "status.title.with_attachments": "{user} ਨੇ {attachmentCount, plural,one {ਅਟੈਚਮੈਂਟ} other {{attachmentCount}ਅਟੈਚਮੈਂਟਾਂ}} ਪੋਸਟ ਕੀਤੀਆਂ",
   "status.translate": "ਉਲੱਥਾ ਕਰੋ",
   "subscribed_languages.save": "ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੋ",
   "tabs_bar.home": "ਘਰ",
   "tabs_bar.notifications": "ਸੂਚਨਾਵਾਂ",
-  "timeline_hint.resources.followers": "ਫ਼ਾਲੋਅਰ",
-  "timeline_hint.resources.follows": "ਫ਼ਾਲੋ",
-  "timeline_hint.resources.statuses": "ਪੂਰਾਣੀਆਂ ਪੋਸਟਾਂ",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "units.short.billion": "{count}ਿਬ",
   "units.short.million": "{count}ਮਿ",

app/javascript/mastodon/locales/pl.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Blokuj wszystko z {domain}",
   "account.block_short": "Zablokuj",
   "account.blocked": "Zablokowany(-a)",
-  "account.browse_more_on_origin_server": "Zobacz więcej na oryginalnym profilu",
   "account.cancel_follow_request": "Wycofaj żądanie obserwowania",
   "account.copy": "Skopiuj odnośnik do profilu",
   "account.direct": "Prywatna wzmianka @{name}",
@@ -193,6 +192,8 @@
   "confirmations.unfollow.confirm": "Przestań obserwować",
   "confirmations.unfollow.message": "Czy na pewno zamierzasz przestać obserwować {name}?",
   "confirmations.unfollow.title": "Przestać obserwować?",
+  "content_warning.hide": "Ukryj wpis",
+  "content_warning.show": "Pokaż mimo to",
   "conversation.delete": "Usuń konwersację",
   "conversation.mark_as_read": "Oznacz jako przeczytane",
   "conversation.open": "Zobacz konwersację",
@@ -300,6 +301,7 @@
   "filter_modal.select_filter.subtitle": "Użyj istniejącej kategorii lub utwórz nową",
   "filter_modal.select_filter.title": "Filtruj ten wpis",
   "filter_modal.title.status": "Filtruj wpis",
+  "filter_warning.matches_filter": "Pasuje do filtra \"{title}\"",
   "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",
@@ -349,6 +351,14 @@
   "hashtag.follow": "Obserwuj hasztag",
   "hashtag.unfollow": "Przestań obserwować hashtag",
   "hashtags.and_other": "…i {count, plural, other {jeszcze #}}",
+  "hints.profiles.followers_may_be_missing": "Może brakować niektórych obserwujących tego profilu.",
+  "hints.profiles.follows_may_be_missing": "Może brakować niektórych obserwowanych przez tego użytkownika.",
+  "hints.profiles.posts_may_be_missing": "Może brakować niektórych wpisów tego profilu.",
+  "hints.profiles.see_more_followers": "Zobacz wszystkich obserwujących na {domain}",
+  "hints.profiles.see_more_follows": "Zobacz wszystkich obserwowanych na {domain}",
+  "hints.profiles.see_more_posts": "Zobacz wszystkie wpisy na {domain}",
+  "hints.threads.replies_may_be_missing": "Może brakować odpowiedzi z innych serwerów.",
+  "hints.threads.see_more": "Zobacz wszystkie odpowiedzi na {domain}",
   "home.column_settings.show_reblogs": "Pokazuj podbicia",
   "home.column_settings.show_replies": "Pokazuj odpowiedzi",
   "home.hide_announcements": "Ukryj ogłoszenia",
@@ -456,8 +466,6 @@
   "mute_modal.title": "Wyciszyć użytkownika?",
   "mute_modal.you_wont_see_mentions": "Nie zobaczysz wpisów, które wspominają tego użytkownika.",
   "mute_modal.you_wont_see_posts": "Użytkownik dalej będzie widzieć Twoje posty, ale Ty nie będziesz widzieć jego.",
-  "name_and_others": "{name} i {count, plural, one {# inny} few {# inne} many {# innych} other {# innych}}",
-  "name_and_others_with_link": "{name} i <a>{count, plural, one {# inny} few {# inne} many {# innych} other {# innych}}</a>",
   "navigation_bar.about": "O serwerze",
   "navigation_bar.advanced_interface": "Otwórz w zaawansowanym interfejsie użytkownika",
   "navigation_bar.blocks": "Zablokowani użytkownicy",
@@ -490,9 +498,13 @@
   "notification.admin.report_statuses": "{name} zgłosił(a) {target} w kategorii {category}",
   "notification.admin.report_statuses_other": "{name} zgłosił(a) {target}",
   "notification.admin.sign_up": "Użytkownik {name} zarejestrował się",
+  "notification.admin.sign_up.name_and_others": "zarejestrował(-a) się {name} i {count, plural, one {# inna osoba} few {# inne osoby}  other {# innych osób}}",
   "notification.favourite": "{name} dodaje Twój wpis do ulubionych",
+  "notification.favourite.name_and_others_with_link": "{name} i <a>{count, plural, one {# inna osoba</a> polubiła twój wpis} few {# inne osoby</a> polubiły twój wpis} other {# innych osób</a> polubiło twój wpis}}",
   "notification.follow": "{name} obserwuje Cię",
+  "notification.follow.name_and_others": "{name} i {count, plural, one {# inna osoba cię zaobserwowała} few {# inne osoby cię zaobserwowały} other {# innych osób cię zaobserwowało}}",
   "notification.follow_request": "{name} chce cię zaobserwować",
+  "notification.follow_request.name_and_others": "{name} i {count, plural, one {# inna osoba chce} few {# inne osoby chcą} other {# innych osób chce}} zaobserwować twój profil",
   "notification.label.mention": "Wzmianka",
   "notification.label.private_mention": "Prywatna wzmianka",
   "notification.label.private_reply": "Odpowiedź prywatna",
@@ -510,6 +522,7 @@
   "notification.own_poll": "Twoje głosowanie zakończyło się",
   "notification.poll": "Głosowanie, w którym brałeś(-aś) udział, zostało zakończone",
   "notification.reblog": "Twój post został podbity przez {name}",
+  "notification.reblog.name_and_others_with_link": "{name} i <a>{count, plural, one {# inna osoba</a> podbiła twój wpis} few {# inne osoby</a> podbiły twój wpis} other {# innych osób</a> podbiło twój wpis}}",
   "notification.relationships_severance_event": "Utracone związki z {name}",
   "notification.relationships_severance_event.account_suspension": "Administrator z {from} zawiesił {target}, więc nie dostaniesz wieści ani nie wejdziesz w interakcje z użytkownikami z tego serwera.",
   "notification.relationships_severance_event.domain_block": "Administrator z {from} zablokował {target}, w tym {followersCount} z Twoich obserwujących i {followingCount, plural, one {# konto} other {# konta}} które obserwujesz.",
@@ -774,8 +787,6 @@
   "status.favourite": "Dodaj do ulubionych",
   "status.favourites": "{count, plural, one {polubienie} few {polubienia} other {polubień}}",
   "status.filter": "Filtruj ten wpis",
-  "status.filtered": "Filtrowany(-a)",
-  "status.hide": "Ukryj post",
   "status.history.created": "{name} utworzone {date}",
   "status.history.edited": "{name} edytowane {date}",
   "status.load_more": "Załaduj więcej",
@@ -803,10 +814,7 @@
   "status.report": "Zgłoś @{name}",
   "status.sensitive_warning": "Wrażliwa zawartość",
   "status.share": "Udostępnij",
-  "status.show_filter_reason": "Pokaż mimo wszystko",
-  "status.show_less": "Zwiń",
   "status.show_less_all": "Zwiń wszystkie",
-  "status.show_more": "Rozwiń",
   "status.show_more_all": "Rozwiń wszystkie",
   "status.show_original": "Pokaż oryginał",
   "status.title.with_attachments": "{user} opublikował(a) {attachmentCount, plural, one {załącznik} few {{attachmentCount} załączniki} other {{attachmentCount} załączników}}",
@@ -825,11 +833,6 @@
   "time_remaining.minutes": "{number, plural, one {Pozostała # minuta} few {Pozostały # minuty} many {Pozostało # minut} other {Pozostało # minut}}",
   "time_remaining.moments": "Pozostała chwila",
   "time_remaining.seconds": "{number, plural, one {Pozostała # sekunda} few {Pozostały # sekundy} many {Pozostało # sekund} other {Pozostało # sekund}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} z innych serwerów nie są wyświetlane.",
-  "timeline_hint.resources.followers": "Obserwujący",
-  "timeline_hint.resources.follows": "Obserwowani",
-  "timeline_hint.resources.replies": "Niektóre odpowiedzi",
-  "timeline_hint.resources.statuses": "Starsze wpisy",
   "trends.counter_by_accounts": "{count, plural, one {jedna osoba} few {{count} osoby} many {{count} osób} other {{counter} ludzie}} w ciągu {days, plural, one {ostatniego dnia} other {ostatnich {days} dni}}",
   "trends.trending_now": "Popularne teraz",
   "ui.beforeunload": "Utracisz tworzony wpis, jeżeli opuścisz Mastodona.",

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

@@ -18,7 +18,6 @@
   "account.block_domain": "Bloquear domínio {domain}",
   "account.block_short": "Bloquear",
   "account.blocked": "Bloqueado",
-  "account.browse_more_on_origin_server": "Veja mais no perfil original",
   "account.cancel_follow_request": "Cancelar solicitação para seguir",
   "account.copy": "Copiar link do perfil",
   "account.direct": "Mencione em privado @{name}",
@@ -446,8 +445,6 @@
   "mute_modal.title": "Silenciar usuário?",
   "mute_modal.you_wont_see_mentions": "Você não verá publicações que os mencionem.",
   "mute_modal.you_wont_see_posts": "Eles ainda poderão ver suas publicações, mas você não verá as deles.",
-  "name_and_others": "{name} e {count, plural, one {# outro} other {# outros}}",
-  "name_and_others_with_link": "{name} e <a>{count, plural, one {# outro} other {# outros}}</a>",
   "navigation_bar.about": "Sobre",
   "navigation_bar.advanced_interface": "Ativar na interface web avançada",
   "navigation_bar.blocks": "Usuários bloqueados",
@@ -729,8 +726,6 @@
   "status.favourite": "Favorita",
   "status.favourites": "{count, plural, one {favorite} other {favorites}}",
   "status.filter": "Filtrar esta publicação",
-  "status.filtered": "Filtrado",
-  "status.hide": "Ocultar publicação",
   "status.history.created": "{name} criou {date}",
   "status.history.edited": "{name} editou {date}",
   "status.load_more": "Ver mais",
@@ -758,10 +753,7 @@
   "status.report": "Denunciar @{name}",
   "status.sensitive_warning": "Mídia sensível",
   "status.share": "Compartilhar",
-  "status.show_filter_reason": "Mostrar mesmo assim",
-  "status.show_less": "Mostrar menos",
   "status.show_less_all": "Mostrar menos em tudo",
-  "status.show_more": "Mostrar mais",
   "status.show_more_all": "Mostrar mais em tudo",
   "status.show_original": "Mostrar original",
   "status.title.with_attachments": "{user} postou {attachmentCount, plural, one {um anexo} other {{attachmentCount} attachments}}",
@@ -780,10 +772,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuto restante} other {# minutos restantes}}",
   "time_remaining.moments": "Momentos restantes",
   "time_remaining.seconds": "{number, plural, one {# segundo restante} other {# segundos restantes}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} de outros servidores não são mostrados.",
-  "timeline_hint.resources.followers": "Seguidores",
-  "timeline_hint.resources.follows": "Segue",
-  "timeline_hint.resources.statuses": "Toots anteriores",
   "trends.counter_by_accounts": "{count, plural, one {{counter} pessoa} other {{counter} pessoas}} no(s) último(s) {days, plural, one {dia} other {{days} dias}}",
   "trends.trending_now": "Em alta agora",
   "ui.beforeunload": "Seu rascunho será perdido se sair do Mastodon.",

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

@@ -19,7 +19,6 @@
   "account.block_domain": "Bloquear domínio {domain}",
   "account.block_short": "Bloquear",
   "account.blocked": "Bloqueado(a)",
-  "account.browse_more_on_origin_server": "Encontrar mais no perfil original",
   "account.cancel_follow_request": "Retirar pedido para seguir",
   "account.copy": "Copiar hiperligação para o perfil",
   "account.direct": "Mencionar @{name} em privado",
@@ -445,8 +444,6 @@
   "mute_modal.title": "Silenciar utilizador?",
   "mute_modal.you_wont_see_mentions": "Não verá publicações que os mencionem.",
   "mute_modal.you_wont_see_posts": "Eles podem continuar a ver as suas publicações, mas você não verá as deles.",
-  "name_and_others": "{name} e {count, plural, one {# outro} other {# outros}}",
-  "name_and_others_with_link": "{name} e <a>{count, plural, one {# outro} other {# outros}}</a>",
   "navigation_bar.about": "Sobre",
   "navigation_bar.advanced_interface": "Abrir na interface web avançada",
   "navigation_bar.blocks": "Utilizadores bloqueados",
@@ -746,8 +743,6 @@
   "status.favourite": "Assinalar como favorito",
   "status.favourites": "{count, plural, one {favorito} other {favoritos}}",
   "status.filter": "Filtrar esta publicação",
-  "status.filtered": "Filtrada",
-  "status.hide": "Ocultar publicação",
   "status.history.created": "{name} criado em {date}",
   "status.history.edited": "{name} editado em {date}",
   "status.load_more": "Carregar mais",
@@ -775,10 +770,7 @@
   "status.report": "Denunciar @{name}",
   "status.sensitive_warning": "Conteúdo problemático",
   "status.share": "Partilhar",
-  "status.show_filter_reason": "Mostrar mesmo assim",
-  "status.show_less": "Mostrar menos",
   "status.show_less_all": "Mostrar menos para todas",
-  "status.show_more": "Mostrar mais",
   "status.show_more_all": "Mostrar mais para todas",
   "status.show_original": "Mostrar original",
   "status.title.with_attachments": "{user} publicou {attachmentCount, plural,one {um anexo} other {{attachmentCount} anexos}}",
@@ -797,10 +789,6 @@
   "time_remaining.minutes": "{número, plural, um {# minute} outro {# minutes}} faltam",
   "time_remaining.moments": "Momentos restantes",
   "time_remaining.seconds": "{número, plural, um {# second} outro {# seconds}} faltam",
-  "timeline_hint.remote_resource_not_displayed": "{resource} de outros servidores não são exibidos.",
-  "timeline_hint.resources.followers": "Seguidores",
-  "timeline_hint.resources.follows": "Seguindo",
-  "timeline_hint.resources.statuses": "Publicações mais antigas",
   "trends.counter_by_accounts": "{count, plural, one {{counter} pessoa} other {{counter} pessoas}} {days, plural, one {no último dia} other {nos últimos {days} dias}}",
   "trends.trending_now": "Em alta neste momento",
   "ui.beforeunload": "O teu rascunho será perdido se abandonares o Mastodon.",

app/javascript/mastodon/locales/ro.json

@@ -18,7 +18,6 @@
   "account.block_domain": "Blochează domeniul {domain}",
   "account.block_short": "Blochează",
   "account.blocked": "Blocat",
-  "account.browse_more_on_origin_server": "Vezi mai multe pe profilul original",
   "account.cancel_follow_request": "Retrage cererea de urmărire",
   "account.copy": "Copiază link-ul profilului",
   "account.direct": "Menționează pe @{name} în privat",
@@ -560,8 +559,6 @@
   "status.edited_x_times": "Modificată {count, plural, one {o dată} few {de {count} ori} other {de {count} de ori}}",
   "status.embed": "Înglobează",
   "status.filter": "Filtrează această postare",
-  "status.filtered": "Sortate",
-  "status.hide": "Ascunde postarea",
   "status.history.created": "creată de {name} pe {date}",
   "status.history.edited": "modificată de {name} pe {date}",
   "status.load_more": "Încarcă mai multe",
@@ -588,10 +585,7 @@
   "status.report": "Raportează pe @{name}",
   "status.sensitive_warning": "Conținut sensibil",
   "status.share": "Distribuie",
-  "status.show_filter_reason": "Afișează oricum",
-  "status.show_less": "Arată mai puțin",
   "status.show_less_all": "Arată mai puțin pentru toți",
-  "status.show_more": "Arată mai mult",
   "status.show_more_all": "Arată mai mult pentru toți",
   "status.show_original": "Afișează originalul",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
@@ -610,10 +604,6 @@
   "time_remaining.minutes": "{number, plural, one {un minut rămas} few {# minute rămase} other {# de minute rămase}}",
   "time_remaining.moments": "Momente rămase",
   "time_remaining.seconds": "{number, plural, one {o secundă rămasă} few {# secunde rămase} other {# de secunde rămase}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} de la alte servere nu sunt afișate.",
-  "timeline_hint.resources.followers": "Urmăritori",
-  "timeline_hint.resources.follows": "Urmăriri",
-  "timeline_hint.resources.statuses": "Postări mai vechi",
   "trends.counter_by_accounts": "{count, plural, one {o persoană} few {{counter} persoane} other {{counter} de persoane}} în {days, plural, one {ultima zi} few {ultimele {days} zile} other {ultimele {days} de zile}}",
   "trends.trending_now": "În tendință acum",
   "ui.beforeunload": "Postarea se va pierde dacă părăsești pagina.",

app/javascript/mastodon/locales/ru.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Заблокировать {domain}",
   "account.block_short": "Блокировать",
   "account.blocked": "Заблокировано",
-  "account.browse_more_on_origin_server": "Посмотреть в оригинальном профиле",
   "account.cancel_follow_request": "Отозвать запрос на подписку",
   "account.copy": "Скопировать ссылку на профиль",
   "account.direct": "Лично упоминать @{name}",
@@ -719,8 +718,6 @@
   "status.embed": "Встроить на свой сайт",
   "status.favourite": "Избранное",
   "status.filter": "Фильтровать этот пост",
-  "status.filtered": "Отфильтровано",
-  "status.hide": "Скрыть пост",
   "status.history.created": "{name} создал {date}",
   "status.history.edited": "{name} отредактировал(а) {date}",
   "status.load_more": "Загрузить остальное",
@@ -747,10 +744,7 @@
   "status.report": "Пожаловаться",
   "status.sensitive_warning": "Содержимое «деликатного характера»",
   "status.share": "Поделиться",
-  "status.show_filter_reason": "Все равно показать",
-  "status.show_less": "Свернуть",
   "status.show_less_all": "Свернуть все спойлеры в ветке",
-  "status.show_more": "Развернуть",
   "status.show_more_all": "Развернуть все спойлеры в ветке",
   "status.show_original": "Показать оригинал",
   "status.title.with_attachments": "{user} размещено {attachmentCount, plural, one {вложение} other {{attachmentCount} вложений}}",
@@ -769,10 +763,6 @@
   "time_remaining.minutes": "{number, plural, one {осталась # минута} few {осталось # минуты} many {осталось # минут} other {осталось # минут}}",
   "time_remaining.moments": "остались считанные мгновения",
   "time_remaining.seconds": "{number, plural, one {# секунда} many {# секунд} other {# секунды}}",
-  "timeline_hint.remote_resource_not_displayed": "Мы не отображаем {resource} с других серверов.",
-  "timeline_hint.resources.followers": "подписчиков",
-  "timeline_hint.resources.follows": "подписки",
-  "timeline_hint.resources.statuses": "прошлые посты",
   "trends.counter_by_accounts": "{count, plural, few {{counter} человека} other {{counter} человек}} за {days, plural, one {последний день} few {последние {days} дня} other {последние {days} дней}}",
   "trends.trending_now": "Самое актуальное",
   "ui.beforeunload": "Ваш черновик будет утерян, если вы покинете Mastodon.",

app/javascript/mastodon/locales/ry.json

@@ -18,7 +18,6 @@
   "account.block_domain": "Заблоковати домен {domain}",
   "account.block_short": "Заблоковати",
   "account.blocked": "Заблоковано",
-  "account.browse_more_on_origin_server": "Позирайте бульше на ориґіналнум профілю",
   "account.cancel_follow_request": "Удмінити пудписку",
   "account.copy": "Зкопіровати удкликованя на профіл",
   "account.direct": "Пошептати @{name}",
@@ -125,6 +124,8 @@
   "column_header.show_settings": "Указати штімованя",
   "column_header.unpin": "Удкріпити",
   "column_subheading.settings": "Штімованя",
+  "community.column_settings.local_only": "Лем локалноє",
+  "community.column_settings.media_only": "Лем медіа",
   "compose.language.change": "Поміняти язык",
   "compose.language.search": "Глядати языкы...",
   "compose.published.body": "Пост опубликованый.",
@@ -146,6 +147,7 @@
   "compose_form.publish": "Публикація",
   "compose_form.publish_form": "Нова публикація",
   "compose_form.reply": "Удповідь",
+  "compose_form.save_changes": "Усокотити",
   "copypaste.copy_to_clipboard": "Копіровати у памнять",
   "directory.recently_active": "Недавно актівні",
   "disabled_account_banner.account_settings": "Штімованя акаунта",

app/javascript/mastodon/locales/sa.json

@@ -17,7 +17,6 @@
   "account.block": "अवरुध्यताम् @{name}",
   "account.block_domain": "अवरुध्यतां प्रदेशः {domain}",
   "account.blocked": "अवरुद्धम्",
-  "account.browse_more_on_origin_server": "अधिकं मूलव्यक्तिगतविवरणे दृश्यताम्",
   "account.cancel_follow_request": "अनुसरणयाचनामपनय",
   "account.direct": "गोपनीयरूपेण उल्लेखित-@{name}",
   "account.disable_notifications": "यदा @{name} स्थापयति तदा माम्मा ज्ञापय",
@@ -507,8 +506,6 @@
   "status.edited_x_times": "Edited {count, plural, one {{count} वारम्} other {{count} वारम्}}",
   "status.embed": "निहितम्",
   "status.filter": "पत्रमिदं फिल्तरं कुरु",
-  "status.filtered": "फिल्तर्कृतम्",
-  "status.hide": "प्रेषरणं प्रच्छादय",
   "status.history.created": "{name} असृजत् {date}",
   "status.history.edited": "{name} समपादयत् {date}",
   "status.load_more": "अधिकं स्थापय",
@@ -525,7 +522,6 @@
   "status.reblogs.empty": "न केनापि पत्रमिदं बुस्त्कृतम्। यदा कोऽपि करोति, तानि इह दृश्यन्ते।",
   "status.redraft": "मार्जय पुनश्च लिख्यताम्",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
-  "timeline_hint.resources.statuses": "पूरातनपत्राणि",
   "trends.counter_by_accounts": "{count, plural, one {{counter} person} other {{counter} people}} in the past {days, plural, one {day} other {# days}}",
   "upload_form.audio_description": "Describe for people with hearing loss",
   "upload_form.description": "Describe for the visually impaired",

app/javascript/mastodon/locales/sc.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Bloca su domìniu {domain}",
   "account.block_short": "Bloca",
   "account.blocked": "Blocadu",
-  "account.browse_more_on_origin_server": "Esplora de prus in su profilu originale",
   "account.cancel_follow_request": "Annulla sa sighidura",
   "account.copy": "Còpia su ligòngiu a su profilu",
   "account.direct": "Mèntova a @{name} in privadu",
@@ -549,7 +548,6 @@
   "status.edited_x_times": "Modificadu {count, plural, one {{count} # borta} other {{count} bortas}}",
   "status.embed": "Afissa",
   "status.favourites": "{count, plural, one {preferidu} other {preferidos}}",
-  "status.filtered": "Filtradu",
   "status.load_more": "Càrriga·nde àteros",
   "status.media_hidden": "Elementos multimediales cuados",
   "status.mention": "Mèntova a @{name}",
@@ -571,9 +569,7 @@
   "status.report": "Sinnala @{name}",
   "status.sensitive_warning": "Cuntenutu sensìbile",
   "status.share": "Cumpartzi",
-  "status.show_less": "Ammustra·nde prus pagu",
   "status.show_less_all": "Ammustra·nde prus pagu pro totus",
-  "status.show_more": "Ammustra·nde prus",
   "status.show_more_all": "Ammustra·nde prus pro totus",
   "status.title.with_attachments": "{user} at publicadu {attachmentCount, plural, one {un'alligongiadu} other {{attachmentCount} alligongiados}}",
   "status.unmute_conversation": "Torra a ativare s'arresonada",
@@ -586,10 +582,6 @@
   "time_remaining.minutes": "{number, plural, one {abarrat # minutu} other {abarrant # minutos}}",
   "time_remaining.moments": "Abarrant pagu momentos",
   "time_remaining.seconds": "{number, plural, one {abarrat # segundu} other {abarrant # segundos}}",
-  "timeline_hint.remote_resource_not_displayed": "Is {resource} dae àteros serbidores non benint ammustradas.",
-  "timeline_hint.resources.followers": "Sighiduras",
-  "timeline_hint.resources.follows": "Sighende",
-  "timeline_hint.resources.statuses": "Publicatziones prus betzas",
   "trends.counter_by_accounts": "{count, plural, one {{counter} persone} other {{counter} persones}} in {days, plural, one {s'ùrtima die} other {{days} is ùrtimas dies}}",
   "trends.trending_now": "Est tendèntzia immoe",
   "ui.beforeunload": "S'abbotzu tuo at a èssere pèrdidu si essis dae Mastodon.",

app/javascript/mastodon/locales/sco.json

@@ -17,7 +17,6 @@
   "account.block": "Dingie @{name}",
   "account.block_domain": "Dingie domain {domain}",
   "account.blocked": "Dingied",
-  "account.browse_more_on_origin_server": "Luik mair oan the oreeginal profile",
   "account.cancel_follow_request": "Resile follae requeest",
   "account.disable_notifications": "Stap notifyin me whan @{name} posts",
   "account.domain_blocked": "Domain dingied",
@@ -478,7 +477,6 @@
   "status.edited_x_times": "Editit {count, plural, one {{count} time} other {{count} times}}",
   "status.embed": "Embed",
   "status.filter": "Filter this post",
-  "status.filtered": "Filtert",
   "status.history.created": "{name} creatit {date}",
   "status.history.edited": "{name} editit {date}",
   "status.load_more": "Load mair",
@@ -503,10 +501,7 @@
   "status.report": "Clype @{name}",
   "status.sensitive_warning": "Sensitive content",
   "status.share": "Shaire",
-  "status.show_filter_reason": "Shaw onieweys",
-  "status.show_less": "Shaw less",
   "status.show_less_all": "Shaw less fir aw",
-  "status.show_more": "Shaw mair",
   "status.show_more_all": "Shaw mair fir aw",
   "status.show_original": "Shaw original",
   "status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
@@ -524,10 +519,6 @@
   "time_remaining.minutes": "{number, plural, one {# minute} other {# minties}} left",
   "time_remaining.moments": "Moments remainin",
   "time_remaining.seconds": "{number, plural, one {# saicont} other {# saiconts}} left",
-  "timeline_hint.remote_resource_not_displayed": "{resource} fae ither servers urnae displayed.",
-  "timeline_hint.resources.followers": "Follaers",
-  "timeline_hint.resources.follows": "Follaes",
-  "timeline_hint.resources.statuses": "Aulder posts",
   "trends.counter_by_accounts": "{count, plural, one {{counter} body} other {{counter} fowk}} in the past {days, plural, one {day} other {{days} days}}",
   "trends.trending_now": "Trendin noo",
   "ui.beforeunload": "Yer draft wull be lost if ye lea Mastodon.",

app/javascript/mastodon/locales/si.json

@@ -11,7 +11,6 @@
   "account.block_domain": "{domain} වසම අවහිර කරන්න",
   "account.block_short": "අවහිර",
   "account.blocked": "අවහිර කර ඇත",
-  "account.browse_more_on_origin_server": "මුල් පැතිකඩෙහි තවත් පිරික්සන්න",
   "account.disable_notifications": "@{name} පළ කරන විට මට දැනුම් නොදෙන්න",
   "account.domain_blocked": "වසම අවහිර කර ඇත",
   "account.edit_profile": "පැතිකඩ සංස්කරණය",
@@ -418,8 +417,6 @@
   "status.edited_x_times": "සංශෝධිතයි {count, plural, one {වාර {count}} other {වාර {count}}}",
   "status.embed": "කාවැද්දූ",
   "status.filter": "මෙම ලිපිය පෙරන්න",
-  "status.filtered": "පෙරන ලද",
-  "status.hide": "ලිපිය සඟවන්න",
   "status.history.created": "{name} නිර්මාණය {date}",
   "status.history.edited": "{name} සංස්කරණය {date}",
   "status.load_more": "තව පූරණය",
@@ -438,10 +435,7 @@
   "status.report": "@{name} වාර්තා කරන්න",
   "status.sensitive_warning": "සංවේදී අන්තර්ගතයකි",
   "status.share": "බෙදාගන්න",
-  "status.show_filter_reason": "කෙසේ වුවද පෙන්වන්න",
-  "status.show_less": "අඩුවෙන් පෙන්වන්න",
   "status.show_less_all": "සියල්ල අඩුවෙන් පෙන්වන්න",
-  "status.show_more": "තවත් පෙන්වන්න",
   "status.show_more_all": "සියල්ල වැඩියෙන් පෙන්වන්න",
   "status.translate": "පරිවර්තනය",
   "status.translated_from_with": "{provider} මගින් {lang} භාෂාවෙන් පරිවර්තනය කර ඇත",
@@ -455,10 +449,6 @@
   "time_remaining.hours": "{number, plural, one {පැය #} other {පැය #}} ක් ඉතිරිය",
   "time_remaining.minutes": "{number, plural, one {විනාඩි #} other {විනාඩි #}} ක් ඉතිරිය",
   "time_remaining.seconds": "{number, plural, one {තත්පර #} other {තත්පර #}} ක් ඉතිරිය",
-  "timeline_hint.remote_resource_not_displayed": "වෙනත් සේවාදායකයන්ගෙන් {resource} දර්ශනය නොවේ.",
-  "timeline_hint.resources.followers": "අනුගාමිකයින්",
-  "timeline_hint.resources.follows": "අනුගමන",
-  "timeline_hint.resources.statuses": "පරණ ලිපි",
   "trends.trending_now": "දැන් නැගී එන",
   "ui.beforeunload": "ඔබ මාස්ටඩන් හැර ගියහොත් කටුපිටපත අහිමි වේ.",
   "units.short.billion": "{count}බී",

app/javascript/mastodon/locales/sk.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Blokovať doménu {domain}",
   "account.block_short": "Blokovať",
   "account.blocked": "Účet blokovaný",
-  "account.browse_more_on_origin_server": "Zobraziť viac na pôvodnom profile",
   "account.cancel_follow_request": "Zrušiť žiadosť o sledovanie",
   "account.copy": "Skopírovať odkaz na profil",
   "account.direct": "Súkromne označiť @{name}",
@@ -695,8 +694,6 @@
   "status.embed": "Vložiť",
   "status.favourite": "Ohviezdičkované",
   "status.filter": "Filtrovanie tohto príspevku",
-  "status.filtered": "Filtrované",
-  "status.hide": "Skryť príspevok",
   "status.history.created": "Vytvorené účtom {name} {date}",
   "status.history.edited": "Upravené účtom {name} {date}",
   "status.load_more": "Načitať viac",
@@ -723,10 +720,7 @@
   "status.report": "Nahlásiť @{name}",
   "status.sensitive_warning": "Citlivý obsah",
   "status.share": "Zdieľať",
-  "status.show_filter_reason": "Aj tak zobraziť",
-  "status.show_less": "Zobraziť menej",
   "status.show_less_all": "Všetkým zobraziť menej",
-  "status.show_more": "Zobraziť viac",
   "status.show_more_all": "Všetkým zobraziť viac",
   "status.show_original": "Zobraziť originál",
   "status.title.with_attachments": "Účet {user} nahral {attachmentCount, plural, one {prílohu} few {{attachmentCount} prílohy} many {{attachmentCount} príloh} other {{attachmentCount} príloh}}",
@@ -745,10 +739,6 @@
   "time_remaining.minutes": "Ostáva{number, plural, one { # minúta} few {jú # minúty} many { # minút} other { # minút}}",
   "time_remaining.moments": "Ostáva už iba chviľka",
   "time_remaining.seconds": "Ostáva{number, plural, one { # sekunda} few {jú # sekundy} many { # sekúnd} other { # sekúnd}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} z iných serverov sa nezobrazia.",
-  "timeline_hint.resources.followers": "Sledujúci",
-  "timeline_hint.resources.follows": "Sledovaní",
-  "timeline_hint.resources.statuses": "Staršie príspevky",
   "trends.counter_by_accounts": "{count, plural, one {{counter} osoba} few {{counter} ľudia} many {{counter} ľudí} other {{counter} ľudí}} za posledn{days, plural, one {ý deň} few {é {days} dni} many {ých {days} dní} other {ých {days} dní}}",
   "trends.trending_now": "Teraz populárne",
   "ui.beforeunload": "Po opustení Mastodonu prídete o to, čo máte rozpísané.",

app/javascript/mastodon/locales/sl.json

@@ -19,7 +19,6 @@
   "account.block_domain": "Blokiraj domeno {domain}",
   "account.block_short": "Blokiraj",
   "account.blocked": "Blokirano",
-  "account.browse_more_on_origin_server": "Brskaj več po izvirnem profilu",
   "account.cancel_follow_request": "Umakni zahtevo za sledenje",
   "account.copy": "Kopiraj povezavo do profila",
   "account.direct": "Zasebno omeni @{name}",
@@ -348,6 +347,8 @@
   "hashtag.follow": "Sledi ključniku",
   "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.threads.replies_may_be_missing": "Odgovori z drugih strežnikov morda manjkajo.",
   "home.column_settings.show_reblogs": "Pokaži izpostavitve",
   "home.column_settings.show_replies": "Pokaži odgovore",
   "home.hide_announcements": "Skrij obvestila",
@@ -447,8 +448,6 @@
   "mute_modal.title": "Utišaj uporabnika?",
   "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.",
-  "name_and_others": "{name} in {count, plural, one {# drug} two {# druga} few {# drugi} other {# drugih}}",
-  "name_and_others_with_link": "{name} in <a>{count, plural, one {# drug} two {# druga} few {# drugi} other {# drugih}}</a>",
   "navigation_bar.about": "O Mastodonu",
   "navigation_bar.advanced_interface": "Odpri v naprednem spletnem vmesniku",
   "navigation_bar.blocks": "Blokirani uporabniki",
@@ -508,6 +507,7 @@
   "notification.status": "{name} je pravkar objavil/a",
   "notification.update": "{name} je uredil(a) objavo",
   "notification_requests.accept": "Sprejmi",
+  "notification_requests.confirm_dismiss_multiple.title": "Želite opustiti zahteve za obvestila?",
   "notification_requests.dismiss": "Zavrni",
   "notification_requests.edit_selection": "Uredi",
   "notification_requests.exit_selection": "Opravljeno",
@@ -554,6 +554,8 @@
   "notifications.policy.accept": "Sprejmi",
   "notifications.policy.accept_hint": "Pokaži med obvestili",
   "notifications.policy.drop": "Prezri",
+  "notifications.policy.filter_limited_accounts_hint": "Omejeno s strani moderatorjev strežnika",
+  "notifications.policy.filter_limited_accounts_title": "Moderirani računi",
   "notifications.policy.filter_new_accounts.hint": "Ustvarjen v {days, plural, one {zadnjem # dnevu} two {zadnjih # dnevih} few {zadnjih # dnevih} other {zadnjih # dnevih}}",
   "notifications.policy.filter_new_accounts_title": "Novi računi",
   "notifications.policy.filter_not_followers_hint": "Vključujoč ljudi, ki vam sledijo manj kot {days, plural, one {# dan} two {# dneva} few {# dni} other {# dni}}",
@@ -749,8 +751,6 @@
   "status.favourite": "Priljubljen_a",
   "status.favourites": "{count, plural, one {priljubitev} two {priljubitvi} few {priljubitve} other {priljubitev}}",
   "status.filter": "Filtriraj to objavo",
-  "status.filtered": "Filtrirano",
-  "status.hide": "Skrij objavo",
   "status.history.created": "{name}: ustvarjeno {date}",
   "status.history.edited": "{name}: urejeno {date}",
   "status.load_more": "Naloži več",
@@ -778,10 +778,7 @@
   "status.report": "Prijavi @{name}",
   "status.sensitive_warning": "Občutljiva vsebina",
   "status.share": "Deli",
-  "status.show_filter_reason": "Vseeno pokaži",
-  "status.show_less": "Pokaži manj",
   "status.show_less_all": "Prikaži manj za vse",
-  "status.show_more": "Pokaži več",
   "status.show_more_all": "Pokaži več za vse",
   "status.show_original": "Pokaži izvirnik",
   "status.title.with_attachments": "{user} je objavil_a {attachmentCount, plural, one {{attachmentCount} priponko} two {{attachmentCount} priponki} few {{attachmentCount} priponke} other {{attachmentCount} priponk}}",
@@ -800,11 +797,6 @@
   "time_remaining.minutes": "{number, plural, one {# minuta} other {# minut}} je ostalo",
   "time_remaining.moments": "Preostali trenutki",
   "time_remaining.seconds": "{number, plural, one {# sekunda je preostala} two {# sekundi sta preostali} few {# sekunde so preostale} other {# sekund je preostalo}}",
-  "timeline_hint.remote_resource_not_displayed": "{resource} z drugih strežnikov ni prikazano.",
-  "timeline_hint.resources.followers": "sledilcev",
-  "timeline_hint.resources.follows": "Sledi",
-  "timeline_hint.resources.replies": "Nekaj odgovorov",
-  "timeline_hint.resources.statuses": "Starejše objave",
   "trends.counter_by_accounts": "{count, plural, one {{count} oseba} two {{count} osebi} few {{count} osebe} other {{count} oseb}} v {days, plural, one {zadnjem {day} dnevu} two {zadnjih {days} dneh} few {zadnjih {days} dneh} other {zadnjih {days} dneh}}",
   "trends.trending_now": "Zdaj v trendu",
   "ui.beforeunload": "Vaš osnutek bo izgubljen, če zapustite Mastodona.",