search

OverlayPlugin / cactbot

FFXIV TypeScript Raiding Overlay
Apache License 2.0
84 stars 34 forks source link

i18n: DT Ex1 JA translation #201

Closed niaka3dayo closed 1 month ago

niaka3dayo commented 1 month ago

Summary

This pull request adds the current Japanese localization for valigarmand-ex.

wexxlee commented 1 month ago

LGTM as well - this does need a rebase to resolve the merge conflicts now that the fr translations have been added though.

niaka3dayo commented 1 month ago

LGTM as well - this does need a rebase to resolve the merge conflicts now that the fr translations have been added though.

Thank you for pointing that out, wexxlee. You're correct about the merge conflicts caused by the 'fr' translations. I've resolved these by merging from the main branch, rather than rebasing. I believe all conflicts have been addressed while maintaining the LGTM status. Would you mind taking another look to confirm everything is in order? I appreciate your feedback.