kaslo/pawkey-sk
1
0
Fork 0
Code Packages Activity

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

Browse Source 
# Conflicts:
#	.github/workflows/storybook.yml
#	package.json
#	packages/frontend/src/utility/autogen/settings-search-index.ts
#	pnpm-lock.yaml
This commit is contained in:
Hazelnoot
2025-04-05 12:20:19 -04:00
parent 3eeb53ff63 f9a3db2ac3
commit 7e7350eab5
65 changed files with 486 additions and 1651 deletions
Download Patch File Download Diff File Expand all files Collapse all files
locales/en-US.yml
+2
View File
@@ -1888,6 +1888,8 @@ _role:
descriptionOfIsExplorable: "This role's timeline and the list of users with this will be made public if enabled."
displayOrder: "Position"
descriptionOfDisplayOrder: "The higher the number, the higher its UI position."
preserveAssignmentOnMoveAccount: "Preserve role assignment during migration"
preserveAssignmentOnMoveAccount_description: "When turned on, this role will be carried over to the destination account when an account with this role is migrated."
canEditMembersByModerator: "Allow moderators to edit the list of members for this role"
descriptionOfCanEditMembersByModerator: "When turned on, moderators as well as administrators will be able to assign and unassign users to this role. When turned off, only administrators will be able to assign users."
priority: "Priority"