Skip to content

Update zh_CN translation#9388

Merged
rekmarks merged 15 commits intodevelopfrom
unknown repository
Feb 9, 2021
Merged

Update zh_CN translation#9388
rekmarks merged 15 commits intodevelopfrom
unknown repository

Conversation

@arisac
Copy link
Copy Markdown
Contributor

@arisac arisac commented Sep 10, 2020

No description provided.

@arisac arisac requested a review from a team as a code owner September 10, 2020 15:38
@arisac arisac requested a review from Gudahtt September 10, 2020 15:38
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Sep 10, 2020

CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes.

@arisac arisac marked this pull request as draft September 11, 2020 13:57
@arisac arisac marked this pull request as ready for review September 12, 2020 07:23
@arisac
Copy link
Copy Markdown
Contributor Author

arisac commented Sep 12, 2020

@Gudahtt I believe this is a merge-ready version

@Gudahtt
Copy link
Copy Markdown
Member

Gudahtt commented Sep 23, 2020

@arisac: Thanks for the contribution! I'll find somebody to review this as soon as the conflicts are resolved.

We recently added JSON sorting to our formatter, so now there are many conflicts. Would you mind rebasing this onto develop and running yarn && yarn lint:fix? That should fix everything.

@arisac arisac requested a review from kumavis as a code owner September 23, 2020 15:59
@arisac
Copy link
Copy Markdown
Contributor Author

arisac commented Sep 23, 2020

@arisac: Thanks for the contribution! I'll find somebody to review this as soon as the conflicts are resolved.

We recently added JSON sorting to our formatter, so now there are many conflicts. Would you mind rebasing this onto develop and running yarn && yarn lint:fix? That should fix everything.

@Gudahtt thanks for notify.I've done rebase and solved conflicts.
I noticed @dependabot[bot] is failing the CLA test. It should be added to CLA Test whitelist?

@Gudahtt
Copy link
Copy Markdown
Member

Gudahtt commented Sep 23, 2020

Thanks again @arisac but something went wrong in your attempt to rebase. You've now duplicated ~56 commits from develop, and there are far more changes than there should be.

Could you check the "Allow edits from maintainers" checkbox on this PR? (see here: https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/allowing-changes-to-a-pull-request-branch-created-from-a-fork ). That would give me permission to fix things up myself.

@Gudahtt
Copy link
Copy Markdown
Member

Gudahtt commented Sep 23, 2020

@arisac Thanks for granting access! I've just rebased your initial 5 commits onto develop. It looks correct to me - let me know if anything seems off.

Three messages added on this branch were unused by MetaMask. They have
been removed.
@Gudahtt
Copy link
Copy Markdown
Member

Gudahtt commented Sep 23, 2020

I noticed that 3 messages were unused, so I removed them in c2153dc

arisac and others added 2 commits September 23, 2020 17:41
A few changes were made during the last attempt to update this branch.
They were unintentionally discarded when this branch was rebased. Those
changes have now been restored.
@Gudahtt
Copy link
Copy Markdown
Member

Gudahtt commented Sep 23, 2020

Ok that was my last update 😅 I had taken a closer look at your changes, and realized you had made a bunch of changes in that last attempt to update this branch. They were discarded when I rebased just the first 5 commits. I've just restored them all just as you had them.

@arisac
Copy link
Copy Markdown
Contributor Author

arisac commented Sep 24, 2020

Thank you and sorry for the trouble, that was quite a lot work.

miranda76
miranda76 previously approved these changes Nov 19, 2020
# Solve Conflicts:
#	app/_locales/zh_CN/messages.json
@arisac
Copy link
Copy Markdown
Contributor Author

arisac commented Nov 19, 2020

I'm currently adding new translation strings to this PR. will update soon.

@arisac
Copy link
Copy Markdown
Contributor Author

arisac commented Nov 19, 2020

I've updated this PR to sync with the latest develop branch.
Still more improvements to be done to be a nicely localized in zh_cn translation, but I think this is a good start for the community to contribute on.

Solve Conflicts:
#	app/_locales/zh_CN/messages.json
remove unused strings
add new strings
@rekmarks
Copy link
Copy Markdown
Member

Hi @arisac, thank you for creating this monumental PR. Do you think you'd be willing to rebase it one more time? We recently received some more resources for translation-related work, and can finally review this properly.

很对不起我们花了这么长时间。🙇🏼‍♂️

Added new translation strings

# Fixed Conflicts:
#	app/_locales/zh_CN/messages.json
@arisac
Copy link
Copy Markdown
Contributor Author

arisac commented Jan 22, 2021

@rekmarks done with new strings added.

I saw ci/circleci: test-e2e-firefox is getting a failed result due to a timeout.

@DDDDDanica
Copy link
Copy Markdown
Contributor

@rekmarks @arisac Is it possible to have a comparison file with translated Chinese sentence and original English one?
I can see some potential improvements but it is very difficult which is better without the context.
Thanks ~

@rekmarks
Copy link
Copy Markdown
Member

@DDDDDanica, I (or someone else at MetaMask) can make you something by tomorrow!

@arisac, if you created any comparison files while making this, please do let us know.

@arisac
Copy link
Copy Markdown
Contributor Author

arisac commented Jan 23, 2021

@DDDDDanica @rekmarks I've uploaded the diff file to https://github.com/arisira/metamask-extension/blob/diff/en-zh_CN.diff using diff app/_locales/en/messages.json app/_locales/zh_CN/messages.json >> en-zh_CN.diff

I removed description key from my translation file since it is not needed for translation, by removing the key, it also helps to diff the translation with the English file because it will pop up in the diff.

And also I've noticed #9772 changed the gas back to gas. To my opinion, it should be translated, and I'm using 燃料 instead of 天然气 since cn.etherscan.io is using 燃料 as well and I believe it's a good one.

},
"accountSelectionRequired": {
"message": "您需要选择一个账户 !"
"message": "需要选择一个账户 !"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

In the doc translation, we can add 您 to make the sentence as a whole,

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

We need to keep 您 actually from the context

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Thank you for the guideline. I've updated with in all strings on e86b5da

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

💯

"message": "资产"
},
"attemptToCancel": {
"message": "想要取消吗?"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I actually prefer "想要取消吗?", which is more user friendly ~

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Updated in e86b5da

},
"attemptToCancelDescription": {
"message": "确认提交该操作无法保证能够成功取消您的原始交易。如果取消成功,您将被收取上述交易费用。"
"message": "确认提交该操作无法保证能够成功取消你的原始交易。如取消成功,你将被收取上述交易费。"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

In the translation doc we tend to use 您 to make it more formal and respectful

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Updated in e86b5da

},
"browserNotSupported": {
"message": "您的浏览器不支持该功能…"
"message": "你的浏览器不支持该功能…"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

"message": "您的浏览器不支持该功能。。。"

},
"accessingYourCamera": {
"message": "正在获取相机使用权限..."
"message": "正在访问相机..."
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

正在获取您的相机。。。

  1. you need to keep "you" from original context
  2. you need to use chinese punctuation ~

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Updated in e86b5da

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

All ... is updated with the Chinese punctuation …… in e86b5da

"message": "仅在主网(mainnet)上提供"
},
"onlyConnectTrust": {
"message": "只连接你信任的网站。"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

您~

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Updated in e86b5da

"message": "“$1”会关闭此标签,直接回到 $2"
},
"onlyAddTrustedNetworks": {
"message": "恶意的 Ethereum 以太坊网络提供商可以伪造区块链状态,并记录你的网络活动。只添加你信任的自定义网络。"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

您~

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Updated in e86b5da

"message": "保证数额"
},
"swapAmountReceivedInfo": {
"message": "这是你将收到的最低数额。你也可能会收到更多,这取决于滑点。"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

你也可能会收到更多,这取决于滑点 => 根据滑点值, 您可能会收到更多。

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Updated in e86b5da

"message": "你还需 $1 $2 来完成这笔兑换"
},
"swapBetterQuoteAvailable": {
"message": "有一个更好的报价可用"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

有一个可用的更优报价

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Updated in e86b5da

"message": "这是预估的用于完成你的兑换所使用的网络手续费。实际数额可能会根据网络条件而变化。"
},
"swapFailedErrorDescription": {
"message": "你的资金是安全的,仍然可以在你的钱包中使用。"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

您的资金~ 您的钱包~

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Updated in e86b5da

@arisac
Copy link
Copy Markdown
Contributor Author

arisac commented Jan 30, 2021

rebased with the latested develop branch with 73bc553 since one string was removed from the English file: yourSigRequested

@arisac
Copy link
Copy Markdown
Contributor Author

arisac commented Jan 30, 2021

@DDDDDanica request for review.

Copy link
Copy Markdown
Contributor

@DDDDDanica DDDDDanica left a comment

Choose a reason for hiding this comment

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

All looks good to me 👍

Copy link
Copy Markdown
Member

@rekmarks rekmarks left a comment

Choose a reason for hiding this comment

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

With @DDDDDanica's approval, I'm going to merge this.

Thank you so much for taking the time to do this @arisac, and thank you @DDDDDanica for reviewing!

@rekmarks rekmarks merged commit a12654e into MetaMask:develop Feb 9, 2021
@github-actions github-actions bot locked and limited conversation to collaborators Feb 9, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants