diff --git a/CHANGELOG.md b/CHANGELOG.md
index d47c9bc168..7388e5b461 100644
--- a/CHANGELOG.md
+++ b/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
+
+ ```
+ 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
diff --git a/Gemfile b/Gemfile
index 5b82fa98dd..9a6db1ec09 100644
--- a/Gemfile
+++ b/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'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8ea4fb66fd..62f6f091b8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -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)
@@ -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)
diff --git a/app/javascript/mastodon/locales/an.json b/app/javascript/mastodon/locales/an.json
index 4a82967877..7974cea640 100644
--- a/app/javascript/mastodon/locales/an.json
+++ b/app/javascript/mastodon/locales/an.json
@@ -483,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",
@@ -509,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}}",
diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json
index 6fd426b502..8d3289ff45 100644
--- a/app/javascript/mastodon/locales/ar.json
+++ b/app/javascript/mastodon/locales/ar.json
@@ -736,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": "حمّل المزيد",
@@ -765,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}}",
diff --git a/app/javascript/mastodon/locales/ast.json b/app/javascript/mastodon/locales/ast.json
index ac181c7ab1..74eb7021d3 100644
--- a/app/javascript/mastodon/locales/ast.json
+++ b/app/javascript/mastodon/locales/ast.json
@@ -422,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",
@@ -446,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}",
diff --git a/app/javascript/mastodon/locales/be.json b/app/javascript/mastodon/locales/be.json
index 29e636f50c..6335b546d7 100644
--- a/app/javascript/mastodon/locales/be.json
+++ b/app/javascript/mastodon/locales/be.json
@@ -745,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": "Загрузіць яшчэ",
@@ -774,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} далучэння}}",
diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json
index 6a5e66ad32..83d9c5343a 100644
--- a/app/javascript/mastodon/locales/bg.json
+++ b/app/javascript/mastodon/locales/bg.json
@@ -746,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": "Зареждане на още",
@@ -775,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} прикачвания}}",
diff --git a/app/javascript/mastodon/locales/bn.json b/app/javascript/mastodon/locales/bn.json
index 1c57b86f42..584bf303b1 100644
--- a/app/javascript/mastodon/locales/bn.json
+++ b/app/javascript/mastodon/locales/bn.json
@@ -411,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}কে উল্লেখ করতে",
@@ -434,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": "অনুবাদ",
diff --git a/app/javascript/mastodon/locales/br.json b/app/javascript/mastodon/locales/br.json
index dc1e549759..c8bb4975de 100644
--- a/app/javascript/mastodon/locales/br.json
+++ b/app/javascript/mastodon/locales/br.json
@@ -579,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",
@@ -607,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}}",
diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json
index 6ea94151f8..727c161873 100644
--- a/app/javascript/mastodon/locales/ca.json
+++ b/app/javascript/mastodon/locales/ca.json
@@ -192,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",
@@ -299,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",
@@ -785,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",
@@ -814,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}}",
diff --git a/app/javascript/mastodon/locales/ckb.json b/app/javascript/mastodon/locales/ckb.json
index 99ce6a8180..9def7533ae 100644
--- a/app/javascript/mastodon/locales/ckb.json
+++ b/app/javascript/mastodon/locales/ckb.json
@@ -542,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": "زیاتر بار بکە",
@@ -568,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}}",
diff --git a/app/javascript/mastodon/locales/co.json b/app/javascript/mastodon/locales/co.json
index f1783465d9..3a72ecd3fb 100644
--- a/app/javascript/mastodon/locales/co.json
+++ b/app/javascript/mastodon/locales/co.json
@@ -321,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}",
@@ -343,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",
diff --git a/app/javascript/mastodon/locales/cs.json b/app/javascript/mastodon/locales/cs.json
index b726fef18b..ebfaef3675 100644
--- a/app/javascript/mastodon/locales/cs.json
+++ b/app/javascript/mastodon/locales/cs.json
@@ -731,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",
@@ -760,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}}",
diff --git a/app/javascript/mastodon/locales/cy.json b/app/javascript/mastodon/locales/cy.json
index d405337659..d029f6bad1 100644
--- a/app/javascript/mastodon/locales/cy.json
+++ b/app/javascript/mastodon/locales/cy.json
@@ -762,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",
@@ -791,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}}",
diff --git a/app/javascript/mastodon/locales/da.json b/app/javascript/mastodon/locales/da.json
index 9a23d70bc6..a791ec75e0 100644
--- a/app/javascript/mastodon/locales/da.json
+++ b/app/javascript/mastodon/locales/da.json
@@ -192,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",
@@ -299,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",
@@ -785,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",
@@ -814,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}}",
diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json
index 5030a824ad..b960649eb2 100644
--- a/app/javascript/mastodon/locales/de.json
+++ b/app/javascript/mastodon/locales/de.json
@@ -192,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",
@@ -299,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",
@@ -785,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",
@@ -814,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}}",
diff --git a/app/javascript/mastodon/locales/el.json b/app/javascript/mastodon/locales/el.json
index 6cdb9d6f38..a3adaaf9d1 100644
--- a/app/javascript/mastodon/locales/el.json
+++ b/app/javascript/mastodon/locales/el.json
@@ -785,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": "Φόρτωσε περισσότερα",
@@ -814,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} συνημμένα}}",
diff --git a/app/javascript/mastodon/locales/en-GB.json b/app/javascript/mastodon/locales/en-GB.json
index c3366c6545..ec0db40f77 100644
--- a/app/javascript/mastodon/locales/en-GB.json
+++ b/app/javascript/mastodon/locales/en-GB.json
@@ -785,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",
@@ -814,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}}",
diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json
index a469e36409..76ca4980fa 100644
--- a/app/javascript/mastodon/locales/eo.json
+++ b/app/javascript/mastodon/locales/eo.json
@@ -632,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",
@@ -660,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}}",
diff --git a/app/javascript/mastodon/locales/es-AR.json b/app/javascript/mastodon/locales/es-AR.json
index baec70fd28..85561495d7 100644
--- a/app/javascript/mastodon/locales/es-AR.json
+++ b/app/javascript/mastodon/locales/es-AR.json
@@ -785,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",
@@ -814,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}}",
diff --git a/app/javascript/mastodon/locales/es-MX.json b/app/javascript/mastodon/locales/es-MX.json
index 929356352b..30a3a42fde 100644
--- a/app/javascript/mastodon/locales/es-MX.json
+++ b/app/javascript/mastodon/locales/es-MX.json
@@ -785,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",
@@ -814,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}}",
diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json
index 1b54fa615e..c047a2aa89 100644
--- a/app/javascript/mastodon/locales/es.json
+++ b/app/javascript/mastodon/locales/es.json
@@ -785,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",
@@ -814,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}}",
diff --git a/app/javascript/mastodon/locales/et.json b/app/javascript/mastodon/locales/et.json
index 9c358e0e57..80c65804fa 100644
--- a/app/javascript/mastodon/locales/et.json
+++ b/app/javascript/mastodon/locales/et.json
@@ -708,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",
@@ -737,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}}",
diff --git a/app/javascript/mastodon/locales/eu.json b/app/javascript/mastodon/locales/eu.json
index 8ab42965bf..a8e2e668c3 100644
--- a/app/javascript/mastodon/locales/eu.json
+++ b/app/javascript/mastodon/locales/eu.json
@@ -743,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",
@@ -772,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",
diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json
index 6d76bc3349..169c325ad7 100644
--- a/app/javascript/mastodon/locales/fa.json
+++ b/app/javascript/mastodon/locales/fa.json
@@ -657,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": "بار کردن بیشتر",
@@ -685,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} پیوست}} فرستاد",
diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json
index e6671e67bd..10f9d79614 100644
--- a/app/javascript/mastodon/locales/fi.json
+++ b/app/javascript/mastodon/locales/fi.json
@@ -192,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",
@@ -299,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",
@@ -785,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ää",
@@ -814,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}}",
diff --git a/app/javascript/mastodon/locales/fil.json b/app/javascript/mastodon/locales/fil.json
index 9eaa62facb..3100456091 100644
--- a/app/javascript/mastodon/locales/fil.json
+++ b/app/javascript/mastodon/locales/fil.json
@@ -328,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}",
diff --git a/app/javascript/mastodon/locales/fo.json b/app/javascript/mastodon/locales/fo.json
index 7d3421beb2..576cacef4e 100644
--- a/app/javascript/mastodon/locales/fo.json
+++ b/app/javascript/mastodon/locales/fo.json
@@ -192,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",
@@ -299,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",
@@ -785,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",
@@ -814,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}}",
diff --git a/app/javascript/mastodon/locales/fr-CA.json b/app/javascript/mastodon/locales/fr-CA.json
index 3def8ccfd7..667b7013ef 100644
--- a/app/javascript/mastodon/locales/fr-CA.json
+++ b/app/javascript/mastodon/locales/fr-CA.json
@@ -61,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",
@@ -92,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",
@@ -342,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",
@@ -409,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",
@@ -467,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.",
@@ -490,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",
@@ -526,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}}",
@@ -660,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",
@@ -691,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}",
@@ -714,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",
@@ -743,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}}",
diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json
index a2abe1efe1..11773e38e5 100644
--- a/app/javascript/mastodon/locales/fr.json
+++ b/app/javascript/mastodon/locales/fr.json
@@ -48,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",
@@ -61,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",
@@ -92,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",
@@ -342,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",
@@ -409,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",
@@ -467,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.",
@@ -490,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",
@@ -526,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}}",
@@ -660,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",
@@ -691,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}",
@@ -714,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",
@@ -743,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}}",
diff --git a/app/javascript/mastodon/locales/fy.json b/app/javascript/mastodon/locales/fy.json
index cf960cd0a2..0a985a0310 100644
--- a/app/javascript/mastodon/locales/fy.json
+++ b/app/javascript/mastodon/locales/fy.json
@@ -703,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",
@@ -732,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",
diff --git a/app/javascript/mastodon/locales/ga.json b/app/javascript/mastodon/locales/ga.json
index 9ba86fc5df..4407616499 100644
--- a/app/javascript/mastodon/locales/ga.json
+++ b/app/javascript/mastodon/locales/ga.json
@@ -762,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",
@@ -791,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}}",
diff --git a/app/javascript/mastodon/locales/gd.json b/app/javascript/mastodon/locales/gd.json
index be586e755c..8e6260b00f 100644
--- a/app/javascript/mastodon/locales/gd.json
+++ b/app/javascript/mastodon/locales/gd.json
@@ -762,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",
@@ -791,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}}",
diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json
index e4d5f560b4..9da7438da6 100644
--- a/app/javascript/mastodon/locales/gl.json
+++ b/app/javascript/mastodon/locales/gl.json
@@ -192,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",
@@ -299,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",
@@ -785,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",
@@ -814,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}}",
diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json
index c89d6387d6..1d21e3bda7 100644
--- a/app/javascript/mastodon/locales/he.json
+++ b/app/javascript/mastodon/locales/he.json
@@ -348,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": "הסתר הכרזות",
@@ -487,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} ועוד {count, plural,one {אחד נוסף}other {# נוספים}} חיבבו את הודעתך",
"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": "תשובה בפרטי",
@@ -507,6 +519,7 @@
"notification.own_poll": "הסקר שלך הסתיים",
"notification.poll": "סקר שהצבעת בו הסתיים",
"notification.reblog": "הודעתך הודהדה על ידי {name}",
+ "notification.reblog.name_and_others_with_link": "{name} ועוד {count, plural,one {אחד נוסף}other {# נוספים}} הדהדו את הודעתך",
"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 {# חשבונות}} מבין נעקביך.",
@@ -515,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": "הגדלה למקסימום",
@@ -762,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": "עוד",
@@ -791,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} צרופות}}",
diff --git a/app/javascript/mastodon/locales/hi.json b/app/javascript/mastodon/locales/hi.json
index 80f645ebe8..0b40251730 100644
--- a/app/javascript/mastodon/locales/hi.json
+++ b/app/javascript/mastodon/locales/hi.json
@@ -517,8 +517,6 @@
"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": "होम",
diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json
index 0eee4da8fc..0b42c49338 100644
--- a/app/javascript/mastodon/locales/hr.json
+++ b/app/javascript/mastodon/locales/hr.json
@@ -460,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",
@@ -487,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",
diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json
index 97f5a70294..b76b2e92cd 100644
--- a/app/javascript/mastodon/locales/hu.json
+++ b/app/javascript/mastodon/locales/hu.json
@@ -192,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",
@@ -299,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",
@@ -501,7 +504,7 @@
"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övethessenek",
+ "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",
@@ -785,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",
@@ -814,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.",
diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json
index 51a99bb022..1d82e884ff 100644
--- a/app/javascript/mastodon/locales/hy.json
+++ b/app/javascript/mastodon/locales/hy.json
@@ -452,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": "Բեռնել աւելին",
@@ -478,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}}",
diff --git a/app/javascript/mastodon/locales/ia.json b/app/javascript/mastodon/locales/ia.json
index 07bc88398f..2c3b04f998 100644
--- a/app/javascript/mastodon/locales/ia.json
+++ b/app/javascript/mastodon/locales/ia.json
@@ -728,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",
@@ -757,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}}",
diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json
index 27e967a9e4..b46e259199 100644
--- a/app/javascript/mastodon/locales/id.json
+++ b/app/javascript/mastodon/locales/id.json
@@ -571,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",
@@ -597,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}}",
diff --git a/app/javascript/mastodon/locales/ie.json b/app/javascript/mastodon/locales/ie.json
index 541b586de4..4002767cf9 100644
--- a/app/javascript/mastodon/locales/ie.json
+++ b/app/javascript/mastodon/locales/ie.json
@@ -703,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",
@@ -732,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}}",
diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json
index 8290d9d2e4..1329875185 100644
--- a/app/javascript/mastodon/locales/io.json
+++ b/app/javascript/mastodon/locales/io.json
@@ -593,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",
@@ -621,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}}",
diff --git a/app/javascript/mastodon/locales/is.json b/app/javascript/mastodon/locales/is.json
index 92dda83575..e4e21649cc 100644
--- a/app/javascript/mastodon/locales/is.json
+++ b/app/javascript/mastodon/locales/is.json
@@ -192,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",
@@ -299,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",
@@ -348,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",
@@ -487,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 {count, plural, one {# í viðbót hefur} other {# í viðbót hafa}} 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",
@@ -507,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 {count, plural, one {# í viðbót hefur} other {# í viðbót hafa}} 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ð.",
@@ -772,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",
@@ -801,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}}",
diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json
index e334d63fe7..8e3082359e 100644
--- a/app/javascript/mastodon/locales/it.json
+++ b/app/javascript/mastodon/locales/it.json
@@ -192,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",
@@ -299,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",
@@ -785,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",
@@ -814,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}}",
diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json
index bdae9707eb..c23c2f87d5 100644
--- a/app/javascript/mastodon/locales/ja.json
+++ b/app/javascript/mastodon/locales/ja.json
@@ -734,8 +734,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": "もっと見る",
@@ -763,10 +761,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}件のメディア)}}",
diff --git a/app/javascript/mastodon/locales/ka.json b/app/javascript/mastodon/locales/ka.json
index 16baf0c2d8..5713fe60ee 100644
--- a/app/javascript/mastodon/locales/ka.json
+++ b/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,9 +243,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": "საუბარზე გაჩუმების მოშორება",
diff --git a/app/javascript/mastodon/locales/kab.json b/app/javascript/mastodon/locales/kab.json
index c2b3db6e02..c5c0fa94c1 100644
--- a/app/javascript/mastodon/locales/kab.json
+++ b/app/javascript/mastodon/locales/kab.json
@@ -584,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",
@@ -612,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}}",
diff --git a/app/javascript/mastodon/locales/kk.json b/app/javascript/mastodon/locales/kk.json
index a150be5daf..85b2fdc005 100644
--- a/app/javascript/mastodon/locales/kk.json
+++ b/app/javascript/mastodon/locales/kk.json
@@ -317,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}",
@@ -339,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": "Пікірталасты үнсіз қылмау",
diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json
index cc4b6a9de5..fe1b30c6cc 100644
--- a/app/javascript/mastodon/locales/ko.json
+++ b/app/javascript/mastodon/locales/ko.json
@@ -780,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": "더 보기",
@@ -809,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}개의 첨부파일}}과 함께 게시함",
diff --git a/app/javascript/mastodon/locales/ku.json b/app/javascript/mastodon/locales/ku.json
index f62c600fe2..73cfa69f42 100644
--- a/app/javascript/mastodon/locales/ku.json
+++ b/app/javascript/mastodon/locales/ku.json
@@ -501,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",
@@ -527,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}}",
diff --git a/app/javascript/mastodon/locales/kw.json b/app/javascript/mastodon/locales/kw.json
index 90ae810470..0d60d09e30 100644
--- a/app/javascript/mastodon/locales/kw.json
+++ b/app/javascript/mastodon/locales/kw.json
@@ -319,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}",
@@ -341,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",
diff --git a/app/javascript/mastodon/locales/lad.json b/app/javascript/mastodon/locales/lad.json
index 9e082a742d..48aeec0795 100644
--- a/app/javascript/mastodon/locales/lad.json
+++ b/app/javascript/mastodon/locales/lad.json
@@ -704,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",
@@ -732,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}}",
diff --git a/app/javascript/mastodon/locales/lt.json b/app/javascript/mastodon/locales/lt.json
index 389e75bf86..027326f9cb 100644
--- a/app/javascript/mastodon/locales/lt.json
+++ b/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.title": "Ribota",
+ "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": "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,14 +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.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",
@@ -39,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",
@@ -54,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",
@@ -81,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.title": "Sparta ribota.",
+ "alert.rate_limited.message": "Bandyk vėl po {retry_time, time, medium}.",
+ "alert.rate_limited.title": "Sparta apribota.",
"alert.unexpected.message": "Įvyko netikėta klaida.",
"alert.unexpected.title": "Ups!",
"announcement.announcement": "Skelbimas",
@@ -93,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ą",
@@ -103,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.routing.body": "Prašyto puslapio nepavyko rasti. Ar esi tikras (-a), kad adreso juostoje nurodytas URL adresas yra teisingas?",
+ "bundle_column_error.return": "Atgal į pagrindinį",
+ "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_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.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ą 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.title": "Užsiregistruoti Mastodon",
+ "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 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",
@@ -130,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.moveRight_settings": "Judinti stulpelį į dešinę",
+ "column_header.moveLeft_settings": "Perkelti stulpelį į kairę",
+ "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ą",
@@ -147,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",
@@ -156,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_single": "Keisti apklausą, kad būtų galima pasirinkti vieną pasirinkimą",
+ "compose_form.poll.switch_to_multiple": "Keisti apklausą, kad būtų leidžiama pasirinkti kelis pasirinkimus",
+ "compose_form.poll.switch_to_single": "Keisti apklausą, kad būtų leidžiama pasirinkti vieną pasirinkimą",
"compose_form.poll.type": "Stilius",
"compose_form.publish": "Skelbti",
"compose_form.publish_form": "Naujas įrašas",
@@ -172,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šą?",
@@ -183,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.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.confirm": "Ištrinti ir iš naujo parengti",
+ "confirmations.redraft.message": "Ar tikrai nori ištrinti šį įrašą ir parengti jį iš naujo? Bus prarasti mėgstami ir pasidalinimai, o atsakymai į originalų įrašą bus panaikinti.",
"confirmations.redraft.title": "Ištrinti ir iš naujo parengti įrašą?",
"confirmations.reply.confirm": "Atsakyti",
"confirmations.reply.message": "Atsakant dabar, bus perrašyta šiuo metu kuriama žinutė. Ar tikrai nori tęsti?",
@@ -192,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į",
@@ -202,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.they_can_interact_with_old_posts": "Žmonės iš šio serverio gali sąveikauti su tavo senomis įrašomis.",
+ "domain_block_modal.block_account_instead": "Blokuoti @{name} vietoj to",
+ "domain_block_modal.they_can_interact_with_old_posts": "Žmonės iš šio serverio gali bendrauti su tavo senomis įrašomis.",
"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_like_language": "ActivityPub – tai tarsi kalba, kuria Mastodon kalba su kitais socialiniais tinklais.",
+ "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.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 .",
- "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 .",
+ "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 .",
+ "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 .",
"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.",
@@ -257,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.",
@@ -299,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",
@@ -775,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",
@@ -803,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ų}}",
diff --git a/app/javascript/mastodon/locales/lv.json b/app/javascript/mastodon/locales/lv.json
index 18bb12fbdf..6cd15afbec 100644
--- a/app/javascript/mastodon/locales/lv.json
+++ b/app/javascript/mastodon/locales/lv.json
@@ -654,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",
@@ -683,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}}",
diff --git a/app/javascript/mastodon/locales/ml.json b/app/javascript/mastodon/locales/ml.json
index 60f400487e..48ea29f983 100644
--- a/app/javascript/mastodon/locales/ml.json
+++ b/app/javascript/mastodon/locales/ml.json
@@ -309,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} സൂചിപ്പിക്കുക",
@@ -327,8 +326,6 @@
"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": "ഹോം",
diff --git a/app/javascript/mastodon/locales/ms.json b/app/javascript/mastodon/locales/ms.json
index 695d4e4083..c9f8b7a274 100644
--- a/app/javascript/mastodon/locales/ms.json
+++ b/app/javascript/mastodon/locales/ms.json
@@ -615,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",
@@ -643,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}}",
diff --git a/app/javascript/mastodon/locales/my.json b/app/javascript/mastodon/locales/my.json
index 903dc8d919..b042ebbcce 100644
--- a/app/javascript/mastodon/locales/my.json
+++ b/app/javascript/mastodon/locales/my.json
@@ -593,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": "ပို၍ဆောင်ရွက်ပါ",
@@ -621,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}}",
diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json
index ed9eaeec3a..b15c09fead 100644
--- a/app/javascript/mastodon/locales/nl.json
+++ b/app/javascript/mastodon/locales/nl.json
@@ -192,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",
@@ -299,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",
@@ -785,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",
@@ -814,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",
diff --git a/app/javascript/mastodon/locales/nn.json b/app/javascript/mastodon/locales/nn.json
index 502fd0ab3b..dd9fa5fd92 100644
--- a/app/javascript/mastodon/locales/nn.json
+++ b/app/javascript/mastodon/locales/nn.json
@@ -192,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",
@@ -762,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",
@@ -791,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}}",
diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json
index a81d9932d6..a3780de550 100644
--- a/app/javascript/mastodon/locales/no.json
+++ b/app/javascript/mastodon/locales/no.json
@@ -617,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",
@@ -645,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}}",
diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json
index b219470098..a4e552ba45 100644
--- a/app/javascript/mastodon/locales/oc.json
+++ b/app/javascript/mastodon/locales/oc.json
@@ -509,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",
@@ -537,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}}",
diff --git a/app/javascript/mastodon/locales/pa.json b/app/javascript/mastodon/locales/pa.json
index 7298227e6d..a71c01b3c1 100644
--- a/app/javascript/mastodon/locales/pa.json
+++ b/app/javascript/mastodon/locales/pa.json
@@ -341,9 +341,6 @@
"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": "ਤਬਦੀਲੀਆਂ ਸੰਭਾਲੋ",
diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json
index 48f9ee1e89..2a4c5d6e44 100644
--- a/app/javascript/mastodon/locales/pl.json
+++ b/app/javascript/mastodon/locales/pl.json
@@ -192,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ę",
@@ -299,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",
@@ -784,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",
@@ -813,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}}",
diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json
index b14c6ce49b..14957c16d4 100644
--- a/app/javascript/mastodon/locales/pt-BR.json
+++ b/app/javascript/mastodon/locales/pt-BR.json
@@ -726,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",
@@ -755,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}}",
diff --git a/app/javascript/mastodon/locales/pt-PT.json b/app/javascript/mastodon/locales/pt-PT.json
index e084beea28..e2414963c5 100644
--- a/app/javascript/mastodon/locales/pt-PT.json
+++ b/app/javascript/mastodon/locales/pt-PT.json
@@ -743,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",
@@ -772,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}}",
diff --git a/app/javascript/mastodon/locales/ro.json b/app/javascript/mastodon/locales/ro.json
index 21e93510ce..5b1901fbe0 100644
--- a/app/javascript/mastodon/locales/ro.json
+++ b/app/javascript/mastodon/locales/ro.json
@@ -559,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",
@@ -587,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}}",
diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json
index 642550369a..94f82e422d 100644
--- a/app/javascript/mastodon/locales/ru.json
+++ b/app/javascript/mastodon/locales/ru.json
@@ -718,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": "Загрузить остальное",
@@ -746,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} вложений}}",
diff --git a/app/javascript/mastodon/locales/sa.json b/app/javascript/mastodon/locales/sa.json
index 11b428f064..6ca4eafe19 100644
--- a/app/javascript/mastodon/locales/sa.json
+++ b/app/javascript/mastodon/locales/sa.json
@@ -506,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": "अधिकं स्थापय",
diff --git a/app/javascript/mastodon/locales/sc.json b/app/javascript/mastodon/locales/sc.json
index 5f09924074..461383191e 100644
--- a/app/javascript/mastodon/locales/sc.json
+++ b/app/javascript/mastodon/locales/sc.json
@@ -548,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}",
@@ -570,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",
diff --git a/app/javascript/mastodon/locales/sco.json b/app/javascript/mastodon/locales/sco.json
index 191bcbd3e0..e8ae521ae5 100644
--- a/app/javascript/mastodon/locales/sco.json
+++ b/app/javascript/mastodon/locales/sco.json
@@ -477,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",
@@ -502,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}}",
diff --git a/app/javascript/mastodon/locales/si.json b/app/javascript/mastodon/locales/si.json
index ce48fbaa8c..a9288fd104 100644
--- a/app/javascript/mastodon/locales/si.json
+++ b/app/javascript/mastodon/locales/si.json
@@ -417,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": "තව පූරණය",
@@ -437,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} භාෂාවෙන් පරිවර්තනය කර ඇත",
diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json
index babb6e3054..dfb1309ddf 100644
--- a/app/javascript/mastodon/locales/sk.json
+++ b/app/javascript/mastodon/locales/sk.json
@@ -694,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",
@@ -722,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}}",
diff --git a/app/javascript/mastodon/locales/sl.json b/app/javascript/mastodon/locales/sl.json
index 9bbbcc5978..6e8ac52df3 100644
--- a/app/javascript/mastodon/locales/sl.json
+++ b/app/javascript/mastodon/locales/sl.json
@@ -347,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",
@@ -505,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",
@@ -551,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}}",
@@ -746,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č",
@@ -775,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}}",
diff --git a/app/javascript/mastodon/locales/sq.json b/app/javascript/mastodon/locales/sq.json
index 904955f422..39abd13d95 100644
--- a/app/javascript/mastodon/locales/sq.json
+++ b/app/javascript/mastodon/locales/sq.json
@@ -785,8 +785,6 @@
"status.favourite": "I vini shenjë si të parapëlqyer",
"status.favourites": "{count, plural, one {i parapëlqyer} other {të parapëlqyer}}",
"status.filter": "Filtroje këtë postim",
- "status.filtered": "I filtruar",
- "status.hide": "Fshihe postimin",
"status.history.created": "{name} u krijua më {date}",
"status.history.edited": "{name} u përpunua më {date}",
"status.load_more": "Ngarko më tepër",
@@ -814,10 +812,7 @@
"status.report": "Raportojeni @{name}",
"status.sensitive_warning": "Lëndë rezervat",
"status.share": "Ndajeni me të tjerë",
- "status.show_filter_reason": "Shfaqe, sido qoftë",
- "status.show_less": "Shfaq më pak",
"status.show_less_all": "Shfaq më pak për të tërë",
- "status.show_more": "Shfaq më tepër",
"status.show_more_all": "Shfaq më tepër për të tërë",
"status.show_original": "Shfaq origjinalin",
"status.title.with_attachments": "{user} postoi {attachmentCount, plural, one {një bashkëngjitje} other {{attachmentCount} bashkëngjitje}}",
diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json
index b82445cf97..d550f6517c 100644
--- a/app/javascript/mastodon/locales/sr-Latn.json
+++ b/app/javascript/mastodon/locales/sr-Latn.json
@@ -711,8 +711,6 @@
"status.favourite": "Omiljeno",
"status.favourites": "{count, plural, one {# omiljeno} few {# omiljena} other {# omiljenih}}",
"status.filter": "Filtriraj ovu objavu",
- "status.filtered": "Filtrirano",
- "status.hide": "Sakrij objavu",
"status.history.created": "{name} napisao/la {date}",
"status.history.edited": "{name} uredio/la {date}",
"status.load_more": "Učitaj još",
@@ -740,10 +738,7 @@
"status.report": "Prijavi @{name}",
"status.sensitive_warning": "Osetljiv sadržaj",
"status.share": "Podeli",
- "status.show_filter_reason": "Ipak prikaži",
- "status.show_less": "Prikaži manje",
"status.show_less_all": "Prikaži manje za sve",
- "status.show_more": "Prikaži više",
"status.show_more_all": "Prikaži više za sve",
"status.show_original": "Prikaži orginal",
"status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json
index 604a4e81d4..f608d46a20 100644
--- a/app/javascript/mastodon/locales/sr.json
+++ b/app/javascript/mastodon/locales/sr.json
@@ -711,8 +711,6 @@
"status.favourite": "Омиљено",
"status.favourites": "{count, plural, one {# омиљено} few {# омиљена} other {# омиљених}}",
"status.filter": "Филтрирај ову објаву",
- "status.filtered": "Филтрирано",
- "status.hide": "Сакриј објаву",
"status.history.created": "{name} написао/ла {date}",
"status.history.edited": "{name} уредио/ла {date}",
"status.load_more": "Учитај још",
@@ -740,10 +738,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} прилога} other {{attachmentCount} прилога}}",
diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json
index 3be1ade074..a4a30fbbc5 100644
--- a/app/javascript/mastodon/locales/sv.json
+++ b/app/javascript/mastodon/locales/sv.json
@@ -348,8 +348,13 @@
"hashtag.follow": "Följ hashtagg",
"hashtag.unfollow": "Avfölj hashtagg",
"hashtags.and_other": "…och {count, plural, one {}other {# mer}}",
+ "hints.profiles.followers_may_be_missing": "Det kan saknas vissa följare av denna profil.",
+ "hints.profiles.follows_may_be_missing": "Det kan saknas vissa följare av denna profil.",
+ "hints.profiles.posts_may_be_missing": "Det kan saknas vissa följare för denna profil.",
"hints.profiles.see_more_followers": "Se fler följare på {domain}",
+ "hints.profiles.see_more_follows": "Se fler följare på {domain}",
"hints.profiles.see_more_posts": "Se fler inlägg på {domain}",
+ "hints.threads.replies_may_be_missing": "Det kan saknas svar från andra servrar.",
"hints.threads.see_more": "Se fler svar på {domain}",
"home.column_settings.show_reblogs": "Visa boostar",
"home.column_settings.show_replies": "Visa svar",
@@ -358,6 +363,17 @@
"home.pending_critical_update.link": "Se uppdateringar",
"home.pending_critical_update.title": "En kritisk säkerhetsuppdatering är tillgänglig!",
"home.show_announcements": "Visa notiser",
+ "ignore_notifications_modal.disclaimer": "Mastodon kan inte informera användarna om att du har ignorerat deras meddelanden. Ignorering av aviseringar kommer inte att stoppa själva meddelandena från att skickas.",
+ "ignore_notifications_modal.filter_instead": "Filtrera istället",
+ "ignore_notifications_modal.filter_to_act_users": "Du kommer fortfarande att kunna acceptera, avvisa eller rapportera användare",
+ "ignore_notifications_modal.filter_to_avoid_confusion": "Filtrering hjälper till att undvika eventuell förvirring",
+ "ignore_notifications_modal.filter_to_review_separately": "Du kan granska filtrerade aviseringar separat",
+ "ignore_notifications_modal.ignore": "Ignorera notifikationer",
+ "ignore_notifications_modal.limited_accounts_title": "Vill du ignorera aviseringar från modererade konton?",
+ "ignore_notifications_modal.new_accounts_title": "Vill du ignorera aviseringar från nya konton?",
+ "ignore_notifications_modal.not_followers_title": "Vill du ignorera aviseringar från personer som inte följer dig?",
+ "ignore_notifications_modal.not_following_title": "Vill du blockera aviseringar från personer som du inte följer dig?",
+ "ignore_notifications_modal.private_mentions_title": "Vill du ignorera aviseringar från oönskade privata omnämningar?",
"interaction_modal.description.favourite": "Med ett Mastodon-konto kan du favoritmarkera detta inlägg för att visa författaren att du gillar det och för att spara det till senare.",
"interaction_modal.description.follow": "Med ett Mastodon-konto kan du följa {name} för att se hens inlägg i ditt hemflöde.",
"interaction_modal.description.reblog": "Med ett Mastodon-konto kan du boosta detta inlägg för att dela den med dina egna följare.",
@@ -479,9 +495,18 @@
"notification.admin.report_statuses": "{name} rapporterade {target} för {category}",
"notification.admin.report_statuses_other": "{name} rapporterade {target}",
"notification.admin.sign_up": "{name} registrerade sig",
+ "notification.admin.sign_up.name_and_others": "{name} och {count, plural, one {# en annan} other {# andra}} har registrerat sig",
"notification.favourite": "{name} favoritmarkerade ditt inlägg",
+ "notification.favourite.name_and_others_with_link": "{name} och {count, plural, one {# annan} other {# andra}} har favoritmarkerat ditt inlägg",
"notification.follow": "{name} följer dig",
+ "notification.follow.name_and_others": "{name} och {count, plural, one {# en annan} other {# andra}} följer dig",
"notification.follow_request": "{name} har begärt att följa dig",
+ "notification.follow_request.name_and_others": "{name} och {count, plural, one {# en annan} other {# andra}} har bett att följa dig",
+ "notification.label.mention": "Nämn",
+ "notification.label.private_mention": "Privat nämning",
+ "notification.label.private_reply": "Privata svar",
+ "notification.label.reply": "Svar",
+ "notification.mention": "Nämn",
"notification.moderation-warning.learn_more": "Läs mer",
"notification.moderation_warning": "Du har fått en moderationsvarning",
"notification.moderation_warning.action_delete_statuses": "Några av dina inlägg har tagits bort.",
@@ -494,6 +519,7 @@
"notification.own_poll": "Din röstning har avslutats",
"notification.poll": "En enkät som du röstat i har avslutats",
"notification.reblog": "{name} boostade ditt inlägg",
+ "notification.reblog.name_and_others_with_link": "{name} och {count, plural, one {# annan} other {# andra}} har förhöjt ditt inlägg",
"notification.relationships_severance_event": "Förlorade kontakter med {name}",
"notification.relationships_severance_event.account_suspension": "En administratör från {from} har stängt av {target}, vilket innebär att du inte längre kan ta emot uppdateringar från dem eller interagera med dem.",
"notification.relationships_severance_event.domain_block": "En administratör från {from} har blockerat {target}, inklusive {followersCount} av dina följare och {followingCount, plural, one {# konto} other {# konton}} du följer.",
@@ -504,11 +530,22 @@
"notification_requests.accept": "Godkänn",
"notification_requests.accept_multiple": "{count, plural, one {Acceptera # förfrågan…} other {Acceptera # förfrågningar…}}",
"notification_requests.confirm_accept_multiple.button": "{count, plural, one {Acceptera förfrågan} other {Acceptera förfrågningar}}",
+ "notification_requests.confirm_accept_multiple.message": "Du håller på att acceptera {count, plural, one {en förfrågan} other {# förfrågningar}} om avisering. Är du säker på att du vill fortsätta?",
+ "notification_requests.confirm_accept_multiple.title": "Vill du acceptera aviseringsförfrågningar?",
+ "notification_requests.confirm_dismiss_multiple.button": "Avvisa {count, plural, one {# förfrågan} other {# förfrågningar}}",
+ "notification_requests.confirm_dismiss_multiple.message": "Du håller på att avfärda {count, plural, one {en begäran} other {# begäran}} om aviseringar. Du kommer inte enkelt att kunna komma åt {count, plural, one {det} other {dem}} igen. Är du säker på att du vill fortsätta?",
+ "notification_requests.confirm_dismiss_multiple.title": "Vill du acceptera aviseringsförfrågningar?",
"notification_requests.dismiss": "Avfärda",
+ "notification_requests.dismiss_multiple": "Avvisa {count, plural, one {# förfrågan} other {# förfrågningar}}...",
"notification_requests.edit_selection": "Redigera",
"notification_requests.exit_selection": "Klar",
+ "notification_requests.explainer_for_limited_account": "Aviseringar från detta konto har filtrerats eftersom kontot har begränsats av en moderator.",
+ "notification_requests.explainer_for_limited_remote_account": "Aviseringar från detta konto eller denna server har filtrerats eftersom kontot har begränsats av en moderator.",
+ "notification_requests.maximize": "Maximera",
+ "notification_requests.minimize_banner": "Minimera ruta för filtrerade aviseringar",
"notification_requests.notifications_from": "Aviseringar från {name}",
"notification_requests.title": "Filtrerade meddelanden",
+ "notification_requests.view": "Visa aviseringar",
"notifications.clear": "Rensa aviseringar",
"notifications.clear_confirmation": "Är du säker på att du vill rensa alla dina aviseringar permanent?",
"notifications.clear_title": "Rensa aviseringar?",
@@ -546,7 +583,13 @@
"notifications.permission_denied_alert": "Skrivbordsaviseringar kan inte aktiveras, eftersom att webbläsarens behörighet har nekats innan",
"notifications.permission_required": "Skrivbordsaviseringar är otillgängliga eftersom att rättigheten som krävs inte har godkänts.",
"notifications.policy.accept": "Acceptera",
+ "notifications.policy.accept_hint": "Visa bland aviseringar",
"notifications.policy.drop": "Ignorera",
+ "notifications.policy.drop_hint": "Skicka ut i tomrummet för aldrig synas till igen",
+ "notifications.policy.filter": "Filtrera",
+ "notifications.policy.filter_hint": "Skicka till inkorgen för filtrerade aviserings",
+ "notifications.policy.filter_limited_accounts_hint": "Begränsade av servermoderatorer",
+ "notifications.policy.filter_limited_accounts_title": "Modererade konton",
"notifications.policy.filter_new_accounts.hint": "Skapad inom de senaste {days, plural, one {dagen} other {# dagarna}}",
"notifications.policy.filter_new_accounts_title": "Nya konton",
"notifications.policy.filter_not_followers_hint": "Inklusive personer som har följt dig kortare än {days, plural, one {en dag} other {# dagar}}",
@@ -555,6 +598,7 @@
"notifications.policy.filter_not_following_title": "Personer du inte följer",
"notifications.policy.filter_private_mentions_hint": "Filtrerat om det inte är som svar på ditt eget omnämnande eller om du följer avsändaren",
"notifications.policy.filter_private_mentions_title": "Oombedda privata omnämnanden",
+ "notifications.policy.title": "Hantera aviseringar från…",
"notifications_permission_banner.enable": "Aktivera skrivbordsaviseringar",
"notifications_permission_banner.how_to_control": "För att ta emot aviseringar när Mastodon inte är öppet, aktivera skrivbordsaviseringar. När de är aktiverade kan du styra exakt vilka typer av interaktioner som aviseras via {icon} -knappen ovan.",
"notifications_permission_banner.title": "Missa aldrig något",
@@ -741,8 +785,6 @@
"status.favourite": "Favoritmarkera",
"status.favourites": "{count, plural, one {favorit} other {favoriter}}",
"status.filter": "Filtrera detta inlägg",
- "status.filtered": "Filtrerat",
- "status.hide": "Dölj inlägg",
"status.history.created": "{name} skapade {date}",
"status.history.edited": "{name} redigerade {date}",
"status.load_more": "Ladda fler",
@@ -770,10 +812,7 @@
"status.report": "Rapportera @{name}",
"status.sensitive_warning": "Känsligt innehåll",
"status.share": "Dela",
- "status.show_filter_reason": "Visa ändå",
- "status.show_less": "Visa mindre",
"status.show_less_all": "Visa mindre för alla",
- "status.show_more": "Visa mer",
"status.show_more_all": "Visa mer för alla",
"status.show_original": "Visa original",
"status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
diff --git a/app/javascript/mastodon/locales/ta.json b/app/javascript/mastodon/locales/ta.json
index 377d06a3ec..4bded45679 100644
--- a/app/javascript/mastodon/locales/ta.json
+++ b/app/javascript/mastodon/locales/ta.json
@@ -347,7 +347,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}",
@@ -369,9 +368,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": "ஊமையாக உரையாடல் இல்லை",
diff --git a/app/javascript/mastodon/locales/te.json b/app/javascript/mastodon/locales/te.json
index a18f16740d..52cb612d86 100644
--- a/app/javascript/mastodon/locales/te.json
+++ b/app/javascript/mastodon/locales/te.json
@@ -247,7 +247,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}ను ప్రస్తావించు",
@@ -268,9 +267,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": "సంభాషణను అన్మ్యూట్ చేయి",
diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json
index 7384342c8f..9dbaa5a6cb 100644
--- a/app/javascript/mastodon/locales/th.json
+++ b/app/javascript/mastodon/locales/th.json
@@ -753,8 +753,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": "โหลดเพิ่มเติม",
@@ -782,10 +780,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} ไฟล์แนบ}}",
diff --git a/app/javascript/mastodon/locales/tok.json b/app/javascript/mastodon/locales/tok.json
index 8c0a860b84..19e33233c0 100644
--- a/app/javascript/mastodon/locales/tok.json
+++ b/app/javascript/mastodon/locales/tok.json
@@ -362,7 +362,6 @@
"status.edit": "o ante",
"status.embed": "ni o lon insa pi lipu ante",
"status.favourite": "o sitelen pona",
- "status.hide": "o len",
"status.history.created": "{name} li pali e ni lon {date}",
"status.history.edited": "{name} li ante lon {date}",
"status.load_more": "o kama e ijo ante",
@@ -376,10 +375,7 @@
"status.pinned": "toki sewi",
"status.reblog": "o wawa",
"status.share": "o pana tawa ante",
- "status.show_filter_reason": "o lukin",
- "status.show_less": "o lili e ni",
"status.show_less_all": "o lili e ale",
- "status.show_more": "o suli e ni",
"status.show_more_all": "o suli e ale",
"status.show_original": "o lukin e mama",
"status.translate": "o ante pi nasin toki",
diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json
index 7839011c1d..23a25a7299 100644
--- a/app/javascript/mastodon/locales/tr.json
+++ b/app/javascript/mastodon/locales/tr.json
@@ -785,8 +785,6 @@
"status.favourite": "Favori",
"status.favourites": "{count, plural, one {beğeni} other {beğeni}}",
"status.filter": "Bu gönderiyi süzgeçle",
- "status.filtered": "Süzgeçlenmiş",
- "status.hide": "Gönderiyi gizle",
"status.history.created": "{name} oluşturdu {date}",
"status.history.edited": "{name} düzenledi {date}",
"status.load_more": "Daha fazlası",
@@ -814,10 +812,7 @@
"status.report": "@{name} adlı kişiyi bildir",
"status.sensitive_warning": "Hassas içerik",
"status.share": "Paylaş",
- "status.show_filter_reason": "Yine de göster",
- "status.show_less": "Daha az göster",
"status.show_less_all": "Hepsi için daha az göster",
- "status.show_more": "Daha fazlasını göster",
"status.show_more_all": "Hepsi için daha fazla göster",
"status.show_original": "Özgün içeriği göster",
"status.title.with_attachments": "{user}, {attachmentCount, plural, one {1 ek} other {{attachmentCount} ek}} gönderdi",
diff --git a/app/javascript/mastodon/locales/tt.json b/app/javascript/mastodon/locales/tt.json
index 3106c98007..1439e2ef58 100644
--- a/app/javascript/mastodon/locales/tt.json
+++ b/app/javascript/mastodon/locales/tt.json
@@ -411,8 +411,6 @@
"status.edit": "Үзгәртү",
"status.edited_x_times": "Edited {count, plural, one {# time} other {# times}}",
"status.embed": "Веб-биткә кертү",
- "status.filtered": "Сөзелгән",
- "status.hide": "Язманы яшерү",
"status.history.created": "{name} ясалды {date}",
"status.history.edited": "{name} төзәтте {date}",
"status.load_more": "Күбрәк йөкләү",
@@ -426,9 +424,6 @@
"status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
"status.reply": "Җавап бирү",
"status.share": "Уртаклашу",
- "status.show_filter_reason": "Барыбер карау",
- "status.show_less": "Әзрәк күрсәтү",
- "status.show_more": "Күбрәк күрсәтү",
"status.title.with_attachments": "{user} posted {attachmentCount, plural, one {an attachment} other {# attachments}}",
"status.translate": "Тәрҗемә итү",
"subscribed_languages.save": "Үзгәрешләрне саклау",
diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json
index a6172ce095..7f8b33594d 100644
--- a/app/javascript/mastodon/locales/uk.json
+++ b/app/javascript/mastodon/locales/uk.json
@@ -785,8 +785,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": "Завантажити більше",
@@ -814,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 {вкладення} few {{attachmentCount} вкладення} many {{attachmentCount} вкладень} other {{attachmentCount} вкладень}}",
diff --git a/app/javascript/mastodon/locales/vi.json b/app/javascript/mastodon/locales/vi.json
index f422fbbdb4..a0c28db77e 100644
--- a/app/javascript/mastodon/locales/vi.json
+++ b/app/javascript/mastodon/locales/vi.json
@@ -768,8 +768,6 @@
"status.favourite": "Thích",
"status.favourites": "{count, plural, other {lượt thích}}",
"status.filter": "Lọc tút này",
- "status.filtered": "Bộ lọc",
- "status.hide": "Ẩn tút",
"status.history.created": "{name} đăng {date}",
"status.history.edited": "{name} đã sửa {date}",
"status.load_more": "Tải thêm",
@@ -797,10 +795,7 @@
"status.report": "Báo cáo @{name}",
"status.sensitive_warning": "Nhạy cảm",
"status.share": "Chia sẻ",
- "status.show_filter_reason": "Vẫn cứ xem",
- "status.show_less": "Thu gọn",
"status.show_less_all": "Thu gọn toàn bộ",
- "status.show_more": "Xem thêm",
"status.show_more_all": "Hiển thị tất cả",
"status.show_original": "Bản gốc",
"status.title.with_attachments": "{user} đã đăng {attachmentCount, plural, other {{attachmentCount} đính kèm}}",
diff --git a/app/javascript/mastodon/locales/zgh.json b/app/javascript/mastodon/locales/zgh.json
index de003e3921..d9367520e8 100644
--- a/app/javascript/mastodon/locales/zgh.json
+++ b/app/javascript/mastodon/locales/zgh.json
@@ -185,9 +185,7 @@
"status.reblogs.empty": "No one has boosted this toot yet. When someone does, they will show up here.",
"status.reply": "ⵔⴰⵔ",
"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}}",
"tabs_bar.home": "ⴰⵙⵏⵓⴱⴳ",
diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json
index 2beeb761e5..44608c6071 100644
--- a/app/javascript/mastodon/locales/zh-CN.json
+++ b/app/javascript/mastodon/locales/zh-CN.json
@@ -785,8 +785,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": "加载更多",
@@ -814,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} 个附件}}",
diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json
index 170ef8e70d..8543090b9a 100644
--- a/app/javascript/mastodon/locales/zh-HK.json
+++ b/app/javascript/mastodon/locales/zh-HK.json
@@ -704,8 +704,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": "載入更多",
@@ -733,10 +731,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}}",
diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json
index 110d3c9c46..107267b5e5 100644
--- a/app/javascript/mastodon/locales/zh-TW.json
+++ b/app/javascript/mastodon/locales/zh-TW.json
@@ -192,6 +192,8 @@
"confirmations.unfollow.confirm": "取消跟隨",
"confirmations.unfollow.message": "您確定要取消跟隨 {name} 嗎？",
"confirmations.unfollow.title": "是否取消跟隨該使用者？",
+ "content_warning.hide": "隱藏嘟文",
+ "content_warning.show": "仍要顯示",
"conversation.delete": "刪除對話",
"conversation.mark_as_read": "標記為已讀",
"conversation.open": "檢視對話",
@@ -299,6 +301,7 @@
"filter_modal.select_filter.subtitle": "使用既有的類別或是新增",
"filter_modal.select_filter.title": "過濾此嘟文",
"filter_modal.title.status": "過濾一則嘟文",
+ "filter_warning.matches_filter": "匹配過濾器「{title}」",
"filtered_notifications_banner.pending_requests": "來自您可能認識的 {count, plural, =0 {0 人} other {# 人}}",
"filtered_notifications_banner.title": "已過濾之推播通知",
"firehose.all": "全部",
@@ -785,8 +788,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": "載入更多",
@@ -814,10 +815,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} 個附加檔案}}",
diff --git a/config/initializers/statsd.rb b/config/initializers/statsd.rb
deleted file mode 100644
index f1628a9d12..0000000000
--- a/config/initializers/statsd.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-if ENV['STATSD_ADDR'].present?
- host, port = ENV['STATSD_ADDR'].split(':')
-
- begin
- statsd = Statsd.new(host, port)
- statsd.namespace = ENV.fetch('STATSD_NAMESPACE') { ['Mastodon', Rails.env].join('.') }
-
- NSA.inform_statsd(statsd) do |informant|
- informant.collect(:action_controller, :web)
- informant.collect(:active_record, :db)
- informant.collect(:active_support_cache, :cache)
- informant.collect(:sidekiq, :sidekiq) if ENV['STATSD_SIDEKIQ'] == 'true'
- end
- rescue
- Rails.logger.warn("statsd address #{ENV['STATSD_ADDR']} not reachable, proceeding without statsd")
- end
-end
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 7cf675559d..d8de84c283 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -877,6 +877,7 @@ ca:
name: Nom
newest: Més nous
oldest: Més vells
+ open: Vegeu en públic
reset: Restableix
review: Revisar l'estat
search: Cerca
diff --git a/config/locales/da.yml b/config/locales/da.yml
index 416618ec99..94f2369f8e 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -898,6 +898,7 @@ da:
name: Navn
newest: Seneste
oldest: Ældste
+ open: Vis offentligt
reset: Nulstil
review: Gennmgangsstatus
search: Søg
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 9bb070caf3..a852c736cf 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -898,6 +898,7 @@ de:
name: Name
newest: Neueste
oldest: Älteste
+ open: Öffentlich anzeigen
reset: Zurücksetzen
review: Prüfstatus
search: Suchen
diff --git a/config/locales/doorkeeper.lt.yml b/config/locales/doorkeeper.lt.yml
index d04e4c9f2c..ccdf866848 100644
--- a/config/locales/doorkeeper.lt.yml
+++ b/config/locales/doorkeeper.lt.yml
@@ -185,14 +185,14 @@ lt:
write: modifikuoti visus tavo paskyros duomenis
write:accounts: modifikuoti tavo profilį
write:blocks: blokuoti paskyras ir domenus
- write:bookmarks: pridėti į žymes įrašus
+ write:bookmarks: pridėti įrašus į žymes
write:conversations: nutildyti ir ištrinti pokalbius
write:favourites: pamėgti įrašus
- write:filters: sukurti filtrus
+ write:filters: kurti filtrus
write:follows: sekti žmones
- write:lists: sukurti sąrašus
+ write:lists: kurti sąrašus
write:media: įkelti medijos failus
write:mutes: nutildyti žmones ir pokalbius
- write:notifications: išvalyti tavo pranešimus
+ write:notifications: valyti tavo pranešimus
write:reports: pranešti apie kitus žmones
write:statuses: skelbti įrašus
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index aaf30fa760..95190d8846 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -898,6 +898,7 @@ fi:
name: Nimi
newest: Uusimmat
oldest: Vanhimmat
+ open: Näytä julkisesti
reset: Palauta
review: Tarkastuksen tila
search: Hae
diff --git a/config/locales/fo.yml b/config/locales/fo.yml
index 4dd7fa3386..b2309694b1 100644
--- a/config/locales/fo.yml
+++ b/config/locales/fo.yml
@@ -898,6 +898,7 @@ fo:
name: Navn
newest: Nýggjasta/u
oldest: Elsta/u
+ open: Vís fyri øllum
reset: Endurstilla
review: Eftirkanna støðu
search: Leita
diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml
index 6ad27bc62d..4542b24858 100644
--- a/config/locales/fr-CA.yml
+++ b/config/locales/fr-CA.yml
@@ -847,7 +847,10 @@ fr-CA:
action: Pour plus d'informations, cliquez ici
message_html: "Votre serveur web est mal configuré. La confidentialité de vos utilisateurs est en péril."
tags:
+ name: Nom
review: État du traitement
+ search: Recherche
+ title: Hashtags
updated_msg: Paramètres du hashtag mis à jour avec succès
title: Administration
trends:
@@ -912,12 +915,14 @@ fr-CA:
used_by_over_week:
one: Utilisé par %{count} personne au cours de la dernière semaine
other: Utilisé par %{count} personnes au cours de la dernière semaine
+ title: Recommandations et tendances
trending: Tendances
warning_presets:
add_new: Ajouter un nouveau
delete: Supprimer
edit_preset: Éditer les avertissements prédéfinis
empty: Vous n'avez pas encore créé de paramètres prédéfinis pour les avertissements.
+ title: Préréglages d'avertissement
webhooks:
add_new: Ajouter un point de terminaison
delete: Supprimer
@@ -1065,6 +1070,7 @@ fr-CA:
setup:
email_settings_hint_html: Cliquez sur le lien que nous vous avons envoyé pour vérifier %{email}. Nous vous attendrons ici.
link_not_received: Vous n'avez pas reçu de lien?
+ new_confirmation_instructions_sent: Vous allez recevoir un nouvel e-mail avec le lien de confirmation dans quelques minutes !
title: Vérifiez votre boîte de réception
sign_in:
preamble_html: Connectez-vous avec vos identifiants sur %{domain}. Si votre compte est hébergé sur un autre serveur, vous ne pourrez pas vous connecter ici.
@@ -1076,6 +1082,7 @@ fr-CA:
status:
account_status: État du compte
functional: Votre compte est entièrement opérationnel.
+ pending: Votre demande est en attente d’examen par notre équipe. Cela peut prendre un certain temps. Vous recevrez un e-mail si votre demande est approuvée.
redirecting_to: Votre compte est inactif car il est actuellement redirigé vers %{acct}.
self_destruct: Comme %{domain} est en train de fermer, vous n’aurez qu’un accès limité à votre compte.
view_strikes: Voir les sanctions précédemment appliquées à votre compte
@@ -1118,6 +1125,7 @@ fr-CA:
before: 'Veuillez lire attentivement ces notes avant de continuer :'
caches: Le contenu mis en cache par d'autres serveurs peut persister
data_removal: Vos messages et autres données seront définitivement supprimés
+ email_change_html: Vous pouvez modifier votre adresse e-mail sans supprimer votre compte
irreversible: Vous ne pourrez pas restaurer ou réactiver votre compte
more_details_html: Pour plus de détails, voir la politique de confidentialité.
username_available: Votre nom d’utilisateur·rice sera à nouveau disponible
@@ -1350,6 +1358,7 @@ fr-CA:
authentication_methods:
otp: application d'authentification à deux facteurs
password: mot de passe
+ sign_in_token: code de sécurité par courriel
webauthn: clés de sécurité
description_html: Si vous voyez une activité que vous ne reconnaissez pas, envisagez de changer votre mot de passe et d'activer l'authentification à deux facteurs.
empty: Aucun historique d'authentification disponible
@@ -1440,6 +1449,8 @@ fr-CA:
update:
subject: "%{name} a modifié un message"
notifications:
+ administration_emails: Notifications d'administration par courriel
+ email_events: Événements pour les notifications par e-mail
email_events_hint: 'Sélectionnez les événements pour lesquels vous souhaitez recevoir des notifications :'
number:
human:
@@ -1598,6 +1609,7 @@ fr-CA:
import: Import de données
import_and_export: Import et export
migrate: Migration de compte
+ notifications: Notifications par courriel
preferences: Préférences
profile: Profil
relationships: Abonnements et abonné·e·s
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 0a2b0f860d..38c9ca299a 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -847,7 +847,10 @@ fr:
action: Pour plus d'informations, cliquez ici
message_html: "Votre serveur web est mal configuré. La confidentialité de vos utilisateurs est en péril."
tags:
+ name: Nom
review: État du traitement
+ search: Recherche
+ title: Hashtags
updated_msg: Paramètres du hashtag mis à jour avec succès
title: Administration
trends:
@@ -912,12 +915,14 @@ fr:
used_by_over_week:
one: Utilisé par %{count} personne au cours de la dernière semaine
other: Utilisé par %{count} personnes au cours de la dernière semaine
+ title: Recommandations et tendances
trending: Tendances
warning_presets:
add_new: Ajouter un nouveau
delete: Supprimer
edit_preset: Éditer les avertissements prédéfinis
empty: Vous n'avez pas encore créé de paramètres prédéfinis pour les avertissements.
+ title: Préréglages d'avertissement
webhooks:
add_new: Ajouter un point de terminaison
delete: Supprimer
@@ -1065,6 +1070,7 @@ fr:
setup:
email_settings_hint_html: Cliquez sur le lien que nous vous avons envoyé pour vérifier l’adresse %{email}. Nous vous attendons ici.
link_not_received: Vous n'avez pas reçu de lien ?
+ new_confirmation_instructions_sent: Vous allez recevoir un nouvel e-mail avec le lien de confirmation dans quelques minutes !
title: Vérifiez votre boîte de réception
sign_in:
preamble_html: Connectez-vous avec vos identifiants sur %{domain}. Si votre compte est hébergé sur un autre serveur, vous ne pourrez pas vous connecter ici.
@@ -1076,6 +1082,7 @@ fr:
status:
account_status: État du compte
functional: Votre compte est entièrement opérationnel.
+ pending: Votre demande est en attente d’examen par notre équipe. Cela peut prendre un certain temps. Vous recevrez un e-mail si votre demande est approuvée.
redirecting_to: Votre compte est inactif car il est actuellement redirigé vers %{acct}.
self_destruct: Comme %{domain} est en train de fermer, vous n’aurez qu’un accès limité à votre compte.
view_strikes: Voir les sanctions précédemment appliquées à votre compte
@@ -1118,6 +1125,7 @@ fr:
before: 'Veuillez lire attentivement ces notes avant de continuer :'
caches: Le contenu mis en cache par d'autres serveurs peut persister
data_removal: Vos messages et autres données seront définitivement supprimés
+ email_change_html: Vous pouvez modifier votre adresse e-mail sans supprimer votre compte
irreversible: Vous ne pourrez pas restaurer ou réactiver votre compte
more_details_html: Pour plus de détails, voir la politique de confidentialité.
username_available: Votre nom d’utilisateur·rice sera à nouveau disponible
@@ -1350,6 +1358,7 @@ fr:
authentication_methods:
otp: application d'authentification à deux facteurs
password: mot de passe
+ sign_in_token: code de sécurité par courriel
webauthn: clés de sécurité
description_html: Si vous voyez une activité que vous ne reconnaissez pas, envisagez de changer votre mot de passe et d'activer l'authentification à deux facteurs.
empty: Aucun historique d'authentification disponible
@@ -1440,6 +1449,8 @@ fr:
update:
subject: "%{name} a modifié un message"
notifications:
+ administration_emails: Notifications d'administration par courriel
+ email_events: Événements pour les notifications par e-mail
email_events_hint: 'Sélectionnez les événements pour lesquels vous souhaitez recevoir des notifications :'
number:
human:
@@ -1598,6 +1609,7 @@ fr:
import: Import de données
import_and_export: Import et export
migrate: Migration de compte
+ notifications: Notifications par courriel
preferences: Préférences
profile: Profil
relationships: Abonnements et abonné·e·s
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index c9382f05b3..71df4c8d93 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -898,6 +898,7 @@ gl:
name: Nome
newest: Máis recente
oldest: Máis antiga
+ open: Ver públicamente
reset: Restabelecer
review: Estado de revisión
search: Buscar
diff --git a/config/locales/he.yml b/config/locales/he.yml
index d090302311..72b4156dbf 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -926,6 +926,7 @@ he:
name: שם
newest: החדש ביותר
oldest: הישן ביותר
+ open: צפיה בפומבי
reset: איפוס
review: סקירת מצב
search: חיפוש
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 5eb4d04881..cdddc79b0e 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -898,6 +898,7 @@ hu:
name: Név
newest: Legújabb
oldest: Legrégebbi
+ open: Megtekintés nyilvánosan
reset: Visszaállítás
review: Engedélyezés állapota
search: Keresés
diff --git a/config/locales/is.yml b/config/locales/is.yml
index 4da16a1ce9..41347d44bb 100644
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -900,6 +900,7 @@ is:
name: Nafn
newest: Nýjast
oldest: Elsta
+ open: Skoða opinberlega
reset: Endurstilla
review: Yfirfara stöðufærslu
search: Leita
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 1664100101..bc60b6ea50 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -898,6 +898,7 @@ it:
name: Nome
newest: Più recenti
oldest: Più vecchio
+ open: Visualizza pubblicamente
reset: Ripristina
review: Esamina status
search: Cerca
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 6cd647e740..fd3dbc00b1 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -605,6 +605,7 @@ lt:
name: Pavadinimas
newest: Naujausias
oldest: Seniausias
+ open: Peržiūrėti viešai
reset: Atkurti
search: Paieška
title: Saitažodžiai
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index c782a41b7d..0c125acd07 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -898,6 +898,7 @@ nl:
name: Naam
newest: Nieuwste
oldest: Oudste
+ open: Openbaar bekijken
reset: Opnieuw
review: Status beoordelen
search: Zoeken
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 2201a2695a..d79df666e5 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -926,6 +926,7 @@ pl:
name: Nazwa
newest: Najnowsze
oldest: Najstarsze
+ open: Zobacz w widoku publicznym
reset: Resetuj
review: Stan przeglądu
search: Szukaj
diff --git a/config/locales/simple_form.fr-CA.yml b/config/locales/simple_form.fr-CA.yml
index b9582fab74..4e67db2db6 100644
--- a/config/locales/simple_form.fr-CA.yml
+++ b/config/locales/simple_form.fr-CA.yml
@@ -77,6 +77,7 @@ fr-CA:
warn: Cacher le contenu filtré derrière un avertissement mentionnant le nom du filtre
form_admin_settings:
activity_api_enabled: Nombre de messages publiés localement, de comptes actifs et de nouvelles inscriptions par tranche hebdomadaire
+ backups_retention_period: Les utilisateur·rice·s ont la possibilité de générer des archives de leurs messages pour les télécharger plus tard. Lorsqu'elles sont définies à une valeur positive, ces archives seront automatiquement supprimées de votre stockage après le nombre de jours spécifié.
bootstrap_timeline_accounts: Ces comptes seront épinglés en tête de liste des recommandations pour les nouveaux utilisateurs.
closed_registrations_message: Affiché lorsque les inscriptions sont fermées
custom_css: Vous pouvez appliquer des styles personnalisés sur la version Web de Mastodon.
@@ -206,6 +207,7 @@ fr-CA:
setting_default_privacy: Confidentialité des messages
setting_default_sensitive: Toujours marquer les médias comme sensibles
setting_delete_modal: Demander confirmation avant de supprimer un message
+ setting_disable_hover_cards: Désactiver l'aperçu du profil au survol
setting_disable_swiping: Désactiver les actions par glissement
setting_display_media: Affichage des médias
setting_display_media_default: Défaut
@@ -241,6 +243,7 @@ fr-CA:
backups_retention_period: Période d'archivage utilisateur
bootstrap_timeline_accounts: Toujours recommander ces comptes aux nouveaux utilisateurs
closed_registrations_message: Message personnalisé lorsque les inscriptions ne sont pas disponibles
+ content_cache_retention_period: Durée de rétention du contenu distant
custom_css: CSS personnalisé
favicon: Favicon
mascot: Mascotte personnalisée (héritée)
@@ -307,6 +310,7 @@ fr-CA:
listable: Autoriser ce hashtag à apparaître dans les recherches et dans l’annuaire des profils
name: Mot-clic
trendable: Autoriser ce hashtag à apparaitre dans les tendances
+ usable: Autoriser les messages à utiliser ce hashtag localement
user:
role: Rôle
time_zone: Fuseau horaire
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 99e0e1f210..a9df5375f3 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -77,6 +77,7 @@ fr:
warn: Cacher le contenu filtré derrière un avertissement mentionnant le nom du filtre
form_admin_settings:
activity_api_enabled: Nombre de messages publiés localement, de comptes actifs et de nouvelles inscriptions par tranche hebdomadaire
+ backups_retention_period: Les utilisateur·rice·s ont la possibilité de générer des archives de leurs messages pour les télécharger plus tard. Lorsqu'elles sont définies à une valeur positive, ces archives seront automatiquement supprimées de votre stockage après le nombre de jours spécifié.
bootstrap_timeline_accounts: Ces comptes seront épinglés en tête de liste des recommandations pour les nouveaux utilisateurs.
closed_registrations_message: Affiché lorsque les inscriptions sont fermées
custom_css: Vous pouvez appliquer des styles personnalisés sur la version Web de Mastodon.
@@ -206,6 +207,7 @@ fr:
setting_default_privacy: Confidentialité des messages
setting_default_sensitive: Toujours marquer les médias comme sensibles
setting_delete_modal: Demander confirmation avant de supprimer un message
+ setting_disable_hover_cards: Désactiver l'aperçu du profil au survol
setting_disable_swiping: Désactiver les actions par glissement
setting_display_media: Affichage des médias
setting_display_media_default: Défaut
@@ -241,6 +243,7 @@ fr:
backups_retention_period: Durée de rétention des archives utilisateur
bootstrap_timeline_accounts: Toujours recommander ces comptes aux nouveaux⋅elles utilisateur⋅rice⋅s
closed_registrations_message: Message personnalisé lorsque les inscriptions ne sont pas disponibles
+ content_cache_retention_period: Durée de rétention du contenu distant
custom_css: CSS personnalisé
favicon: Favicon
mascot: Mascotte personnalisée (héritée)
@@ -307,6 +310,7 @@ fr:
listable: Autoriser ce hashtag à apparaître dans les recherches et dans l’annuaire des profils
name: Hashtag
trendable: Autoriser ce hashtag à apparaitre dans les tendances
+ usable: Autoriser les messages à utiliser ce hashtag localement
user:
role: Rôle
time_zone: Fuseau horaire
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index b0b974d742..329cabf941 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -159,7 +159,7 @@ sv:
title: Rubrik
admin_account_action:
include_statuses: Inkludera rapporterade inlägg i e-postmeddelandet
- send_email_notification: Notifiera användaren via e-post
+ send_email_notification: Avisera användaren via e-post
text: Anpassad varning
type: Åtgärd
types:
@@ -314,6 +314,7 @@ sv:
listable: Tillåt denna hashtagg att visas i sökningar och förslag
name: Hashtagg
trendable: Tillåt denna hashtagg att visas under trender
+ usable: Tillåt inlägg att använda denna fyrkantstagg
user:
role: Roll
time_zone: Tidszon
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index d13c42e263..ffaa8e00b9 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -891,6 +891,7 @@ sq:
name: Emër
newest: Më të rejat
oldest: Më të vjetrat
+ open: Shiheni Publikisht
reset: Riktheje te parazgjedhjet
review: Gjendje rishikimi
search: Kërkim
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 1a54451716..e47f506e6b 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -58,6 +58,7 @@ sv:
demote: Degradera
destroyed_msg: "%{username}'s data har nu lagts till kön för att raderas omedelbart"
disable: inaktivera
+ disable_sign_in_token_auth: Inaktivera autentisering med pollett via e-post
disable_two_factor_authentication: Inaktivera 2FA
disabled: inaktiverad
display_name: Visningsnamn
@@ -66,6 +67,7 @@ sv:
email: E-post
email_status: E-poststatus
enable: Aktivera
+ enable_sign_in_token_auth: Aktivera autentisering med pollett via e-post
enabled: Aktiverad
enabled_msg: Uppfrysningen av %{username}'s konto lyckades
followers: Följare
@@ -130,6 +132,7 @@ sv:
resubscribe: Starta en ny prenumeration
role: Roll
search: Sök
+ search_same_email_domain: Andra användare med samma e-postdomän
search_same_ip: Annan användare med samma IP-adress
security: Säkerhet
security_measures:
@@ -170,6 +173,7 @@ sv:
approve_appeal: Godkänn överklagande
approve_user: Godkänn användare
assigned_to_self_report: Tilldela anmälan
+ change_email_user: Ändra e-postadress för användare
change_role_user: Ändra roll för användaren
confirm_user: Bekräfta användare
create_account_warning: Skapa varning
@@ -192,8 +196,10 @@ sv:
destroy_user_role: Förstör roll
disable_2fa_user: Inaktivera 2FA
disable_custom_emoji: Inaktivera egna emojis
+ disable_sign_in_token_auth_user: Inaktivera autentisering med pollett via e-post för användare
disable_user: Inaktivera användare
enable_custom_emoji: Aktivera egna emojis
+ enable_sign_in_token_auth_user: Aktivera autentisering med pollett via e-post för användare
enable_user: Aktivera användare
memorialize_account: Minnesmärk konto
promote_user: Befordra användare
@@ -223,6 +229,7 @@ sv:
approve_appeal_html: "%{name} godkände överklagande av modereringsbeslut från %{target}"
approve_user_html: "%{name} godkände registrering från %{target}"
assigned_to_self_report_html: "%{name} tilldelade rapporten %{target} till sig själva"
+ change_email_user_html: "%{name} bytte e-postadress för användaren %{target}"
change_role_user_html: "%{name} ändrade roll för %{target}"
create_account_warning_html: "%{name} skickade en varning till %{target}"
create_announcement_html: "%{name} skapade kungörelsen %{target}"
@@ -1093,6 +1100,7 @@ sv:
status:
account_status: Kontostatus
functional: Ditt konto fungerar som det ska.
+ pending: Din ansökan inväntar granskning. Detta kan ta tid. Du kommer att få ett e-postmeddelande om din ansökan har godkänts.
redirecting_to: Ditt konto är inaktivt eftersom det för närvarande dirigeras om till %{acct}.
self_destruct: Eftersom %{domain} håller på att stängas ned, kommer du endast att ha begränsad tillgång till ditt konto.
view_strikes: Visa tidigare prickar på ditt konto
@@ -1136,6 +1144,8 @@ sv:
caches: Innehåll som har cachats av andra servrar kan bibehållas
data_removal: Dina inlägg och annan data kommer permanent raderas
email_change_html: Du kan ändra din e-postadress utan att radera ditt konto
+ email_contact_html: Om det inte kommer kan du mejla %{email} för att få hjälp
+ email_reconfirmation_html: Om du inte får bekräftelsemeddelandet kan du begära ett på nytt
irreversible: Du kan inte återställa eller återaktivera ditt konto
more_details_html: För mer information, se integritetspolicyn.
username_available: Ditt användarnamn kommer att bli tillgängligt igen
@@ -1368,6 +1378,7 @@ sv:
authentication_methods:
otp: tvåfaktorsautentiseringsapp
password: lösenord
+ sign_in_token: e-postsäkerhetskod
webauthn: säkerhetsnycklar
description_html: Om du ser aktivitet som du inte känner igen, överväg att byta ditt lösenord och aktivera tvåfaktor-autentisering.
empty: Ingen autentiseringshistorik tillgänglig
@@ -1378,6 +1389,16 @@ sv:
unsubscribe:
action: Ja, avsluta prenumerationen
complete: Prenumeration avslutad
+ confirmation_html: Är du säker på att du vill avregistrera dig från att ta emot %{type} för Mastodon på %{domain} med din e-post på %{email}? Du kan alltid återprenumerera bland dina e-postmeddelandeinställningar.
+ emails:
+ notification_emails:
+ favourite: aviseringsmejl för favoriserade inlägg
+ follow: aviseringsmejl för följda inlägg
+ follow_request: aviseringsmejl för följdförfrågningar
+ mention: aviseringsmejl för inlägg där du nämns
+ reblog: aviseringsmejl för förhöjda inlägg
+ resubscribe_html: Om du slutat prenumerera av misstag kan du återprenumerera i dina e-postaviseringsinställningar.
+ success_html: Du får inte längre %{type} för Mastodon på %{domain} till din e-post på %{email}.
title: Avsluta prenumeration
media_attachments:
validations:
@@ -1458,6 +1479,8 @@ sv:
update:
subject: "%{name} redigerade ett inlägg"
notifications:
+ administration_emails: E-postaviseringar från administratör
+ email_events: Händelser vid e-postnotiser
email_events_hint: 'Välj händelser som du vill ta emot aviseringar för:'
number:
human:
@@ -1616,6 +1639,7 @@ sv:
import: Importera
import_and_export: Import och export
migrate: Kontoflytt
+ notifications: E-postaviseringar
preferences: Inställningar
profile: Profil
relationships: Följer och följare
@@ -1862,6 +1886,7 @@ sv:
invalid_otp_token: Ogiltig tvåfaktorskod
otp_lost_help_html: Om du förlorat åtkomst till båda kan du komma i kontakt med %{email}
rate_limited: För många autentiseringsförsök, försök igen senare.
+ seamless_external_login: Du är inloggad via en extern tjänst. Därför finns inställningar för lösenord och e-post inte tillgängliga.
signed_in_as: 'Inloggad som:'
verification:
extra_instructions_html: Tips: Länken på din webbplats kan vara osynlig. Den viktiga delen är rel="me" som förhindrar personifiering på webbplatser med användargenererat innehåll. Du kan även använda en länk tagg i huvudet på sidan istället för en, men HTML:en måste vara tillgänglig utan att exekvera JavaScript.
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 94d3d73816..fc9fde3615 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -898,6 +898,7 @@ tr:
name: Ad
newest: En yeni
oldest: En eski
+ open: Herkese Açık Görüntüle
reset: Sıfırla
review: Durumu gözden geçir
search: Ara
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index a7b48dc320..faff0b4e42 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -926,6 +926,7 @@ uk:
name: Назва
newest: Найновіші
oldest: Найдавніші
+ open: Переглянути публічно
reset: Скинути
review: Переглянути допис
search: Пошук
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index df1d1cc810..f85646b5bc 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -886,6 +886,7 @@ zh-TW:
name: 名稱
newest: 最新
oldest: 最舊
+ open: 公開檢視
reset: 重設
review: 審核嘟文
search: 搜尋
diff --git a/docker-compose.yml b/docker-compose.yml
index 1c4ab536a8..05fd9e1887 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -58,7 +58,7 @@ services:
web:
build: .
- image: ghcr.io/mastodon/mastodon:v4.2.11
+ image: ghcr.io/mastodon/mastodon:v4.3.0-beta.1
restart: always
env_file: .env.production
command: bundle exec puma -C config/puma.rb
@@ -67,7 +67,7 @@ services:
- internal_network
healthcheck:
# prettier-ignore
- test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:3000/health || exit 1']
+ test: ['CMD-SHELL',"curl -s --noproxy localhost localhost:3000/health | grep -q 'OK' || exit 1"]
ports:
- '127.0.0.1:3000:3000'
depends_on:
@@ -79,16 +79,16 @@ services:
streaming:
build: .
- image: ghcr.io/mastodon/mastodon:v4.2.11
+ image: ghcr.io/mastodon/mastodon-streaming:v4.3.0-beta.1
restart: always
env_file: .env.production
- command: node ./streaming
+ command: node ./streaming/index.js
networks:
- external_network
- internal_network
healthcheck:
# prettier-ignore
- test: ['CMD-SHELL', 'wget -q --spider --proxy=off localhost:4000/api/v1/streaming/health || exit 1']
+ test: ['CMD-SHELL', "curl -s --noproxy localhost localhost:4000/api/v1/streaming/health | grep -q 'OK' || exit 1'"]
ports:
- '127.0.0.1:4000:4000'
depends_on:
@@ -97,7 +97,7 @@ services:
sidekiq:
build: .
- image: ghcr.io/mastodon/mastodon:v4.2.11
+ image: ghcr.io/mastodon/mastodon:v4.3.0-beta.1
restart: always
env_file: .env.production
command: bundle exec sidekiq
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index 0709dfd1d6..39e09340c0 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -17,7 +17,7 @@ module Mastodon
end
def default_prerelease
- 'alpha.5'
+ 'beta.1'
end
def prerelease
diff --git a/lib/tasks/repo.rake b/lib/tasks/repo.rake
index 1ed1ee5c32..b90b48934e 100644
--- a/lib/tasks/repo.rake
+++ b/lib/tasks/repo.rake
@@ -49,24 +49,32 @@ namespace :repo do
File.open(path, 'r') do |file|
file.each_line do |line|
if line.start_with?('-')
- new_line = line.gsub(/[(]#([[:digit:]]+)[)]\Z/) do |pull_request_reference|
- pull_request_number = pull_request_reference[2..-2]
+ new_line = line.gsub(/\(#([[:digit:]]+)(, #([[:digit:]]+))*\)\Z/) do |pull_requests_string|
+ pull_requests = pull_requests_string[1...-1].split(',').map { |pr_id| pr_id.strip[1...] }
response = nil
- loop do
- response = HTTP.headers('Authorization' => "token #{ENV['GITHUB_API_TOKEN']}").get("https://api.github.com/repos/#{REPOSITORY_NAME}/pulls/#{pull_request_number}")
+ authors = pull_requests.map do |pull_request_number|
+ response = nil
- if response.code == 403
- sleep_for = (response.headers['X-RateLimit-Reset'].to_i - Time.now.to_i).abs
- puts "Sleeping for #{sleep_for} seconds to get over rate limit"
- sleep sleep_for
- else
- break
+ loop do
+ response = HTTP.headers('Authorization' => "token #{ENV['GITHUB_API_TOKEN']}").get("https://api.github.com/repos/#{REPOSITORY_NAME}/pulls/#{pull_request_number}")
+
+ if response.code == 403
+ sleep_for = (response.headers['X-RateLimit-Reset'].to_i - Time.now.to_i).abs
+ puts "Sleeping for #{sleep_for} seconds to get over rate limit"
+ sleep sleep_for
+ else
+ break
+ end
end
+
+ pull_request = Oj.load(response.to_s)
+ pull_request['user']['login']
end
- pull_request = Oj.load(response.to_s)
- "([#{pull_request['user']['login']}](#{pull_request['html_url']}))"
+ authors.sort!.uniq!
+
+ "(#{pull_requests.map { |pr| "##{pr}" }.to_sentence} by #{authors.map { |author| "@#{author}" }.to_sentence})"
end
tmp.puts new_line
diff --git a/spec/requests/oauth/token_spec.rb b/spec/requests/oauth/token_spec.rb
new file mode 100644
index 0000000000..39ea9b35ff
--- /dev/null
+++ b/spec/requests/oauth/token_spec.rb
@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe 'Obtaining OAuth Tokens' do
+ describe 'POST /oauth/token' do
+ subject do
+ post '/oauth/token', params: params
+ end
+
+ let(:application) do
+ Fabricate(:application, scopes: 'read write follow', redirect_uri: 'urn:ietf:wg:oauth:2.0:oob')
+ end
+ let(:params) do
+ {
+ grant_type: grant_type,
+ client_id: application.uid,
+ client_secret: application.secret,
+ redirect_uri: 'urn:ietf:wg:oauth:2.0:oob',
+ code: code,
+ scope: scope,
+ }
+ end
+
+ context "with grant_type 'authorization_code'" do
+ let(:grant_type) { 'authorization_code' }
+ let(:code) do
+ access_grant = Fabricate(:access_grant, application: application, redirect_uri: 'urn:ietf:wg:oauth:2.0:oob', scopes: 'read write')
+ access_grant.plaintext_token
+ end
+
+ shared_examples 'returns originally requested scopes' do
+ it 'returns all scopes requested for the given code' do
+ subject
+
+ expect(response).to have_http_status(200)
+ expect(body_as_json[:scope]).to eq 'read write'
+ end
+ end
+
+ context 'with no scopes specified' do
+ let(:scope) { nil }
+
+ include_examples 'returns originally requested scopes'
+ end
+
+ context 'with scopes specified' do
+ context 'when the scopes were requested for this code' do
+ let(:scope) { 'write' }
+
+ include_examples 'returns originally requested scopes'
+ end
+
+ context 'when the scope was not requested for the code' do
+ let(:scope) { 'follow' }
+
+ include_examples 'returns originally requested scopes'
+ end
+
+ context 'when the scope does not belong to the application' do
+ let(:scope) { 'push' }
+
+ include_examples 'returns originally requested scopes'
+ end
+ end
+ end
+
+ context "with grant_type 'client_credentials'" do
+ let(:grant_type) { 'client_credentials' }
+ let(:code) { nil }
+
+ context 'with no scopes specified' do
+ let(:scope) { nil }
+
+ it 'returns only the default scope' do
+ subject
+
+ expect(response).to have_http_status(200)
+ expect(body_as_json[:scope]).to eq('read')
+ end
+ end
+
+ context 'with scopes specified' do
+ context 'when the scopes belong to the application' do
+ let(:scope) { 'read write' }
+
+ it 'returns all the requested scopes' do
+ subject
+
+ expect(response).to have_http_status(200)
+ expect(body_as_json[:scope]).to eq 'read write'
+ end
+ end
+
+ context 'when some scopes do not belong to the application' do
+ let(:scope) { 'read write push' }
+
+ it 'returns an error' do
+ subject
+
+ expect(response).to have_http_status(400)
+ end
+ end
+ end
+ end
+ end
+end