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

Fix some translation error in the zh_CN.json #1961

Merged
merged 7 commits into from
Jan 20, 2022
Merged

Fix some translation error in the zh_CN.json #1961

merged 7 commits into from
Jan 20, 2022

Conversation

jichiduo
Copy link
Contributor

Fixed some translation errors and mis-translate words in the zh_CN.json and unified the word "你“ to "您”

@andrey-helldar
Copy link
Member

See #1959

I see that some values are translated differently.

@andrey-helldar
Copy link
Member

andrey-helldar commented Jan 18, 2022

@overtrue, I suggest finishing the #1959 first and then comparing it with this code.

@overtrue
Copy link
Member

@overtrue, I suggest finishing the #1959 first and then comparing it with this code.

OK

@andrey-helldar
Copy link
Member

andrey-helldar commented Jan 19, 2022

@jichiduo, the translation of some keys accepted in the #1959 conflicts with yours.

Resolve the merge conflict by choosing the most appropriate option and we can continue to work on this PR.

locales/zh_CN/zh_CN.json Outdated Show resolved Hide resolved
locales/zh_CN/zh_CN.json Outdated Show resolved Hide resolved
locales/zh_CN/zh_CN.json Outdated Show resolved Hide resolved
Copy link
Member

@andrey-helldar andrey-helldar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked and highlighted all merge conflicts after accepting the #1959.

As proposals, the options adopted in the PR are indicated.

I don't know which options are better. I leave this decision to you.

locales/zh_CN/zh_CN.json Outdated Show resolved Hide resolved
locales/zh_CN/zh_CN.json Outdated Show resolved Hide resolved
locales/zh_CN/zh_CN.json Outdated Show resolved Hide resolved
locales/zh_CN/zh_CN.json Outdated Show resolved Hide resolved
locales/zh_CN/zh_CN.json Outdated Show resolved Hide resolved
locales/zh_CN/zh_CN.json Outdated Show resolved Hide resolved
locales/zh_CN/zh_CN.json Outdated Show resolved Hide resolved
locales/zh_CN/zh_CN.json Outdated Show resolved Hide resolved
locales/zh_CN/zh_CN.json Outdated Show resolved Hide resolved
locales/zh_CN/zh_CN.json Outdated Show resolved Hide resolved
@overtrue
Copy link
Member

I checked and highlighted all merge conflicts after accepting the #1959.

As proposals, the options adopted in the PR are indicated.

I don't know which options are better. I leave this decision to you.

@andrey-helldar I think your suggestion is better.

@andrey-helldar
Copy link
Member

@overtrue, they have what we took in #1959

In that case, I will make changes to this PR and check it again.

@andrey-helldar
Copy link
Member

@overtrue, I fixed the merge conflict. Now the changelog looks clean and can be checked: https://github.com/Laravel-Lang/lang/pull/1961/files

Copy link
Contributor Author

@jichiduo jichiduo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am new for this , so the pull request is okay and can close now?

@andrey-helldar andrey-helldar merged commit 961358d into Laravel-Lang:master Jan 20, 2022
@andrey-helldar
Copy link
Member

谢谢

@jichiduo
Copy link
Contributor Author

благодарность

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.

3 participants