From bc60411f91c3ce59188e93c9fc1889406bc56307 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Sat, 5 Apr 2025 10:27:43 +0900 Subject: [PATCH 1/4] New Crowdin updates (#15752) * New translations ja-jp.yml (Catalan) * New translations ja-jp.yml (Chinese Simplified) * New translations ja-jp.yml (Italian) * New translations ja-jp.yml (English) --- locales/ca-ES.yml | 2 ++ locales/en-US.yml | 2 ++ locales/it-IT.yml | 2 ++ locales/zh-CN.yml | 2 ++ 4 files changed, 8 insertions(+) diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml index acb79061a6..354013283a 100644 --- a/locales/ca-ES.yml +++ b/locales/ca-ES.yml @@ -1888,6 +1888,8 @@ _role: descriptionOfIsExplorable: "La línia de temps d'aquest rol i la llista d'usuaris seran públics si s'activa." displayOrder: "Posició " descriptionOfDisplayOrder: "Com més gran és el número, més dalt la seva posició a la interfície." + preserveAssignmentOnMoveAccount: "L'estat de l'assignació també es trasllada amb el compte migrat" + preserveAssignmentOnMoveAccount_description: "Si s'activa quan es migra un compte amb aquest rol, el compte migrat també heretarà aquest rol." canEditMembersByModerator: "Permetre que els moderadors editin la llista d'usuaris en aquest rol" descriptionOfCanEditMembersByModerator: "Quan s'activa, els moderadors, així com els administradors, podran afegir i treure usuaris d'aquest rol. Si es troba desactivat, només els administradors poden assignar usuaris." priority: "Prioritat" diff --git a/locales/en-US.yml b/locales/en-US.yml index eea432cacc..63fa07ec68 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -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" diff --git a/locales/it-IT.yml b/locales/it-IT.yml index 403f9c7718..9b62141fdc 100644 --- a/locales/it-IT.yml +++ b/locales/it-IT.yml @@ -1888,6 +1888,8 @@ _role: descriptionOfIsExplorable: "Selezionandolo, la timeline del ruolo diventerà accessibile pubblicamente. Tranne se il ruolo non è pubblico." displayOrder: "Ordine di visualizzazione" descriptionOfDisplayOrder: "I valori più alti vengono visualizzati per primi" + preserveAssignmentOnMoveAccount: "Mantenere l'assegnazione alla migrazione del profilo" + preserveAssignmentOnMoveAccount_description: "Attivando, il ruolo verrà portato sul profilo destinatario, durante la migrazione." canEditMembersByModerator: "Anche i Moderatori assegnano profili a questo ruolo" descriptionOfCanEditMembersByModerator: "Se disattivo, potranno farlo solamente gli Amministratori." priority: "Priorità" diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml index 67f2692f03..57a78471db 100644 --- a/locales/zh-CN.yml +++ b/locales/zh-CN.yml @@ -1887,6 +1887,8 @@ _role: descriptionOfIsExplorable: "打开后将公开角色时间线。如果角色不是公开的，就无法公开时间线。" displayOrder: "显示顺序" descriptionOfDisplayOrder: "数字越大，显示位置越靠前。" + preserveAssignmentOnMoveAccount: "将分配状态继承到目标账户" + preserveAssignmentOnMoveAccount_description: "启用后，当迁移具有该角色的账户时，目标账户也会继承该角色。" canEditMembersByModerator: "允许监察员编辑成员" descriptionOfCanEditMembersByModerator: "如果选中，监察员和管理员都能够为用户分配/取消分配角色。如果未选中，则只有管理员可以执行此操作。" priority: "优先级" From d54153f24ee10e45a2c8b6cc340c726a51da169e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 5 Apr 2025 01:28:52 +0000 Subject: [PATCH 2/4] Bump version to 2025.4.0-rc.1 --- package.json | 2 +- packages/misskey-js/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 6fcf6f8620..5b45b999f3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "misskey", - "version": "2025.4.0-rc.0", + "version": "2025.4.0-rc.1", "codename": "nasubi", "repository": { "type": "git", diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json index 15d5d8200f..7e92981230 100644 --- a/packages/misskey-js/package.json +++ b/packages/misskey-js/package.json @@ -1,7 +1,7 @@ { "type": "module", "name": "misskey-js", - "version": "2025.4.0-rc.0", + "version": "2025.4.0-rc.1", "description": "Misskey SDK for JavaScript", "license": "MIT", "main": "./built/index.js", From e24d799c0a60985b555be3c69318bd2bcd2dc46c Mon Sep 17 00:00:00 2001 From: anatawa12 Date: Sat, 5 Apr 2025 19:32:35 +0900 Subject: [PATCH 3/4] chore: set ignorePatchFailures to false (#15763) --- pnpm-workspace.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 68e4f0adc1..8d4e0f73eb 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -27,3 +27,4 @@ onlyBuiltDependencies: - utf-8-validate - v-code-diff - vue-demi +ignorePatchFailures: false From 91416527c256a42919488384408f9e6760bfbc57 Mon Sep 17 00:00:00 2001 From: zyoshoka <107108195+zyoshoka@users.noreply.github.com> Date: Sat, 5 Apr 2025 19:32:48 +0900 Subject: [PATCH 4/4] fix(ci): quote `branches-ignore` pattern in Storybook workflow (#15762) --- .github/workflows/storybook.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml index 0deefbf166..620d83d6c9 100644 --- a/.github/workflows/storybook.yml +++ b/.github/workflows/storybook.yml @@ -12,8 +12,8 @@ on: # This is a waste of chromatic build quota, so we don't run storybook CI on pull requests targets master. - master # Neither Dependabot nor Renovate will change the actual behavior for components. - - dependabot/** - - renovate/** + - 'dependabot/**' + - 'renovate/**' jobs: build: