mirror of
https://github.com/misskey-dev/misskey.git
synced 2026-03-24 13:03:39 +00:00
# Conflicts: # locales/index.d.ts # packages/backend/src/models/RepositoryModule.ts # packages/backend/src/models/_.ts # packages/frontend/src/components/MkDrive.vue # packages/frontend/src/components/MkEmojiEditDialog.vue # packages/frontend/src/components/MkFollowButton.vue # packages/frontend/src/components/MkSignupDialog.form.vue # packages/frontend/src/components/MkUserSelectDialog.vue # packages/frontend/src/components/index.ts # packages/frontend/src/os.ts # packages/frontend/src/pages/avatar-decorations.vue # packages/frontend/src/pages/settings/mute-block.word-mute.vue # packages/frontend/src/pages/user/home.vue # packages/misskey-bubble-game/src/monos.ts
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.