search

xicri / genshin-langdata

English-Chinese-Japanese translation dataset of the terms in Genshin Impact
https://genshin-dictionary.com
Other
25 stars 12 forks source link

Add/Modify new keywords for Ver.4.6 #194

Closed yasuking0304 closed 1 month ago

yasuking0304 commented 2 months ago

Add/Modified new keywords for Ver.4.6

I referred to here and picked up the missing basic keywords.

issue #193

xicri commented 2 months ago

Sorry for the delay to respond, please wait a little bit more... 🙏

I quickly checked your commits and this PR includes the commits you made in the last PR. Since it is a bit hard to review, can you rebase it by the main?

cd path/to/genshin-langdata
git switch main
git fetch upstream
git rebase upstream/main
yasuking0304 commented 1 month ago

Sorry. I ran rebased. If it doesn't work, I'll re-clone it and recreate the PR.

xicri commented 1 month ago

Thanks, but still some old commits are remaining. Can I rebase on my end? You have to pull this branch again after my rebase.

xicri commented 1 month ago

@yasuking0304 Fixed.

xicri commented 1 month ago

Since my change requests are not so large, I will commit them by myself.

xicri commented 1 month ago

Sorry, something went wrong and the PR is accidentally closed. Fixing...

xicri commented 1 month ago

@yasuking0304 I couldn't restore this PR and I opened #195 instead.

Sorry, I accidentally overwrote your main branch with the current main branch of this repository (HEAD: c283672). Please merge or rebase with upstream/main. However, the changes you've sent in this PR are NOT lost.