1
0

Merge branch 'misskey-develop' into merge/2025-03-24

# Conflicts:
#	package.json
#	packages/backend/src/core/entities/NotificationEntityService.ts
#	packages/backend/src/types.ts
#	packages/frontend/src/pages/admin/modlog.ModLog.vue
#	packages/misskey-js/src/consts.ts
#	packages/misskey-js/src/entities.ts
This commit is contained in:
Hazelnoot
2025-03-25 16:17:34 -04:00
82 changed files with 1563 additions and 298 deletions
+50
View File
@@ -5425,6 +5425,10 @@ export interface Locale extends ILocale {
*
*/
"inviteUser": string;
/**
*
*/
"sentInvitations": string;
/**
*
*/
@@ -5449,10 +5453,22 @@ export interface Locale extends ILocale {
*
*/
"home": string;
/**
*
*/
"send": string;
/**
*
*/
"newline": string;
/**
*
*/
"muteThisRoom": string;
/**
*
*/
"deleteRoom": string;
/**
*
*/
@@ -5607,6 +5623,28 @@ export interface Locale extends ILocale {
*
*/
"makeEveryTextElementsSelectable_description": string;
/**
*
*/
"showNavbarSubButtons": string;
/**
*
*/
"ifOn": string;
/**
*
*/
"ifOff": string;
"_chat": {
/**
*
*/
"showSenderName": string;
/**
* Enterで送信
*/
"sendOnEnter": string;
};
};
"_preferencesProfile": {
/**
@@ -10001,6 +10039,10 @@ export interface Locale extends ILocale {
*
*/
"roleAssigned": string;
/**
*
*/
"chatRoomInvitationReceived": string;
/**
*
*/
@@ -10110,6 +10152,10 @@ export interface Locale extends ILocale {
*
*/
"roleAssigned": string;
/**
*
*/
"chatRoomInvitationReceived": string;
/**
*
*/
@@ -10667,6 +10713,10 @@ export interface Locale extends ILocale {
* 稿
*/
"deleteGalleryPost": string;
/**
*
*/
"deleteChatRoom": string;
/**
*
*/