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

[WIP] update zh and zh-cn translation #4806

Closed
wants to merge 1 commit into from
Closed

[WIP] update zh and zh-cn translation #4806

wants to merge 1 commit into from

Conversation

hwdef
Copy link
Member

@hwdef hwdef commented Jan 19, 2020

Ref: #4792
Ref: #4734
Ref: #4763

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. language/zh Updates or issues for Chinese translations. labels Jan 19, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hwdef

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 19, 2020
@codecov
Copy link

codecov bot commented Jan 19, 2020

Codecov Report

Merging #4806 into master will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #4806      +/-   ##
==========================================
- Coverage   45.43%   45.42%   -0.02%     
==========================================
  Files         214      214              
  Lines        9977     9977              
  Branches       94       94              
==========================================
- Hits         4533     4532       -1     
- Misses       5180     5181       +1     
  Partials      264      264
Impacted Files Coverage Δ
...p/backend/integration/metric/common/aggregation.go 89.09% <0%> (-1.82%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5000b90...00e28b5. Read the comment docs.

@@ -108,7 +108,7 @@
</trans-unit>
<trans-unit id="d984832653b92d083bf8ca529c4d99ab55a047ef" datatype="html">
<source>Size: <x id="INTERPOLATION" equiv-text="{{loaded | kdMemory}}"/> B</source>
<target state="new">Size: <x id="INTERPOLATION" equiv-text="{{loaded | kdMemory}}"/> B</target>
<target state="new">尺寸: <x id="INTERPOLATION" equiv-text="{{loaded | kdMemory}}"/> B</target>
Copy link
Member

Choose a reason for hiding this comment

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

文件、日志大小 Size 觉得 大小 好些

<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/actionbar/detailactions/trigger/template.html</context>
<context context-type="linenumber">21</context>
</context-group>
</trans-unit>
<trans-unit id="32c4fb786d3f614318c26ef8adc8f195d581545d" datatype="html">
<source>Workload Status</source>
<target state="new">Workload Status</target>
<target state="new">工作量状态</target>
Copy link
Member

Choose a reason for hiding this comment

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

工作负载 好点

@@ -608,15 +608,15 @@
</trans-unit>
<trans-unit id="4b359fa8499772c9fa2d6004ac3a941a3fee612d" datatype="html">
<source>QoS Class</source>
<target state="new">QoS Class</target>
<target state="new">QoS </target>
Copy link
Member

Choose a reason for hiding this comment

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

QoS Class
应该可以不用翻译

@@ -856,7 +856,7 @@
</trans-unit>
<trans-unit id="cff1428d10d59d14e45edec3c735a27b5482db59" datatype="html">
<source>Name</source>
<target state="new">Name</target>
<target state="new">名字</target>
Copy link
Member

Choose a reason for hiding this comment

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

名称 好些

<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/container/template.html</context>
<context context-type="linenumber">101</context>
</context-group>
</trans-unit>
<trans-unit id="986668e81481d0fd0934b4ef56b4236ccb298712" datatype="html">
<source>Conditions</source>
<target state="new">Conditions</target>
<target state="new">状态</target>
Copy link
Member

Choose a reason for hiding this comment

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

条件 好些

@@ -3173,7 +3173,7 @@
Name must be up to <x id="INTERPOLATION" equiv-text="{{namespaceMaxLength}}"/> characters long.
</source>
<target state="new">
Name must be up to <x id="INTERPOLATION" equiv-text="{{namespaceMaxLength}}"/> characters long.
Name 必须大于 <x id="INTERPOLATION" equiv-text="{{namespaceMaxLength}}"/> 个字符。
Copy link
Member

Choose a reason for hiding this comment

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

Name 如果上面翻译的话 下面应该也翻译 建议保持一致

@@ -3185,7 +3185,7 @@
Name must be alphanumeric and may contain dashes.
</source>
<target state="new">
Name must be alphanumeric and may contain dashes.
名称必须是字母或者数字,可以包含短划线。
Copy link
Member

Choose a reason for hiding this comment

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

Name 同理

@@ -3194,7 +3194,7 @@
</trans-unit>
<trans-unit id="aeea49e3b19a41258a76d31750f01f807cf9f399" datatype="html">
<source>A namespace with the specified name will be added to the cluster.</source>
<target state="new">A namespace with the specified name will be added to the cluster.</target>
<target state="new">将具有指定名称的命名空间将添加到群集中。</target>
Copy link
Member

Choose a reason for hiding this comment

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

集群

<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/create/from/form/createsecret/template.html</context>
<context context-type="linenumber">21</context>
</context-group>
</trans-unit>
<trans-unit id="0d2ab5feae3bde82e357ae93420738e775a69f50" datatype="html">
<source>Secret name</source>
<target state="new">Secret name</target>
<target state="new">Secret 名字</target>
Copy link
Member

Choose a reason for hiding this comment

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

名称

@@ -3263,7 +3263,7 @@
Name must be up to <x id="INTERPOLATION" equiv-text="{{secretNameMaxLength}}"/> characters long.
</source>
<target state="new">
Name must be up to <x id="INTERPOLATION" equiv-text="{{secretNameMaxLength}}"/> characters long.
Name 必须大于 <x id="INTERPOLATION" equiv-text="{{secretNameMaxLength}}"/> 字符。
Copy link
Member

Choose a reason for hiding this comment

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

Name 同理

Copy link
Member

Choose a reason for hiding this comment

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

review 在这里标记下

@tanjunchen
Copy link
Member

tanjunchen commented Jan 19, 2020

@hwdef Thanks your good job!
we need to talk with orthers in something , Brainstorming to make our localization work as perfect as possible.

Brainstorming

<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/podstatus/template.html</context>
<context context-type="linenumber">33</context>
</context-group>
</trans-unit>
<trans-unit id="f2c8a2942797110c229cee3ee830ae2c1b64901a" datatype="html">
<source>Pending: </source>
<target state="new">启动中: </target>
<target state="new">启动中 </target>
Copy link

Choose a reason for hiding this comment

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

Suggested change
<target state="new">启动中: </target>
<target state="new">待定: </target>

@@ -2893,7 +2893,7 @@
Every Service Account has a Secret with valid Bearer Token that can be used to log in to Dashboard. To find out more about how to configure and use Bearer Tokens, please refer to the <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>Authentication<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> section.
</source>
<target state="new">
每个 Service Account 都有一个 valid Bearer Token ,可用于登录 Dashboard 。 要了解有关如何配置和使用 Bearer Tokens 的更多信息,请参阅 <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>Authentication<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> 部分.
每个 Service Account 都有一个 valid Bearer Token ,可用于登录 Dashboard 。 要了解有关如何配置和使用 Bearer Tokens 的更多信息,请参阅 <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>Authentication<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> 部分
Copy link

Choose a reason for hiding this comment

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

Suggested change
每个 Service Account 都有一个 valid Bearer Token ,可用于登录 Dashboard 。 要了解有关如何配置和使用 Bearer Tokens 的更多信息,请参阅 <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>Authentication<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> 部分。
每个 Service Account 都有一个合法的持有者令牌,可用于登录控制面板。 要了解有关如何配置和使用持有者令牌的更多信息,请参阅 <x id="START_LINK" ctype="x-a" equiv-text="&lt;a>"/>身份认证<x id="CLOSE_LINK" ctype="x-a" equiv-text="&lt;/a>"/> 部分。

@@ -3153,7 +3153,7 @@
Name must be up to <x id="INTERPOLATION" equiv-text="{{namespaceMaxLength}}"/> characters long.
</source>
<target state="new">
Name必须大于 <x id="INTERPOLATION" equiv-text="{{namespaceMaxLength}}"/> 个字符.
Name 必须大于 <x id="INTERPOLATION" equiv-text="{{namespaceMaxLength}}"/> 个字符
Copy link

Choose a reason for hiding this comment

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

Suggested change
Name 必须大于 <x id="INTERPOLATION" equiv-text="{{namespaceMaxLength}}"/> 个字符。
Name 必须少于或等于 <x id="INTERPOLATION" equiv-text="{{namespaceMaxLength}}"/> 个字符。

@@ -3243,7 +3243,7 @@
Name must be up to <x id="INTERPOLATION" equiv-text="{{secretNameMaxLength}}"/> characters long.
</source>
<target state="new">
Name 必须大于 <x id="INTERPOLATION" equiv-text="{{secretNameMaxLength}}"/> 字符.
Name 必须大于 <x id="INTERPOLATION" equiv-text="{{secretNameMaxLength}}"/> 字符
Copy link

Choose a reason for hiding this comment

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

Suggested change
Name 必须大于 <x id="INTERPOLATION" equiv-text="{{secretNameMaxLength}}"/> 字符。
Name 必须少于或等于 <x id="INTERPOLATION" equiv-text="{{secretNameMaxLength}}"/> 字符。

@@ -71,7 +71,7 @@
<x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span>"/>?<x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/>
</source>
<target state="new">
<x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span>"/>Are you sure you want to delete <x id="INTERPOLATION" equiv-text="{{data.displayName}}"/> <x id="START_ITALIC_TEXT" ctype="x-i" equiv-text="&lt;i>"/><x id="INTERPOLATION_1" equiv-text="{{data.objectMeta.name}}"/><x id="CLOSE_ITALIC_TEXT" ctype="x-i" equiv-text="&lt;/i>"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/>
<x id="START_TAG_SPAN" ctype="x-span" equiv-text="&lt;span>"/>你确定要删除 <x id="INTERPOLATION" equiv-text="{{data.displayName}}"/> <x id="START_ITALIC_TEXT" ctype="x-i" equiv-text="&lt;i>"/><x id="INTERPOLATION_1" equiv-text="{{data.objectMeta.name}}"/><x id="CLOSE_ITALIC_TEXT" ctype="x-i" equiv-text="&lt;/i>"/><x id="CLOSE_TAG_SPAN" ctype="x-span" equiv-text="&lt;/span>"/>
<x id="START_TAG_SPAN_1" ctype="x-span" equiv-text="&lt;span>"/>
 in namespace <x id="START_ITALIC_TEXT" ctype="x-i" equiv-text="&lt;i>"/><x id="INTERPOLATION_2" equiv-text="{{data.objectMeta.namespace}}"/><x id="CLOSE_ITALIC_TEXT" ctype="x-i" equiv-text="&lt;/i>"/>
Copy link

Choose a reason for hiding this comment

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

in namespace 也要翻译

<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/namespace/changedialog/template.html</context>
<context context-type="linenumber">37</context>
</context-group>
</trans-unit>
<trans-unit id="7d545ebc0f8d8727d50c375b2065a447f1029e2b" datatype="html">
<source>Select namespace...</source>
<source>选择 namespace...</source>
Copy link

Choose a reason for hiding this comment

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

Suggested change
<source>选择 namespace...</source>
<source>选择名字空间...</source>

@@ -1966,7 +1966,7 @@
</trans-unit>
<trans-unit id="6570ee92c355ae47991f34101be43f3f4270fdf3" datatype="html">
<source>All namespaces</source>
<target state="new">All namespaces</target>
<target state="new">所有 namespaces</target>
Copy link

Choose a reason for hiding this comment

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

所有名字空间

@@ -2018,15 +2018,15 @@
</trans-unit>
<trans-unit id="3f7be0397ce094e29cd35e80d45684ca64b451d1" datatype="html">
<source>Annotations</source>
<target state="new">Annotations</target>
<target state="new">注释</target>
Copy link

Choose a reason for hiding this comment

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

注解(Annotations)

<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/podstatus/template.html</context>
<context context-type="linenumber">33</context>
</context-group>
</trans-unit>
<trans-unit id="f2c8a2942797110c229cee3ee830ae2c1b64901a" datatype="html">
<source>Pending: </source>
<target state="new">Pending: </target>
<target state="new">启动中: </target>
Copy link

Choose a reason for hiding this comment

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

Suggested change
<target state="new">启动中: </target>
<target state="new">待定: </target>

Copy link
Contributor

Choose a reason for hiding this comment

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

启动中可能会更好一些,这里的pending表示workload资源正在被创建。

Copy link
Contributor

Choose a reason for hiding this comment

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

annotations是kubernetes中的一个字段,最好不要翻译

Copy link

Choose a reason for hiding this comment

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

Pending 的原意即是某事悬决待定,译为启动中恐不妥。

Copy link
Contributor

Choose a reason for hiding this comment

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

emm...这里的pending表示的是workload(pod、deployment这些资源)正在创建启动这个状态,已经是动作的执行过程了,“启动中”这个词语我不知道是否正确,但觉得比待定更准确点。可以看下kubernetes的文档是怎么翻译的。就像Running翻译成“运行中”一样。

Copy link

Choose a reason for hiding this comment

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

请考虑,Pod 在 pending 状态时,是否已经作出调度决定?

Copy link
Contributor

Choose a reason for hiding this comment

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

挂起(Pending):Pod 已被 Kubernetes 系统接受,但有一个或者多个容器镜像尚未创建。等待时间包括调度 Pod 的时间和通过网络下载镜像的时间,这可能需要花点时间。
https://kubernetes.io/zh/docs/concepts/workloads/pods/pod-lifecycle/
可能挂起會更好一些

Copy link

Choose a reason for hiding this comment

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

考虑过挂起,担心与 Suspend 有语义冲突。挂起一般是指某任务已经开始执行,但执行过程中被其他外部因素影响而无法继续执行。不过,挂起的确比“启动中”好些。

Copy link
Contributor

Choose a reason for hiding this comment

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

确实,就像进程挂起,挂起确实有一种被中断无法进行的意思。这里没有这层意思。这里是api server已经接收到指令,分配资源,镜像拉取,启动,探针...这些过程都处在pending状态。所以挂起可能也不太合适。 @hwdef @tanjunchen 你们有别的建议吗?

<context-group purpose="location">
<context context-type="sourcefile">../src/app/frontend/common/components/podstatus/template.html</context>
<context context-type="linenumber">69</context>
</context-group>
</trans-unit>
<trans-unit id="e6a27066251ca1e04c5be86ad758380856df2506" datatype="html">
<source>Pending</source>
<target state="new">Pending</target>
<target state="new">启动中</target>
Copy link

Choose a reason for hiding this comment

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

Suggested change
<target state="new">启动中</target>
<target state="new">待定</target>

@shu-mutou
Copy link
Contributor

If messages.zh.xlf and messages.zh-cn.xlf is same, you can maintain only i18n/zh/messages.zh.xlf after #4814 will be merged. For more, see documentation updates in #4814.

To adopt this method into existing situation, do following steps after merging #4814:

  1. Remove "zh-cn" and "zh-sg" from xliffmergeOptions in package.json.
  2. Remove i18n/zh-cn/messages.zh-cn.xlf and i18n/zh-cn/messages.zh-sg.xlf.
  3. Create symbolic link i18n/zh-cn/messages.zh-cn.xlf and i18n/zh-cn/messages.zh-sg.xlf toward i18n/zh/messages.zh.xlf

After that, our framework will apply changes of words to be translated into only i18n/zh/messages.zh.xlf, and will build dashboard with zh, zh-cn and zh-sg locales.

@tengqm
Copy link

tengqm commented Jan 21, 2020

@shu-mutou Long time no see.

@hwdef
Copy link
Member Author

hwdef commented Jan 21, 2020

@tengqm
@shu-mutou
@tanjunchen

Thanks for your suggestions.I will modify them later. I'm on vacation now and I don't have much time to modify them.
When I am finished, please review my pr again.
Thanks again!

@shu-mutou
Copy link
Contributor

Have a nice holidays!!
BTW, could you maintain zh-tw and zh-hk? If can not so, could you find someone to maintain them?

@zehuaiWANG
Copy link
Contributor

@shu-mutou I can help to translate the zh-tw and zh-hk, if no one want to do it, I will take it.

@hwdef
Copy link
Member Author

hwdef commented Jan 21, 2020

@shu-mutou
I can keep them temporarily, and when find the right people, I can transfer permissions. Hong Kong dweller and Taiwanese are the best.

@hwdef
Copy link
Member Author

hwdef commented Jan 21, 2020

@shu-mutou
I'm looking for some people to become approver for zh-hk and zh-tw.When I receive a specific response, please review.

@hwdef
Copy link
Member Author

hwdef commented Jan 27, 2020

@tengqm
I read all your suggestions. They are helpful.
But the translation in zh-cn was removed from zh,I want to keep zh, zh-cn,zh-tw,zh-hkandzh-sg consistent.
After reading your suggestions, I think they are very helpful, you are very thoughtful, we can improve the translation of zh first, and then sync to zh-cn and other.
Cloud you please create a PR that improves the translation of zh?Determine the Chinese translation template through your pr.

@shu-mutou
Copy link
Contributor

Please check #4814. It reconstructs Chinese locales and realizes maintaining only Simplifiled Chinese zh-hans and Traditional Chinese zh-hant.

  • zh, zh-cn and zh-sg are linked from zh-hans.
  • zh-tw and zh-hk are linked from zh-hant.

@hwdef
Copy link
Member Author

hwdef commented Feb 1, 2020

@tengqm
I read all your suggestions. They are helpful.
But the translation in zh-cn was removed from zh,I want to keep zh, zh-cn,zh-tw,zh-hkandzh-sg consistent.
After reading your suggestions, I think they are very helpful, you are very thoughtful, we can improve the translation of zh first, and then sync to zh-cn and other.
Cloud you please create a PR that improves the translation of zh?Determine the Chinese translation template through your pr.

/cc @tanjunchen

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 1, 2020
@k8s-ci-robot
Copy link
Contributor

@hwdef: PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@hwdef
Copy link
Member Author

hwdef commented Feb 2, 2020

As #4814 has been merged, this pr is no longer needed. I will close it.
If @tengqm and @tanjunchen have any suggestions for Simplified Chinese, please modify /zh/messages.zh.xlf.
Thank you very much.

@hwdef hwdef closed this Feb 2, 2020
@shu-mutou
Copy link
Contributor

Could you translate around Horizontal pod autoscaler in zh/messages.zh.xlf and zh-sg/messages.zh-sg.xlf? See https://github.com/kubernetes/dashboard/pull/4784/files#diff-4f007b0c1cdd2aa00fd683d58ae2bdca . Or are there not needed to translate?

@shu-mutou shu-mutou reopened this Feb 3, 2020
@hwdef
Copy link
Member Author

hwdef commented Feb 3, 2020

@shu-mutou
I will translate Horizontal pod autoscaler, thanks for your suggestion.

@hwdef
Copy link
Member Author

hwdef commented Feb 4, 2020

@shu-mutou
I translate Horizontal pod autoscaler in #4856

@hwdef hwdef closed this Feb 4, 2020
@hwdef hwdef deleted the update-zh-trans branch May 26, 2020 05:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. language/zh Updates or issues for Chinese translations. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants