Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update zh_cn.json. #4767

Merged
merged 24 commits into from
Nov 28, 2024
Merged

Update zh_cn.json. #4767

merged 24 commits into from
Nov 28, 2024

Conversation

Dawnwalker666
Copy link
Contributor

The scope of the translation includes all commits about en_us.json from Sep 1, 2024 to Nov 18, 2024.
The number of zh_cn.json lines minus two is strictly equal to en_us.json. Just like old times.

Dawnwalker666 and others added 24 commits June 29, 2023 20:07
The scope of the translation includes all commits about en_us from Jun 4, 2023 to Oct 18, 2023. zh_cn now has strictly two more lines than en_us.
According to line 6, replace all ":" and ": " with ":".
Change all English SBC colons, and all English colons with spaces masquerading as Chinese colons to Chinese DBC colons
#4463
That one sentence puzzled me for a long time. I asked this person about it yesterday and got this answer.
The scope of the translation includes all commits about en_us.json from Oct 18, 2023 to Dec 31, 2023.
zh_cn.json now has strictly two more lines than en_us.json
The scope of the translation includes all commits about en_us.json from Feb 4, 2024 to Jun 23, 2024.
The number of zh_cn.json lines minus two is strictly equal to en_us.json. Just like old times.
The scope of the translation includes all commits about en_us.json from Jul 2, 2024 to Sep 1, 2024.
The number of zh_cn.json lines minus two is strictly equal to
en_us.json. Just like old times.
@Dawnwalker666
Copy link
Contributor Author

I don't know why there's a problem with the display checking, it seems to be stuck on ‘Build with Gradle’. But I just submitted a language file and rechecked it, so it shouldn't be my problem.

@TheRealWormbo
Copy link
Collaborator

It might be worth starting a new branch or otherwise resetting your fork to the state of the main branch after this merge. You appear to be merging main branch changes into your branch via a merge commit, while Botania's main repository uses rebasing.

(Though I have no idea why your changes failed to build here.)

@TheRealWormbo TheRealWormbo merged commit 688e9e3 into VazkiiMods:1.20.x Nov 28, 2024
1 check failed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants