mirror of
https://github.com/misskey-dev/misskey.git
synced 2026-03-22 20:13:36 +00:00
833031ee60
# Conflicts: # packages/backend/src/core/QueueModule.ts # packages/backend/src/core/QueueService.ts # packages/backend/src/core/chart/charts/federation.ts # packages/backend/src/models/RepositoryModule.ts # packages/backend/src/models/_.ts # packages/backend/src/queue/types.ts # packages/backend/src/server/api/EndpointsModule.ts # packages/backend/src/server/api/endpoints.ts # packages/backend/src/server/api/endpoints/admin/queue/stats.ts # packages/backend/src/server/api/endpoints/users/report-abuse.ts # packages/backend/src/server/web/ClientServerService.ts # packages/frontend/src/components/MkButton.vue # packages/frontend/src/components/MkChannelFollowButton.vue # packages/frontend/src/components/MkClickerGame.vue # packages/frontend/src/components/MkSwitch.vue
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.