mirror of
https://github.com/misskey-dev/misskey.git
synced 2026-03-22 12:03:39 +00:00
2b52a215e5
# Conflicts: # package.json # packages/backend/src/core/QueueService.ts # packages/frontend/src/components/global/MkPageHeader.vue # packages/frontend/src/pages/admin/index.vue # packages/frontend/src/pages/clicker.vue # packages/frontend/src/pages/my-lists/index.vue # packages/frontend/src/pages/notifications.vue # packages/frontend/src/pages/settings/emoji-picker.vue # packages/frontend/src/pages/settings/mute-block.vue # packages/frontend/src/pages/timeline.vue # packages/frontend/src/ui/universal.vue # pnpm-lock.yaml
DO NOT edit locale files except ja-JP.yml.
When you add text to the ja-JP file (of misskey-dev/misskey), it will automatically be applied to other language files. Translations added in ja-JP file should contain the original Japanese strings.
Please see Contribution guide for more information.