worldcone/cherrypick
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge remote-branch 'misskey/develop'

Browse source
This commit is contained in:
NoriDev 2024-01-10 17:51:45 +09:00
parent faf7f9709f
commit 548486ab81
2 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
locales/index.d.ts vendored
View file

@ -733,6 +733,7 @@ export interface Locale {
"small": string; "small": string;
"generateAccessToken": string; "generateAccessToken": string;
"permission": string; "permission": string;
"adminPermission": string;
"enableAll": string; "enableAll": string;
"disableAll": string; "disableAll": string;
"tokenRequested": string; "tokenRequested": string;
@ -1306,6 +1307,9 @@ export interface Locale {
"bubbleGame": string; "bubbleGame": string;
"sfx": string; "sfx": string;
"soundWillBePlayed": string; "soundWillBePlayed": string;
"showReplay": string;
"replay": string;
"replaying": string;
"showUnreadNotificationsCount": string; "showUnreadNotificationsCount": string;
"showCatOnly": string; "showCatOnly": string;
"additionalPermissionsForFlash": string; "additionalPermissionsForFlash": string;
@ -1332,6 +1336,14 @@ export interface Locale {
"_messaging": { "_messaging": {
"direct": string; "direct": string;
}; };
"_bubbleGame": {
"howToPlay": string;
"_howToPlay": {
"section1": string;
"section2": string;
"section3": string;
};
};
"_announcement": { "_announcement": {
"forExistingUsers": string; "forExistingUsers": string;
"forExistingUsersDescription": string; "forExistingUsersDescription": string;

23
pnpm-lock.yaml
View file

@ -801,8 +801,8 @@ importers:
specifier: 5.1.0 specifier: 5.1.0
version: 5.1.0(rollup@4.9.1) version: 5.1.0(rollup@4.9.1)
'@syuilo/aiscript': '@syuilo/aiscript':
specifier: 0.16.0 specifier: 0.17.0
version: 0.16.0 version: 0.17.0
'@tabler/icons-webfont': '@tabler/icons-webfont':
specifier: 2.44.0 specifier: 2.44.0
version: 2.44.0 version: 2.44.0
@ -914,6 +914,9 @@ importers:
sass: sass:
specifier: 1.69.5 specifier: 1.69.5
version: 1.69.5 version: 1.69.5
seedrandom:
specifier: ^3.0.5
version: 3.0.5
shiki: shiki:
specifier: 0.14.7 specifier: 0.14.7
version: 0.14.7 version: 0.14.7
@ -1022,10 +1025,10 @@ importers:
version: 7.6.5 version: 7.6.5
'@storybook/vue3': '@storybook/vue3':
specifier: 7.6.5 specifier: 7.6.5
version: 7.6.5(@vue/compiler-core@3.3.12)(vue@3.4.3) version: 7.6.5(@vue/compiler-core@3.4.3)(vue@3.4.3)
'@storybook/vue3-vite': '@storybook/vue3-vite':
specifier: 7.6.5 specifier: 7.6.5
version: 7.6.5(@vue/compiler-core@3.3.12)(typescript@5.3.3)(vite@5.0.10)(vue@3.4.3) version: 7.6.5(@vue/compiler-core@3.4.3)(typescript@5.3.3)(vite@5.0.10)(vue@3.4.3)
'@testing-library/vue': '@testing-library/vue':
specifier: 8.0.1 specifier: 8.0.1
version: 8.0.1(@vue/compiler-sfc@3.4.3)(vue@3.4.3) version: 8.0.1(@vue/compiler-sfc@3.4.3)(vue@3.4.3)
@ -7114,7 +7117,7 @@ packages:
file-system-cache: 2.3.0 file-system-cache: 2.3.0
dev: true dev: true
/@storybook/vue3-vite@7.6.5(@vue/compiler-core@3.3.12)(typescript@5.3.3)(vite@5.0.10)(vue@3.4.3): /@storybook/vue3-vite@7.6.5(@vue/compiler-core@3.4.3)(typescript@5.3.3)(vite@5.0.10)(vue@3.4.3):
resolution: {integrity: sha512-7wUCq2Lrjlekftd5ha3hG0GSGbbzuc370cKkBqSmwFuOfI38z5+VeYt7nDtAlncxcpVSH7DejTGRuKTlC7NyYg==} resolution: {integrity: sha512-7wUCq2Lrjlekftd5ha3hG0GSGbbzuc370cKkBqSmwFuOfI38z5+VeYt7nDtAlncxcpVSH7DejTGRuKTlC7NyYg==}
engines: {node: ^14.18 || >=16} engines: {node: ^14.18 || >=16}
peerDependencies: peerDependencies:
@ -7122,7 +7125,7 @@ packages:
dependencies: dependencies:
'@storybook/builder-vite': 7.6.5(typescript@5.3.3)(vite@5.0.10) '@storybook/builder-vite': 7.6.5(typescript@5.3.3)(vite@5.0.10)
'@storybook/core-server': 7.6.5 '@storybook/core-server': 7.6.5
'@storybook/vue3': 7.6.5(@vue/compiler-core@3.3.12)(vue@3.4.3) '@storybook/vue3': 7.6.5(@vue/compiler-core@3.4.3)(vue@3.4.3)
'@vitejs/plugin-vue': 4.5.2(vite@5.0.10)(vue@3.4.3) '@vitejs/plugin-vue': 4.5.2(vite@5.0.10)(vue@3.4.3)
magic-string: 0.30.5 magic-string: 0.30.5
vite: 5.0.10(@types/node@20.10.5)(sass@1.69.5)(terser@5.26.0) vite: 5.0.10(@types/node@20.10.5)(sass@1.69.5)(terser@5.26.0)
@ -7139,7 +7142,7 @@ packages:
- vue - vue
dev: true dev: true
/@storybook/vue3@7.6.5(@vue/compiler-core@3.3.12)(vue@3.4.3): /@storybook/vue3@7.6.5(@vue/compiler-core@3.4.3)(vue@3.4.3):
resolution: {integrity: sha512-tv/9rVc3XXDOJu5hfZtKhrhM8x4GTLKon62Rmaxlq06weqkGlfBi/V/g1EZ7OE71Pi+woKS/TX7p9qbRrvgahg==} resolution: {integrity: sha512-tv/9rVc3XXDOJu5hfZtKhrhM8x4GTLKon62Rmaxlq06weqkGlfBi/V/g1EZ7OE71Pi+woKS/TX7p9qbRrvgahg==}
engines: {node: '>=16.0.0'} engines: {node: '>=16.0.0'}
peerDependencies: peerDependencies:
@ -7151,7 +7154,7 @@ packages:
'@storybook/global': 5.0.0 '@storybook/global': 5.0.0
'@storybook/preview-api': 7.6.5 '@storybook/preview-api': 7.6.5
'@storybook/types': 7.6.5 '@storybook/types': 7.6.5
'@vue/compiler-core': 3.3.12 '@vue/compiler-core': 3.4.3
lodash: 4.17.21 lodash: 4.17.21
ts-dedent: 2.2.0 ts-dedent: 2.2.0
type-fest: 2.19.0 type-fest: 2.19.0
@ -7413,8 +7416,8 @@ packages:
dev: false dev: false
optional: true optional: true
/@syuilo/aiscript@0.16.0: /@syuilo/aiscript@0.17.0:
resolution: {integrity: sha512-CXvoWOq6kmOSUQtKv0IEf7Ebfkk5PO1LxAgLqgRRPgssPvDvINCXu/gFNXKdapkFMkmX+Gj8qjemKR1vnUS4ZA==} resolution: {integrity: sha512-3JtQ1rWJHMxQ3153zLCXMUOwrOgjPPYGBl0dPHhR0ohm4tn7okMQRugxMCT0t3YxByemb9FfiM6TUjd0tEGxdA==}
dependencies: dependencies:
seedrandom: 3.0.5 seedrandom: 3.0.5
stringz: 2.1.0 stringz: 2.1.0