Leatherface/mastodon
0
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2026-03-29 03:00:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '98f98249ffc3de0d020fa2ed9068b1cb82168984' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2025-06-17 18:56:38 +02:00
parent d2d5767f32 98f98249ff
commit fc87ce7ca1
26 changed files with 141 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
CHANGELOG.md
View File

@@ -7,7 +7,7 @@ All notable changes to this project will be documented in this file.
### Added
- **Add “Followers you know” widget to user profiles and hover cards** (#34652, #34678, #34681, #34697, #34699, #34769, #34774 and #34914 by @diondiondion)
- **Add featured tab to profiles on web UI and rework pinned posts** (#34405, #34483, #34491, #34754, #34855, #34858, #34868, and #34869 by @ChaosExAnima, @ClearlyClaire, @Gargron, and @diondiondion)
- **Add featured tab to profiles on web UI and rework pinned posts** (#34405, #34483, #34491, #34754, #34855, #34858, #34868, #34869, #34927, #34995, #35056 and #34931 by @ChaosExAnima, @ClearlyClaire, @Gargron, and @diondiondion)
- Add endorsed accounts to featured tab in web UI (#34421 and #34568 by @Gargron)\
This also includes the following new REST API endpoints:
- `GET /api/v1/accounts/:id/endorsements`: https://docs.joinmastodon.org/methods/accounts/#endorsements
@@ -19,14 +19,14 @@ All notable changes to this project will be documented in this file.
- `POST /api/v1/tags/:id/unfeature`: https://docs.joinmastodon.org/methods/tags/#unfeature
- Add reminder when about to post without alt text in web UI (#33760 and #33784 by @Gargron)
- Add a warning in Web UI when composing a post when the selected and detected language are different (#33042, #33683, #33700, #33724, #33770, and #34193 by @ClearlyClaire and @Gargron)
- Add ability to reorder and translate server rules (#34637, #34737, #34494, #34756, and #34820 by @ChaosExAnima and @ClearlyClaire)\
- Add support for verifying and displaying remote quote posts (#34370, #34481, #34510, #34551, #34480, #34479, #34553, #34584, #34623, #34738, #34766, #34770, #34772, #34773, #34786, #34790, #34864, #34957, #34961, #35016, #35022, #35036, #34946, #34945 and #34958 by @ClearlyClaire and @diondiondion)\
Support for verifying remote quotes according to [FEP-044f](https://codeberg.org/fediverse/fep/src/branch/main/fep/044f/fep-044f.md) and displaying them in the Web UI has been implemented.\
Quoting other people is not implemented yet, and it is currently not possible to mark your own posts as allowing quotes. However, a new “Who can quote” setting has been added to the “Posting defaults” section of the user settings. This setting allows you to set a default that will be used for new posts made on Mastodon 4.5 and newer, when quote posts will be fully implemented.\
In the REST API, quote posts are represented by a new `quote` attribute on `Status` and `StatusEdit` entities: https://docs.joinmastodon.org/entities/StatusEdit/#quote https://docs.joinmastodon.org/entities/Status/#quote
- Add ability to reorder and translate server rules (#34637, #34737, #34494, #34756, #34820 and #34997 by @ChaosExAnima and @ClearlyClaire)\
Rules are now shown in the user’s language, if a translation has been set.\
In the REST API, `Rule` entities now have a new `translations` attribute: https://docs.joinmastodon.org/entities/Rule/#translations
- Add emoji from Twemoji 15.1.0, including in the emoji picker/completion (#33395, #34321, #34620, and #34677 by @ChaosExAnima, @ClearlyClaire, @TheEssem, and @eramdam)
- Add experimental support for verifying and displaying remote quote posts (#34370, #34481, #34510, #34551, #34480, #34479, #34553, #34584, #34623, #34738, #34766, #34770, #34772, #34773, #34786, #34790, and #34864 by @ClearlyClaire and @diondiondion)\
Support for verifying remote quotes according to [FEP-044f](https://codeberg.org/fediverse/fep/src/branch/main/fep/044f/fep-044f.md) and displaying them in the Web UI has been implemented. Such quotes are currently only processed if the `inbound_quotes` experimental feature is enabled (`EXPERIMENTAL_FEATURES=inbound_quotes`).\
Quoting other people is not implemented yet, and it is currently not possible to mark your own posts as allowing quotes. However, a new “Who can quote” setting has been added to the “Posting defaults” section of the user settings. This setting allows you to set a default that will be used for new posts made on Mastodon 4.5 and newer, when quote posts will be fully implemented.\
In the REST API, quote posts are represented by a new `quote` attribute on `Status` and `StatusEdit` entities: https://docs.joinmastodon.org/entities/StatusEdit/#quote https://docs.joinmastodon.org/entities/Status/#quote
- Add option to remove account from followers in web UI (#34488 by @Gargron)
- Add relationship tags to profiles and hover cards in web UI (#34467 and #34792 by @Gargron and @diondiondion)
- Add ability to open posts in a new tab by middle-clicking in web UI (#32988, #33106, #33419, and #34700 by @ClearlyClaire, @Gargron, and @tribela)
@@ -38,7 +38,7 @@ All notable changes to this project will be documented in this file.
Server administrators can now chose to opt in to transmit referrer information when following an external link. Only the domain name is transmitted, not the referrer path.
- Add double tap to zoom and swipe to dismiss to media modal in web UI (#34210 by @Gargron)
- Add link from Web UI for Hashtags to the Moderation UI (#31448 by @ThisIsMissEm)
- **Add terms of service** (#33055, #33233, #33230, #33703, #33699, #33994, #33993, #34105, #34122, #34200, and #34527 by @ClearlyClaire, @Gargron, @mjankowski, and @oneiros)\
- **Add terms of service** (#33055, #33233, #33230, #33703, #33699, #33994, #33993, #34105, #34122, #34200, #34527 and #35053 by @ClearlyClaire, @Gargron, @mjankowski, and @oneiros)\
Server administrators can now fill in Terms of Service, optionally using a provided template.
- **Add age verification on sign-up** (#34150, #34663, and #34636 by @ClearlyClaire and @Gargron)\
Server administrators now have a setting to set a minimum age requirement for creating a new server, asking users for their date of birth. The date of birth is checked against the minimum age requirement server-side but not stored.\
@@ -48,7 +48,7 @@ All notable changes to this project will be documented in this file.
- Add ability to dismiss alt text badge by tapping it in web UI (#33737 by @Gargron)
- Add loading indicator to timeline gap indicators in web UI (#33762 by @Gargron)
- Add interaction modal when trying to interact with a poll while logged out (#32609 by @ThisIsMissEm)
- **Add experimental FASP support** (#34031, #34415, and #34765 by @oneiros)\
- **Add experimental FASP support** (#34031, #34415, #34765, #34965, and #34964 by @oneiros)\
This is a first step towards supporting “Fediverse Auxiliary Service Providers” (https://github.com/mastodon/fediverse_auxiliary_service_provider_specifications). This is mostly interesting to developers who would like to implement their own FASP, but also includes the capability to share data with a discovery provider (see https://www.fediscovery.org).
- Add ability for admins to send announcements to all users via email (#33928 and #34411 by @ClearlyClaire)\
This is meant for critical announcements only, as this will potentially send a lot of emails and cannot be opted out of by users.
@@ -59,8 +59,9 @@ All notable changes to this project will be documented in this file.
- Add dropdown menu with quick actions to lists of accounts in web UI (#34391, #34709, and #34767 by @Gargron, @diondiondion, and @mkljczk)
- Add support for displaying “year in review” notification in web UI (#32710, #32765, #32709, #32807, #32914, #33148, and #33882 by @Gargron and @mjankowski)\
Note that the notification is currently not generated automatically, and at the moment requires a manual undocumented administrator action.
- Add experimental support for receiving HTTP Message Signatures (RFC9421) (#34814 by @oneiros)\
- Add experimental support for receiving HTTP Message Signatures (RFC9421) (#34814 and #35033 by @oneiros)\
For now, this needs to be explicitly enabled through the `http_message_signatures` feature flag (`EXPERIMENTAL_FEATURES=http_message_signatures`). This currently only covers verifying such signatures (inbound HTTP requests), not issuing them (outbound HTTP requests).
- Add experimental Async Refreshes API (#34918 by @oneiros)
- Add experimental server-side feature to fetch remote replies (#32615, #34147, #34149, #34151, #34615, #34682, and #34702 by @ClearlyClaire and @sneakers-the-rat)\
This experimental feature causes the server to recursively fetch replies in background tasks whenever a user opens a remote post. This happens asynchronously and the client is currently not notified of the existence of new replies, which will thus only be displayed the next time this post’s context gets requested.\
This feature needs to be explicitly enabled server-side by setting `FETCH_REPLIES_ENABLED` environment variable to `true`.
@@ -85,7 +86,7 @@ All notable changes to this project will be documented in this file.
- Add `og:locale` to expose status language in OpenGraph previews (#34012 by @ThisIsMissEm)
- Add `-skip-filled-timeline` option to `tootctl feed build` to skip half-filled feeds (#33844 by @ClearlyClaire)
- Add support for changing the base Docker registry with the `BASE_REGISTRY` `ARG` (#33712 by @wolfspyre)
- Add an optional metric exporter (#33734, #33840, #34172, #34192, 34223)\
- Add an optional metric exporter (#33734, #33840, #34172, #34192, #34223, and #35005 by @oneiros and @renchap)\
Optionally enable the `prometheus_exporter` ruby gem (see https://github.com/discourse/prometheus_exporter) to collect and expose metrics. See the documentation for all the details: https://docs.joinmastodon.org/admin/config/#prometheus
- Add `attribution_domains` attribute to `PATCH /api/v1/accounts/update_credentials` (#32730 by @c960657)\
This is documented at https://docs.joinmastodon.org/methods/accounts/#update_credentials
@@ -111,16 +112,20 @@ All notable changes to this project will be documented in this file.
### Changed
- Change design of navigation panel in Web UI, change layout on narrow screens (#34910, #34987, #35017, #34986, #35029, #35065, #35067 and #35072 by @ClearlyClaire, @Gargron, and @diondiondion)
- Change design of lists in web UI (#32881, #33054, and #33036 by @Gargron)
- Change design of edit media modal in web UI (#33516, #33702, #33725, #33725, #33771, and #34345 by @Gargron)
- Change design of audio player in web UI (#34520, #34740, and #34865 by @ClearlyClaire, @Gargron, and @diondiondion)
- Change design of audio player in web UI (#34520, #34740, #34865, #34929, #34933, and #35034 by @ClearlyClaire, @Gargron, and @diondiondion)
- Change design of interaction modal in web UI (#33278 by @Gargron)
- Change list timelines to reflect added and removed users retroactively (#32930 by @Gargron)
- Change account search to be more forgiving of spaces (#34455 by @Gargron)
- Change unfollow button label from “Mutual” to “Unfollow” in web UI (#34392 by @Gargron)
- Change “Specific people” to “Private mention” in menu in web UI (#33963 by @Gargron)
- Change "Explore" to "Trending" and remove explanation banners (#34985 by @Gargron)
- Change media attachments of moderated posts to not be accessible (#34872 by @Gargron)
Moderators will still be able to access them while they are kept, but they won't be accessible to the public in the meantime.
- Change language names in compose box language picker to be localized (#33402 by @c960657)
- Change onboarding flow in web UI (#32998, #33119, and #33471 by @ClearlyClaire and @Gargron)
- Change onboarding flow in web UI (#32998, #33119, #33471 and #34962 by @ClearlyClaire and @Gargron)
- Change emoji categories in admin interface to be ordered by name (#33630 by @ShadowJonathan)
- Change design of rich text elements in web UI (#32633 by @Gargron)
- Change wording of “single choice” to “pick one” in poll authoring form (#32397 by @ThisIsMissEm)
@@ -129,8 +134,7 @@ All notable changes to this project will be documented in this file.
- Change `libvips` to be enabled by default in place of ImageMagick (#34741 and #34753 by @ClearlyClaire and @diondiondion)
- Change avatar and header size limits from 2MB to 8MB when using libvips (#33002 by @Gargron)
- Change search to use query params in web UI (#32949 and #33670 by @ClearlyClaire and @Gargron)
- Change build system from Webpack to Vite (#34454, #34450, #34758, #34768, #34813, #34808, #34837, and #34732 by @ChaosExAnima, @ClearlyClaire, @mjankowski, and @renchap)\
One known limitation is that themes’ main style file needs to have a very specific file name: `app/javascript/styles/:name.scss` where `:name` is the name of the theme in `config/themes.yml`
- Change build system from Webpack to Vite (#34454, #34450, #34758, #34768, #34813, #34808, #34837, #34732, #35007 and #35035 by @ChaosExAnima, @ClearlyClaire, @mjankowski, and @renchap)
- Change account creation API to forbid creation from user tokens (#34828 by @ThisIsMissEm)
- Change `/api/v2/instance` to be enabled without authentication when limited federation mode is enabled (#34576 by @ClearlyClaire)
- Change `DEFAULT_LOCALE` to not override unauthenticated users’ browser language (#34535 by @ClearlyClaire)\
@@ -214,6 +218,22 @@ All notable changes to this project will be documented in this file.
- Fix bugs with upload progress (#34325 by @ChaosExAnima)
- Fix being unable to hide controls in full screen video in web UI (#34308 by @Gargron)
- Fix extra space under left-indented vertical videos (#34313 by @ClearlyClaire)
- Fix glitchy iOS media attachment drag interactions (#35057 by @diondiondion)
- Fix zoomed images being blurry in Safari (#35052 by @diondiondion)
- Fix redundant focus stop within status component in Web UI (#35037 and #35051 by @diondiondion)
- Fix digits in media player time readout not having a consistent width (#35038 by @diondiondion)
- Fix wrong text color for “Open in advanced web interface” banner in high-contrast theme (#35032 by @diondiondion)
- Fix hover card for limited accounts not hiding information as expected (#35024 by @diondiondion)
- Fix some animations not respecting the reduced animation preferences (#35018 by @ChaosExAnima)
- Fix direction of media gallery arrows in RTL locales (#35014 by @diondiondion)
- Fix cramped layout of follower recommendations on small viewports (#34967 and #35023 by @diondiondion)
- Fix two composers being shown at the same time in some cases (#35006 by @ChaosExAnima)
- Fix handling of remote attachments with multiple media types (#34996 by @ClearlyClaire)
- Fix broken colors in some themed SVGs in web UI (#34988 by @Gargron)
- Fix wrong dimensions on blurhash previews of news articles in web UI (#34990 by @Gargron)
- Fix wrong styles on action bar in media modal in web UI (#34989 by @Gargron)
- Fix search column input not updating on param change (#34951 by @PGrayCS)
- Fix account note textarea being interactable before the relationship gets fetched (#34932 by @ClearlyClaire)
- Fix SASS deprecation notices (#34278 by @ChaosExAnima)
- Fix display of failed-to-load image attachments in web UI (#34217 by @Gargron)
- Fix duplicate REST API requests on submitting account personal note with ctrl+enter (#34213 by @ClearlyClaire)

33
app/javascript/mastodon/features/navigation_panel/index.tsx
View File

@@ -221,14 +221,18 @@ export const NavigationPanel: React.FC = () => {
};
}, [dispatch]);
const isLtrDir = getComputedStyle(document.body).direction !== 'rtl';
const OPEN_MENU_OFFSET = isLtrDir ? MENU_WIDTH : -MENU_WIDTH;
const [{ x }, spring] = useSpring(
() => ({
x: open ? 0 : MENU_WIDTH,
x: open ? 0 : OPEN_MENU_OFFSET,
onRest: {
x({ value }: { value: number }) {
if (value === 0) {
dispatch(openNavigation());
} else if (value > 0) {
} else if (isLtrDir ? value > 0 : value < 0) {
dispatch(closeNavigation());
}
},
@@ -238,25 +242,38 @@ export const NavigationPanel: React.FC = () => {
);
const bind = useDrag(
({ last, offset: [ox], velocity: [vx], direction: [dx], cancel }) => {
if (ox < -70) {
({
last,
offset: [xOffset],
velocity: [xVelocity],
direction: [xDirection],
cancel,
}) => {
const logicalXDirection = isLtrDir ? xDirection : -xDirection;
const logicalXOffset = isLtrDir ? xOffset : -xOffset;
const hasReachedDragThreshold = logicalXOffset < -70;
if (hasReachedDragThreshold) {
cancel();
}
if (last) {
if (ox > MENU_WIDTH / 2 || (vx > 0.5 && dx > 0)) {
void spring.start({ x: MENU_WIDTH });
const isAboveOpenThreshold = logicalXOffset > MENU_WIDTH / 2;
const isQuickFlick = xVelocity > 0.5 && logicalXDirection > 0;
if (isAboveOpenThreshold || isQuickFlick) {
void spring.start({ x: OPEN_MENU_OFFSET });
} else {
void spring.start({ x: 0 });
}
} else {
void spring.start({ x: ox, immediate: true });
void spring.start({ x: xOffset, immediate: true });
}
},
{
from: () => [x.get(), 0],
filterTaps: true,
bounds: { left: 0 },
bounds: isLtrDir ? { left: 0 } : { right: 0 },
rubberband: true,
},
);

3
app/javascript/mastodon/locales/cy.json
View File

@@ -579,8 +579,11 @@
"navigation_bar.privacy_and_reach": "Preifatrwydd a chyrhaeddiad",
"navigation_bar.public_timeline": "Ffrwd y ffederasiwn",
"navigation_bar.search": "Chwilio",
"navigation_bar.search_trends": "Chwilio / Trendio",
"navigation_bar.security": "Diogelwch",
"navigation_panel.collapse_followed_tags": "Cau dewislen hashnodau dilyn",
"navigation_panel.collapse_lists": "Cau dewislen y rhestr",
"navigation_panel.expand_followed_tags": "Cau dewislen hashnodau dilyn",
"navigation_panel.expand_lists": "Ehangu dewislen y rhestr",
"not_signed_in_indicator.not_signed_in": "Rhaid i chi fewngofnodi i weld yr adnodd hwn.",
"notification.admin.report": "Adroddodd {name} {target}",

3
app/javascript/mastodon/locales/da.json
View File

@@ -578,7 +578,10 @@
"navigation_bar.privacy_and_reach": "Fortrolighed og udbredelse",
"navigation_bar.public_timeline": "Fælles tidslinje",
"navigation_bar.search": "Søg",
"navigation_bar.search_trends": "Søg/Populære",
"navigation_bar.security": "Sikkerhed",
"navigation_panel.collapse_followed_tags": "Sammenfold menuen Fulgte hashtags",
"navigation_panel.expand_followed_tags": "Udfold menuen Fulgte hashtags",
"not_signed_in_indicator.not_signed_in": "Log ind for at tilgå denne ressource.",
"notification.admin.report": "{name} anmeldte {target}",
"notification.admin.report_account": "{name} anmeldte {count, plural, one {et indlæg} other {# indlæg}} fra {target} angående {category}",

3
app/javascript/mastodon/locales/de.json
View File

@@ -579,8 +579,11 @@
"navigation_bar.privacy_and_reach": "Datenschutz und Reichweite",
"navigation_bar.public_timeline": "Föderierte Timeline",
"navigation_bar.search": "Suche",
"navigation_bar.search_trends": "Suche / Angesagt",
"navigation_bar.security": "Sicherheit",
"navigation_panel.collapse_followed_tags": "Menü für gefolgte Hashtags schließen",
"navigation_panel.collapse_lists": "Listen-Menü schließen",
"navigation_panel.expand_followed_tags": "Menü für gefolgte Hashtags öffnen",
"navigation_panel.expand_lists": "Listen-Menü öffnen",
"not_signed_in_indicator.not_signed_in": "Du musst dich anmelden, um auf diesen Inhalt zugreifen zu können.",
"notification.admin.report": "{name} meldete {target}",

3
app/javascript/mastodon/locales/es-AR.json
View File

@@ -579,8 +579,11 @@
"navigation_bar.privacy_and_reach": "Privacidad y alcance",
"navigation_bar.public_timeline": "Línea temporal federada",
"navigation_bar.search": "Buscar",
"navigation_bar.search_trends": "Búsqueda / Tendencia",
"navigation_bar.security": "Seguridad",
"navigation_panel.collapse_followed_tags": "Contraer menú de etiquetas seguidas",
"navigation_panel.collapse_lists": "Colapsar menú de lista",
"navigation_panel.expand_followed_tags": "Expandir menú de etiquetas seguidas",
"navigation_panel.expand_lists": "Expandir menú de lista",
"not_signed_in_indicator.not_signed_in": "Necesitás iniciar sesión para acceder a este recurso.",
"notification.admin.report": "{name} denunció a {target}",

3
app/javascript/mastodon/locales/es-MX.json
View File

@@ -579,8 +579,11 @@
"navigation_bar.privacy_and_reach": "Privacidad y alcance",
"navigation_bar.public_timeline": "Historia federada",
"navigation_bar.search": "Buscar",
"navigation_bar.search_trends": "Búsqueda / Tendencia",
"navigation_bar.security": "Seguridad",
"navigation_panel.collapse_followed_tags": "Minimizar menú de etiquetas seguidas",
"navigation_panel.collapse_lists": "Contraer el menú de la lista",
"navigation_panel.expand_followed_tags": "Expandir menú de etiquetas seguidas",
"navigation_panel.expand_lists": "Expandir menú de lista",
"not_signed_in_indicator.not_signed_in": "Necesitas iniciar sesión para acceder a este recurso.",
"notification.admin.report": "{name} denunció a {target}",

3
app/javascript/mastodon/locales/es.json
View File

@@ -579,8 +579,11 @@
"navigation_bar.privacy_and_reach": "Privacidad y alcance",
"navigation_bar.public_timeline": "Cronología federada",
"navigation_bar.search": "Buscar",
"navigation_bar.search_trends": "Búsqueda / Tendencia",
"navigation_bar.security": "Seguridad",
"navigation_panel.collapse_followed_tags": "Minimizar menú de etiquetas seguidas",
"navigation_panel.collapse_lists": "Contraer el menú de la lista",
"navigation_panel.expand_followed_tags": "Expandir menú de etiquetas seguidas",
"navigation_panel.expand_lists": "Expandir menú de lista",
"not_signed_in_indicator.not_signed_in": "Necesitas iniciar sesión para acceder a este recurso.",
"notification.admin.report": "{name} informó {target}",

3
app/javascript/mastodon/locales/fi.json
View File

@@ -579,8 +579,11 @@
"navigation_bar.privacy_and_reach": "Yksityisyys ja tavoittavuus",
"navigation_bar.public_timeline": "Yleinen aikajana",
"navigation_bar.search": "Haku",
"navigation_bar.search_trends": "Haku / Suosittua",
"navigation_bar.security": "Turvallisuus",
"navigation_panel.collapse_followed_tags": "Supista seurattavien aihetunnisteiden valikko",
"navigation_panel.collapse_lists": "Supista listavalikko",
"navigation_panel.expand_followed_tags": "Laajenna seurattavien aihetunnisteiden valikko",
"navigation_panel.expand_lists": "Laajenna listavalikko",
"not_signed_in_indicator.not_signed_in": "Sinun on kirjauduttava sisään käyttääksesi resurssia.",
"notification.admin.report": "{name} raportoi käyttäjän {target}",

3
app/javascript/mastodon/locales/fo.json
View File

@@ -579,8 +579,11 @@
"navigation_bar.privacy_and_reach": "Privatlív og skotmál",
"navigation_bar.public_timeline": "Felags tíðarlinja",
"navigation_bar.search": "Leita",
"navigation_bar.search_trends": "Leita / Rák",
"navigation_bar.security": "Trygd",
"navigation_panel.collapse_followed_tags": "Minka valmynd við fylgdum frámerkjum",
"navigation_panel.collapse_lists": "Minka listavalmynd",
"navigation_panel.expand_followed_tags": "Víðka valmynd við fylgdum frámerkjum",
"navigation_panel.expand_lists": "Víðka listavalmynd",
"not_signed_in_indicator.not_signed_in": "Tú mást rita inn fyri at fáa atgongd til hetta tilfarið.",
"notification.admin.report": "{name} hevur meldað {target}",

3
app/javascript/mastodon/locales/gl.json
View File

@@ -579,8 +579,11 @@
"navigation_bar.privacy_and_reach": "Privacidade e alcance",
"navigation_bar.public_timeline": "Cronoloxía federada",
"navigation_bar.search": "Buscar",
"navigation_bar.search_trends": "Buscar / Popular",
"navigation_bar.security": "Seguranza",
"navigation_panel.collapse_followed_tags": "Pregar o menú de cancelos seguidos",
"navigation_panel.collapse_lists": "Pregar menú da lista",
"navigation_panel.expand_followed_tags": "Despregar menú de cancelos seguidos",
"navigation_panel.expand_lists": "Despregar menú da lista",
"not_signed_in_indicator.not_signed_in": "Debes acceder para ver este recurso.",
"notification.admin.report": "{name} denunciou a {target}",

3
app/javascript/mastodon/locales/hu.json
View File

@@ -579,8 +579,11 @@
"navigation_bar.privacy_and_reach": "Adatvédelem és elérés",
"navigation_bar.public_timeline": "Föderációs idővonal",
"navigation_bar.search": "Keresés",
"navigation_bar.search_trends": "Keresés / felkapott",
"navigation_bar.security": "Biztonság",
"navigation_panel.collapse_followed_tags": "Követett hashtagek menü összecsukása",
"navigation_panel.collapse_lists": "Listamenü összecsukása",
"navigation_panel.expand_followed_tags": "Követett hashtagek menü kibontása",
"navigation_panel.expand_lists": "Listamenü kibontása",
"not_signed_in_indicator.not_signed_in": "Az erőforrás eléréséhez be kell jelentkezned.",
"notification.admin.report": "{name} jelentette: {target}",

5
app/javascript/mastodon/locales/ko.json
View File

@@ -63,7 +63,7 @@
"account.mute_short": "뮤트",
"account.muted": "뮤트됨",
"account.muting": "뮤트함",
"account.mutual": "맞팔로우 중입니다",
"account.mutual": "서로 팔로우 중입니다",
"account.no_bio": "제공된 설명이 없습니다.",
"account.open_original_page": "원본 페이지 열기",
"account.posts": "게시물",
@@ -579,8 +579,11 @@
"navigation_bar.privacy_and_reach": "개인정보와 도달",
"navigation_bar.public_timeline": "연합 타임라인",
"navigation_bar.search": "검색",
"navigation_bar.search_trends": "검색 / 유행",
"navigation_bar.security": "보안",
"navigation_panel.collapse_followed_tags": "팔로우 중인 해시태그 메뉴 접기",
"navigation_panel.collapse_lists": "리스트 메뉴 접기",
"navigation_panel.expand_followed_tags": "팔로우 중인 해시태그 메뉴 펼치기",
"navigation_panel.expand_lists": "리스트 메뉴 펼치기",
"not_signed_in_indicator.not_signed_in": "이 정보에 접근하려면 로그인을 해야 합니다.",
"notification.admin.report": "{name} 님이 {target}를 신고했습니다",

15
app/javascript/mastodon/locales/sv.json
View File

@@ -337,6 +337,7 @@
"errors.unexpected_crash.copy_stacktrace": "Kopiera stacktrace till urklipp",
"errors.unexpected_crash.report_issue": "Rapportera problem",
"explore.suggested_follows": "Personer",
"explore.title": "Trendar",
"explore.trending_links": "Nyheter",
"explore.trending_statuses": "Inlägg",
"explore.trending_tags": "Hashtaggar",
@@ -425,6 +426,7 @@
"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_quotes": "Visa citat",
"home.column_settings.show_reblogs": "Visa boostar",
"home.column_settings.show_replies": "Visa svar",
"home.hide_announcements": "Dölj notiser",
@@ -547,8 +549,10 @@
"mute_modal.you_wont_see_mentions": "Du kommer inte att se inlägg som nämner dem.",
"mute_modal.you_wont_see_posts": "De kan fortfarande se dina inlägg, men du kan inte se deras.",
"navigation_bar.about": "Om",
"navigation_bar.account_settings": "Lösenord och säkerhet",
"navigation_bar.administration": "Administration",
"navigation_bar.advanced_interface": "Öppna i avancerat webbgränssnitt",
"navigation_bar.automated_deletion": "Automatisk radering av inlägg",
"navigation_bar.blocks": "Blockerade användare",
"navigation_bar.bookmarks": "Bokmärken",
"navigation_bar.community_timeline": "Lokal tidslinje",
@@ -562,17 +566,25 @@
"navigation_bar.follow_requests": "Följförfrågningar",
"navigation_bar.followed_tags": "Följda hashtaggar",
"navigation_bar.follows_and_followers": "Följer och följare",
"navigation_bar.import_export": "Importera och exportera",
"navigation_bar.lists": "Listor",
"navigation_bar.logout": "Logga ut",
"navigation_bar.moderation": "Moderering",
"navigation_bar.more": "Fler",
"navigation_bar.mutes": "Tystade användare",
"navigation_bar.opened_in_classic_interface": "Inlägg, konton och andra specifika sidor öppnas som standard i det klassiska webbgränssnittet.",
"navigation_bar.personal": "Personligt",
"navigation_bar.pins": "Fästa inlägg",
"navigation_bar.preferences": "Inställningar",
"navigation_bar.privacy_and_reach": "Integritet och räckvidd",
"navigation_bar.public_timeline": "Federerad tidslinje",
"navigation_bar.search": "Sök",
"navigation_bar.search_trends": "Sök / Trendar",
"navigation_bar.security": "Säkerhet",
"navigation_panel.collapse_followed_tags": "Minska menyn för följda fyrkantstaggar",
"navigation_panel.collapse_lists": "Komprimera listmenyn",
"navigation_panel.expand_followed_tags": "Expandera menyn för följda fyrkantstaggar",
"navigation_panel.expand_lists": "Expandera listmeny",
"not_signed_in_indicator.not_signed_in": "Du behöver logga in för att få åtkomst till denna resurs.",
"notification.admin.report": "{name} rapporterade {target}",
"notification.admin.report_account": "{name} rapporterade {count, plural, one {ett inlägg} other {# inlägg}} från {target} för {category}",
@@ -901,7 +913,10 @@
"subscribed_languages.save": "Spara ändringar",
"subscribed_languages.target": "Ändra språkprenumerationer för {target}",
"tabs_bar.home": "Hem",
"tabs_bar.menu": "Meny",
"tabs_bar.notifications": "Aviseringar",
"tabs_bar.publish": "Nytt inlägg",
"tabs_bar.search": "Sök",
"terms_of_service.effective_as_of": "Gäller från och med {date}",
"terms_of_service.title": "Användarvillkor",
"terms_of_service.upcoming_changes_on": "Kommande ändringar {date}",

3
app/javascript/mastodon/locales/tr.json
View File

@@ -579,8 +579,11 @@
"navigation_bar.privacy_and_reach": "Gizlilik ve erişim",
"navigation_bar.public_timeline": "Federe ağ akışı",
"navigation_bar.search": "Arama",
"navigation_bar.search_trends": "Ara / Öne Çıkanlar",
"navigation_bar.security": "Güvenlik",
"navigation_panel.collapse_followed_tags": "Takip edilen etiketler menüsünü daralt",
"navigation_panel.collapse_lists": "Liste menüsünü daralt",
"navigation_panel.expand_followed_tags": "Takip edilen etiketler menüsünü genişlet",
"navigation_panel.expand_lists": "Liste menüsünü genişlet",
"not_signed_in_indicator.not_signed_in": "Bu kaynağa erişmek için oturum açmanız gerekir.",
"notification.admin.report": "{name}, {target} kişisini bildirdi",

3
app/javascript/mastodon/locales/uk.json
View File

@@ -554,8 +554,11 @@
"navigation_bar.privacy_and_reach": "Приватність і досяжність",
"navigation_bar.public_timeline": "Глобальна стрічка",
"navigation_bar.search": "Пошук",
"navigation_bar.search_trends": "Пошук / Популярність",
"navigation_bar.security": "Безпека",
"navigation_panel.collapse_followed_tags": "Згорнути меню хештегів",
"navigation_panel.collapse_lists": "Згорнути меню списку",
"navigation_panel.expand_followed_tags": "Розгорнути меню хештегів",
"navigation_panel.expand_lists": "Розгорнути меню списку",
"not_signed_in_indicator.not_signed_in": "Ви повинні увійти, щоб отримати доступ до цього ресурсу.",
"notification.admin.report": "Скарга від {name} на {target}",

7
app/javascript/mastodon/locales/vi.json
View File

@@ -1,5 +1,5 @@
{
"about.blocks": "Giới hạn chung",
"about.blocks": "Kiểm duyệt máy chủ khác",
"about.contact": "Liên lạc:",
"about.default_locale": "Mặc định",
"about.disclaimer": "Mastodon là phần mềm tự do nguồn mở của Mastodon gGmbH.",
@@ -579,8 +579,11 @@
"navigation_bar.privacy_and_reach": "Riêng tư và tiếp cận",
"navigation_bar.public_timeline": "Liên hợp",
"navigation_bar.search": "Tìm kiếm",
"navigation_bar.search_trends": "Tìm kiếm / Xu hướng",
"navigation_bar.security": "Bảo mật",
"navigation_panel.collapse_followed_tags": "Thu gọn menu hashtag theo dõi",
"navigation_panel.collapse_lists": "Thu gọn menu danh sách",
"navigation_panel.expand_followed_tags": "Mở rộng menu hashtag theo dõi",
"navigation_panel.expand_lists": "Mở rộng menu danh sách",
"not_signed_in_indicator.not_signed_in": "Bạn cần đăng nhập để truy cập mục này.",
"notification.admin.report": "{name} báo cáo {target}",
@@ -815,7 +818,7 @@
"search.quick_action.go_to_hashtag": "Xem hashtag {x}",
"search.quick_action.open_url": "Mở liên kết trong Mastodon",
"search.quick_action.status_search": "Tút nhắc đến {x}",
"search.search_or_paste": "Tìm kiếm hoặc nhập URL",
"search.search_or_paste": "Tìm kiếm hoặc dán URL",
"search_popout.full_text_search_disabled_message": "Không khả dụng trên {domain}.",
"search_popout.full_text_search_logged_out_message": "Cần đăng nhập trước.",
"search_popout.language_code": "mã ngôn ngữ ISO",

3
app/javascript/mastodon/locales/zh-TW.json
View File

@@ -579,8 +579,11 @@
"navigation_bar.privacy_and_reach": "隱私權及觸及",
"navigation_bar.public_timeline": "聯邦時間軸",
"navigation_bar.search": "搜尋",
"navigation_bar.search_trends": "搜尋 / 熱門趨勢",
"navigation_bar.security": "安全性",
"navigation_panel.collapse_followed_tags": "收合已跟隨主題標籤選單",
"navigation_panel.collapse_lists": "收合列表選單",
"navigation_panel.expand_followed_tags": "展開已跟隨主題標籤選單",
"navigation_panel.expand_lists": "展開列表選單",
"not_signed_in_indicator.not_signed_in": "您需要登入才能存取此資源。",
"notification.admin.report": "{name} 已檢舉 {target}",

12
app/javascript/styles/mastodon-light/diff.scss
View File

@@ -96,18 +96,6 @@
color: $white;
}
.search__input {
@media screen and (max-width: $no-gap-breakpoint) {
border-top: 0;
border-bottom: 0;
}
}
.list-editor .search .search__input {
border-top: 0;
border-bottom: 0;
}
.upload-progress__backdrop {
background: $ui-base-color;
}

3
app/javascript/styles/mastodon/admin.scss
View File

@@ -9,8 +9,11 @@ $content-width: 840px;
.admin-wrapper {
display: flex;
justify-content: center;
box-sizing: border-box;
width: 100%;
min-height: 100vh;
padding: env(safe-area-inset-top) env(safe-area-inset-right)
env(safe-area-inset-bottom) env(safe-area-inset-left);
.icon {
width: 16px;

2
app/javascript/styles/mastodon/basics.scss
View File

@@ -50,6 +50,7 @@ body {
padding: 0;
padding-left: env(safe-area-inset-left);
padding-right: env(safe-area-inset-right);
box-sizing: border-box;
&.layout-single-column {
height: auto;
@@ -61,6 +62,7 @@ body {
position: absolute;
width: 100%;
height: 100%;
padding-bottom: env(safe-area-inset-bottom);
}
&.with-modals--active {

2
app/javascript/styles/mastodon/components.scss
View File

@@ -2817,12 +2817,14 @@ a.account__display-name {
}
&__panels {
box-sizing: border-box;
display: flex;
justify-content: center;
gap: 16px;
width: 100%;
height: 100%;
min-height: 100vh;
padding-bottom: env(safe-area-inset-bottom);
&__pane {
height: 100%;

4
config/locales/doorkeeper.vi.yml
View File

@@ -31,7 +31,7 @@ vi:
form:
error: Rất tiếc! Hãy kiểm tra thông tin của bạn bởi vì nó có lỗi
help:
native_redirect_uri: Dùng %{native_redirect_uri} khi kiểm tra nội bộ
native_redirect_uri: Dùng %{native_redirect_uri} khi kiểm thử
redirect_uri: Mỗi dòng chỉ một URL
scopes: Tách phạm vi ra bằng dấu cách. Bỏ trống để dùng phạm vi mặc định.
index:
@@ -156,7 +156,7 @@ vi:
admin:read:domain_blocks: đọc thông tin nhạy cảm của mọi máy chủ chặn
admin:read:email_domain_blocks: đọc thông tin nhạy cảm của mọi tên miền email chặn
admin:read:ip_blocks: đọc thông tin nhạy cảm của mọi IP chặn
admin:read:reports: đọc thông tin của các báo cáo và các tài khoản bị báo cáo
admin:read:reports: đọc thông tin nhạy cảm của mọi báo cáo
admin:write: sửa đổi tất cả dữ liệu trên máy chủ
admin:write:accounts: áp đặt hành động kiểm duyệt trên tài khoản
admin:write:canonical_email_blocks: áp đặt kiểm duyệt đối với chặn email biến thể

12
config/locales/simple_form.vi.yml
View File

@@ -42,7 +42,7 @@ vi:
autofollow: Những người đăng ký sẽ tự động theo dõi bạn
avatar: WEBP, PNG, GIF hoặc JPG, tối đa %{size}. Sẽ bị nén xuống %{dimensions}px
bot: Tài khoản này tự động thực hiện các hành động và không được quản lý bởi người thật
context: Chọn những nơi sẽ áp dụng bộ lọc
context: Chọn những nơi áp dụng bộ lọc
current_password: Để bảo mật, vui lòng nhập mật khẩu của tài khoản hiện tại
current_username: Để xác nhận, vui lòng nhập tên người dùng của tài khoản hiện tại
digest: Chỉ gửi sau một thời gian dài không hoạt động hoặc khi bạn nhận được tin nhắn (trong thời gian vắng mặt)
@@ -56,7 +56,7 @@ vi:
scopes: Ứng dụng sẽ được phép truy cập những API nào. Nếu bạn chọn quyền cấp cao nhất, không cần chọn quyền nhỏ.
setting_aggregate_reblogs: Nếu một tút đã được đăng lại thì sẽ không hiện những lượt đăng lại khác trên bảng tin
setting_always_send_emails: Bình thường thì sẽ không gửi khi bạn đang dùng Mastodon
setting_default_quote_policy: Thiết lập này chỉ hiệu lực đối với các tút được tạo bằng phiên bản Mastodon tiếp theo, nhưng bạn có thể chọn trước tùy chọn của mình trong quá trình chuẩn bị
setting_default_quote_policy: Thiết lập này chỉ hiệu lực đối với các tút được tạo bằng phiên bản Mastodon tiếp theo, nhưng bạn có thể chọn trước sẵn
setting_default_sensitive: Bắt buộc nhấn vào mới có thể xem
setting_display_media_default: Click để xem
setting_display_media_hide_all: Luôn ẩn
@@ -74,7 +74,7 @@ vi:
featured_tag:
name: 'Các hashtag mà bạn đã sử dụng gần đây:'
filters:
action: Chọn hành động sẽ thực hiện khi một tút khớp với bộ lọc
action: Chọn hành động áp dụng khi một tút khớp với bộ lọc
actions:
blur: Ẩn media sau một cảnh báo, mà không ảnh hưởng nội dung
hide: Ẩn hoàn toàn, như thể nó không tồn tại
@@ -130,7 +130,7 @@ vi:
webauthn: Nếu đây là USB key, hãy cắm vào và thử xoay chiều.
settings:
indexable: Trang của bạn có thể xuất hiện trong kết quả tìm kiếm trên Google, Bing và các nơi khác.
show_application: Bạn sẽ luôn có thể xem ứng dụng nào đã đăng tút của mình.
show_application: Bạn luôn có thể xem ứng dụng đã đăng tút của mình.
tag:
name: Bạn có thể thay đổi cách viết hoa các chữ cái để giúp nó dễ đọc hơn
terms_of_service:
@@ -249,8 +249,8 @@ vi:
setting_theme: Giao diện
setting_trends: Hiện xu hướng trong ngày
setting_unfollow_modal: Hỏi trước khi bỏ theo dõi ai đó
setting_use_blurhash: Làm mờ media nhạy cảm
setting_use_pending_items: Không tự động cập nhật bảng tin
setting_use_blurhash: Làm mờ media bị ẩn
setting_use_pending_items: Không tự động làm mới bảng tin
severity: Mức độ nghiêm trọng
sign_in_token_attempt: Mã an toàn
title: Tựa đề

6
config/locales/vi.yml
View File

@@ -1132,7 +1132,7 @@ vi:
remove: Bỏ liên kết bí danh
appearance:
advanced_web_interface: Bố cục
advanced_web_interface_hint: Chia giao diện thành nhiều cột, phù hợp với màn hình rộng.
advanced_web_interface_hint: Xếp giao diện thành nhiều cột, hợp với màn hình rộng.
animations_and_accessibility: Hiệu ứng
confirmation_dialogs: Hộp thoại xác nhận
discovery: Khám phá
@@ -1846,8 +1846,8 @@ vi:
ignore_reblogs: Số lượt đăng lại
interaction_exceptions: Ngoại lệ dựa theo tương tác
interaction_exceptions_explanation: Lưu ý là không có gì đảm bảo rằng các tút sẽ bị xóa nếu chúng bị giảm lượt thích hoặc đăng lại, dù đã từng đạt.
keep_direct: Giữ lại tin nhắn
keep_direct_hint: Không xóa tin nhắn của bạn
keep_direct: Giữ lại những tút nhắn riêng
keep_direct_hint: Không xóa những tút nhắn riêng của bạn
keep_media: Giữ lại những tút có media
keep_media_hint: Không xóa những tút có đính kèm media của bạn
keep_pinned: Giữ lại những tút đã ghim

2
lib/mastodon/version.rb
View File

@@ -17,7 +17,7 @@ module Mastodon
end
def default_prerelease
'beta.1'
'beta.2'
end
def prerelease