Skip to content

Update localization for zh_cn#1295

Closed
MechtaSnezhevna wants to merge 1 commit intovectorwing:1.21from
MechtaSnezhevna:patch-1
Closed

Update localization for zh_cn#1295
MechtaSnezhevna wants to merge 1 commit intovectorwing:1.21from
MechtaSnezhevna:patch-1

Conversation

@MechtaSnezhevna
Copy link
Copy Markdown

@MechtaSnezhevna MechtaSnezhevna commented Apr 29, 2026

  • Changed all "鸡蛋" in the name of meals into "蛋"
  • Changed "稻米块" into "稻穗块" to match its recipe
  • Changed "稻草" into "草捆" as it can be claimed from weed
  • Add localization strings for FD's recent update

Might be ok applying to all the branches

Changed all "鸡蛋" in the name of meals into "蛋"
Changed "稻米块" into "稻穗块" to match its recipe
Changed "稻草" into "草捆" as it can be claimed from weed
Add localization strings for FD's recent update
@BoredYukolin
Copy link
Copy Markdown

Hello, I didn't notice this PR before and just sent another one, updating four languages (zh_cn, zh_hk, zh_tw and lzh) at the same time. When I see this, I considered your changes and applied them in my PR, too.

Would you mind check my one and to negotiate if still to keep this PR open?

@vectorwing
Copy link
Copy Markdown
Owner

If BoredYukolin agrees with the changes here, I can also merge this PR first, and merge theirs against these diffs afterwards.

@BoredYukolin
Copy link
Copy Markdown

If BoredYukolin agrees with the changes here, I can also merge this PR first, and merge theirs against these diffs afterwards.

If you mean to merge my PR as a whole override later, I don't see any difference with directly merging my one so yes. Though there's one word that has conflict (rice_bale) and the long sentence translations are often different.

@MechtaSnezhevna
Copy link
Copy Markdown
Author

If BoredYukolin agrees with the changes here, I can also merge this PR first, and merge theirs against these diffs afterwards.

I suggest apply BoredYukolin's pr and skip this one, and I'll later make a new pr on texts that I have a different idea.

@BoredYukolin
Copy link
Copy Markdown

If BoredYukolin agrees with the changes here, I can also merge this PR first, and merge theirs against these diffs afterwards.

I suggest apply BoredYukolin's pr and skip this one, and I'll later make a new pr on texts that I have a different idea.

You can argue your different ideas by making a PR on MY fork like this one, which I think it's a better method?

@MechtaSnezhevna
Copy link
Copy Markdown
Author

If BoredYukolin agrees with the changes here, I can also merge this PR first, and merge theirs against these diffs afterwards.

I suggest apply BoredYukolin's pr and skip this one, and I'll later make a new pr on texts that I have a different idea.

You can argue your different ideas by making a PR on MY fork like this one, which I think it's a better method?

ok I will.

@MechtaSnezhevna MechtaSnezhevna closed this by deleting the head repository May 4, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants