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.

Sign up for GitHub

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

Jump to bottom

zh-trans: add /includes/... #11349

Merged
merged 3 commits into from
Nov 30, 2018
Merged

zh-trans: add /includes/... #11349

merged 3 commits into from
Nov 30, 2018

Conversation

xichengliudui
Copy link
Contributor

zh-trans: add /includes/federated-task-tutorial-prereqs.md
zh-trans: add /includes/federation-content-moved.md
zh-trans: add /includes/federation-current-state.md

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. language/zh Issues or PRs related to Chinese language labels Nov 27, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To fully approve this pull request, please assign additional approvers.
We suggest the following additional approver: haibinxie

If they are not already assigned, you can assign the PR to them by writing /assign @haibinxie in a comment when ready.

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

@xichengliudui
Copy link
Contributor Author

/assign @haibinxie

This was referenced Nov 27, 2018
Closed
Closed
Closed
@k8sio-netlify-preview-bot
Copy link
Collaborator

Deploy preview for kubernetes-io-master-staging ready!

Built with commit 1e0319e

https://deploy-preview-11349--kubernetes-io-master-staging.netlify.com

@xichengliudui
Copy link
Contributor Author

/assign @haibinxie

@idealhack idealhack added tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. and removed tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. labels Nov 27, 2018
markthink
markthink reviewed Nov 28, 2018
View reviewed changes
content/zh/includes/federated-task-tutorial-prereqs.md Outdated
might also help you create a Federated Kubernetes cluster.
-->

本指南假设您有一个正在运行的 Kubernetes 集群联邦安装。如果没有，那么请转到
Copy link

Choose a reason for hiding this comment

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

This guide assumes that you have a running Kubernetes Cluster Federation installation
=>本指南假设您已安装有一个正在运行的 Kubernetes 集群联邦。

content/zh/includes/federation-current-state.md Outdated
`Federation V1`, the current Kubernetes federation API which reuses the Kubernetes API resources 'as is', is currently considered alpha for many of its features. There is no clear path to evolve the API to GA; however, there is a `Federation V2` effort in progress to implement a dedicated federation API apart from the Kubernetes API. The details are available at [sig-multicluster community page](https://github.com/kubernetes/community/tree/master/sig-multicluster).
-->

`联邦 V1`， 是当前的 Kubernetes 联邦 API， 它'原样'重用 Kubernetes API 资源， 其许多特性目前被认为是 alpha。 没有明确的途径将 API 发展成 GA； 然而， 除了 Kubernetes API 之外， 还有一个 `联邦 V2` 正在努力实现专用的联邦 API。详细信息可在 [sig-multicluster community page](https://github.com/kubernetes/community/tree/master/sig-multicluster) 页面获得。
Copy link

Choose a reason for hiding this comment

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

Federation V1 => 这里可以不译

Copy link
Contributor

Choose a reason for hiding this comment

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

同意。在这个上下文中，Federation V1 和 Federation V2 应保留。

Copy link
Member

Choose a reason for hiding this comment

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

sig-multicluster 社区页面获得。

content/zh/includes/federation-current-state.md Outdated
`Federation V1`, the current Kubernetes federation API which reuses the Kubernetes API resources 'as is', is currently considered alpha for many of its features. There is no clear path to evolve the API to GA; however, there is a `Federation V2` effort in progress to implement a dedicated federation API apart from the Kubernetes API. The details are available at [sig-multicluster community page](https://github.com/kubernetes/community/tree/master/sig-multicluster).
-->

`联邦 V1`， 是当前的 Kubernetes 联邦 API， 它'原样'重用 Kubernetes API 资源， 其许多特性目前被认为是 alpha。 没有明确的途径将 API 发展成 GA； 然而， 除了 Kubernetes API 之外， 还有一个 `联邦 V2` 正在努力实现专用的联邦 API。详细信息可在 [sig-multicluster community page](https://github.com/kubernetes/community/tree/master/sig-multicluster) 页面获得。
Copy link

Choose a reason for hiding this comment

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

Federation V2 同上

@netlify
Copy link

netlify bot commented Nov 29, 2018 •
edited
Loading

Deploy preview for k8s-v1-12 processing.

Built with commit 4d5ebb6

https://app.netlify.com/sites/k8s-v1-12/deploys/5c00ea16ec8a89724cb323e6

@xichengliudui
Copy link
Contributor Author

@markthink @tengqm ,已经修改。

@xichengliudui xichengliudui mentioned this pull request Nov 29, 2018
Merged
@tengqm
Copy link
Contributor

tengqm commented Nov 29, 2018

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 29, 2018
@xichengliudui
Copy link
Contributor Author

/assign @haibinxie

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 30, 2018
@xichengliudui
zh-trans: add /includes/...
cb7eff6 
zh-trans: add /includes/...

zh-trans: add /includes/...

zh-trans: add /includes/...

zh-trans: add /includes/...
@xichengliudui
Copy link
Contributor Author

@xiangpengzhao 你觉得这样可以吗？

@xiangpengzhao
Copy link
Contributor

/lgtm
请 @tengqm 看一下是否有进一步的评审意见，如果没有的话，请 approve 即可。

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 30, 2018
@xichengliudui
Copy link
Contributor Author

/assign @tengqm

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 30, 2018
@k8s-ci-robot
Copy link
Contributor

New changes are detected. LGTM label has been removed.

@tengqm tengqm merged commit a7b2730 into kubernetes:release-1.12 Nov 30, 2018
@chenrui333 chenrui333 mentioned this pull request Dec 3, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chenrui333 chenrui333 chenrui333 left review comments

@markthink markthink markthink left review comments

@tengqm tengqm tengqm left review comments

@xiangpengzhao xiangpengzhao xiangpengzhao left review comments

@idealhack idealhack Awaiting requested review from idealhack

Assignees

@tengqm tengqm

@haibinxie haibinxie

@xiangpengzhao xiangpengzhao

Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. language/zh Issues or PRs related to Chinese language size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@xichengliudui @k8s-ci-robot @k8sio-netlify-preview-bot @tengqm @xiangpengzhao @chenrui333 @markthink @idealhack @haibinxie