1
0

Merge tag '2025.4.0' into merge/2025-03-24

# Conflicts:
#	.github/workflows/storybook.yml
#	locales/index.d.ts
#	package.json
#	packages/backend/src/models/json-schema/role.ts
#	packages/frontend/src/components/MkPageWindow.vue
#	packages/frontend/src/pages/admin/roles.editor.vue
#	packages/frontend/src/pages/admin/roles.vue
#	packages/frontend/src/pages/settings/preferences.vue
#	packages/frontend/src/pages/settings/privacy.vue
#	packages/frontend/src/pages/timeline.vue
#	packages/frontend/src/pref-migrate.ts
#	packages/frontend/src/ui/_common_/common.vue
#	packages/frontend/src/ui/deck.vue
#	packages/frontend/src/ui/universal.vue
#	packages/misskey-js/src/autogen/types.ts
This commit is contained in:
Hazelnoot
2025-04-13 13:04:57 -04:00
98 changed files with 1621 additions and 2087 deletions
+19 -3
View File
@@ -1715,9 +1715,9 @@ export interface Locale extends ILocale {
*/
"withFileAntenna": string;
/**
*
*
*/
"hideNotesInSensitiveChannel": string;
"excludeNotesInSensitiveChannel": string;
/**
*
*/
@@ -5383,6 +5383,18 @@ export interface Locale extends ILocale {
*
*/
"embed": string;
/**
* ... ( )
*/
"settingsMigrating": string;
/**
*
*/
"readonly": string;
/**
*
*/
"goToDeck": string;
"_chat": {
/**
*
@@ -5497,6 +5509,10 @@ export interface Locale extends ILocale {
*
*/
"chatNotAvailableForThisAccountOrServer": string;
/**
*
*/
"chatIsReadOnlyForThisAccountOrServer": string;
/**
* 使
*/
@@ -7551,7 +7567,7 @@ export interface Locale extends ILocale {
/**
*
*/
"canChat": string;
"chatAvailability": string;
/**
* Can view the bubble timeline
*/