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

ko: Keep up with upstream #15030

Merged
merged 2 commits into from
Jul 9, 2019

Conversation

gochist
Copy link
Member

@gochist gochist commented Jun 20, 2019

Partly fixes_ #15001

1 file deferred from previous team milestone

These should be compared with dev-1.14-ko.4

  • content/en/docs/setup/_index.md
  • content/en/docs/setup/minikube.md -> content/en/docs/setup/learning-environment/minikube.md
  • content/en/docs/tutorials/online-training/overview.md

9 files to be renamed

  • R088 content/en/docs/setup/certificates.md -> content/en/docs/setup/best-practices/certificates.md
  • R099 content/en/docs/setup/cluster-large.md -> content/en/docs/setup/best-practices/cluster-large.md
  • R099 content/en/docs/setup/multiple-zones.md -> content/en/docs/setup/best-practices/multiple-zones.md
  • R098 content/en/docs/setup/node-conformance.md -> content/en/docs/setup/best-practices/node-conformance.md
  • R067 content/en/docs/setup/minikube.md -> content/en/docs/setup/learning-environment/minikube.md
  • R097 content/en/docs/setup/cri.md -> content/en/docs/setup/production-environment/container-runtimes.md
  • R073 content/en/docs/setup/on-premises-vm/_index.md -> content/en/docs/setup/production-environment/on-premises-vm/_index.md
  • R099 content/en/docs/setup/custom-cloud/kops.md -> content/en/docs/setup/production-environment/tools/kops.md
  • R078 content/en/docs/setup/turnkey/_index.md -> content/en/docs/setup/production-environment/turnkey/_index.md

3 files to be deleted

  • content/en/docs/setup/custom-cloud/_index.md
  • content/en/docs/setup/independent/_index.md
  • content/en/docs/setup/release/building-from-source.md

/hold

@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. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. 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/ko Issues or PRs related to Korean language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Jun 20, 2019
@gochist gochist force-pushed the wip-ko1-renamed branch 2 times, most recently from 93d2fca to e2af5bb Compare June 20, 2019 15:05
@gochist gochist force-pushed the wip-ko1-renamed branch 2 times, most recently from 1ef8cf5 to bd7c9a2 Compare June 21, 2019 00:35
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 21, 2019
@netlify
Copy link

netlify bot commented Jun 21, 2019

Deploy preview for k8s-dev-ko ready!

Built with commit e9a9c4b

https://deploy-preview-15030--k8s-dev-ko.netlify.com

@gochist gochist force-pushed the wip-ko1-renamed branch 3 times, most recently from 92ad6af to 25c19a1 Compare June 21, 2019 04:43
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jun 21, 2019
@gochist gochist force-pushed the wip-ko1-renamed branch 2 times, most recently from 8776166 to 06a201a Compare June 21, 2019 05:02
@gochist gochist changed the title WIP ko: Keep up with upstream - renamed files ko: Keep up with upstream - renamed files Jun 21, 2019
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 21, 2019
@gochist
Copy link
Member Author

gochist commented Jun 21, 2019

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 21, 2019
@gochist gochist changed the title ko: Keep up with upstream - renamed files WIP ko: Keep up with upstream - renamed files Jun 21, 2019
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 21, 2019
@gochist gochist force-pushed the wip-ko1-renamed branch 2 times, most recently from 86cd1cc to 4af5d98 Compare June 21, 2019 05:37
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 21, 2019
@gochist gochist changed the title WIP ko: Keep up with upstream - renamed files ko: Keep up with upstream Jun 21, 2019
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 21, 2019
Copy link
Contributor

@sftim sftim left a comment

Choose a reason for hiding this comment

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

Informal feedback. I hope this is useful.


{{< table caption="쿠버네티스를 배포하기 위해 커뮤니티와 생태계에서 지원하는 도구를 나열한 로컬 머신 솔루션 표." >}}

|Community |Ecosystem |
Copy link
Contributor

Choose a reason for hiding this comment

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

These headings are untranslated; is that intended?

Copy link
Member Author

Choose a reason for hiding this comment

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

@sftim Yes, just for my convenience. Now I has translated them. Thank you for your kind review!

Copy link
Contributor

Choose a reason for hiding this comment

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

No worries @gochist

{{< table caption="제공자와 솔루션을 나열한 운영 환경 솔루션 표." >}}
다음 운영 환경 솔루션 표는 제공자와 솔루션을 나열한다.

|Providers | Managed | Turnkey cloud | On-prem datacenter | Custom (cloud) | Custom (On-premises VMs)| Custom (Bare Metal) |
Copy link
Contributor

Choose a reason for hiding this comment

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

These headings are untranslated; is that intended?

| [Digital Rebar](https://provision.readthedocs.io/en/tip/README.html) | | | | | | &#x2714;
| [DigitalOcean](https://www.digitalocean.com/products/kubernetes/) | &#x2714; | | | | |
| [Docker Enterprise](https://www.docker.com/products/docker-enterprise) | |&#x2714; | &#x2714; | | | &#x2714;
| [Fedora (Multi Node)](https://kubernetes.io/docs/getting-started-guides/fedora/flannel_multi_node_cluster/)  | | | | | &#x2714; | &#x2714;
Copy link
Contributor

Choose a reason for hiding this comment

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

How about translating “Multi Node” here?

@gochist
Copy link
Member Author

gochist commented Jun 21, 2019

@sftim Thank you! I addressed all your comments.

@seokho-son
Copy link
Member

/assign @seokho-son

Copy link
Member

@seokho-son seokho-son left a comment

Choose a reason for hiding this comment

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

@gochist 님. 감사합니다! 리뷰 완료하였습니다 ~

content/ko/docs/setup/_index.md Outdated Show resolved Hide resolved
content/ko/docs/setup/_index.md Outdated Show resolved Hide resolved
content/ko/docs/setup/_index.md Outdated Show resolved Hide resolved
@@ -17,33 +17,31 @@ content_template: templates/concept

* [Cloud Native Certified Kubernetes Administrator (CKA) with Hands-On Labs & Practice Exams (Linux Academy)](https://linuxacademy.com/linux/training/course/name/cloud-native-certified-kubernetes-administrator-cka)

* [Certified Kubernetes Administrator Developer 준비 과정 및 모의 시험 (KodeKloud)](https://kodekloud.com/p/certified-kubernetes-administrator-with-practice-tests)
* [Certified Kubernetes Administrator Preparation Course with Practice Tests (KodeKloud)](https://kodekloud.com/p/certified-kubernetes-administrator-with-practice-tests)
Copy link
Member

Choose a reason for hiding this comment

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

기존의 번역된 내용도 다시 영문으로 바뀐 경우가 있는데, 고민해서 처리하신 것이라 짐작하였습니다 ~~

@k8s-ci-robot k8s-ci-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jul 4, 2019
@gochist
Copy link
Member Author

gochist commented Jul 4, 2019

@seokho-son 감사합니다! 리뷰 반영했고, #15099 에 의해 발생한 Conflict도 추가로 해결했습니다.

@seokho-son
Copy link
Member

@gochist 감사합니다 ~~
/lgtm

@claudiajkang 검토해보시고 승인 부탁드립니다 ~~ :)

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 5, 2019
@ianychoi
Copy link
Contributor

ianychoi commented Jul 9, 2019

/lgtm

@ianychoi
Copy link
Contributor

ianychoi commented Jul 9, 2019

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ianychoi

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 Jul 9, 2019
@k8s-ci-robot k8s-ci-robot merged commit 8c1425e into kubernetes:dev-1.15-ko.1 Jul 9, 2019
gochist added a commit that referenced this pull request Jul 9, 2019
* Translate concepts/workloads/controllers/replicationcontroller in Korean (#15044)
* ko: Update outdated 1.14-ko.4 branch (#15099)
* Translate tasks/access-application-cluster/configure-access-multiple-clusters in Korean (#15121)
* Translate standardized glossary items in Tag Network into Korean (#15278)
* ko: Keep up with upstream - renamed files (#15030)

Co-Authored-By: Seokho <[email protected]>
Co-Authored-By: lapee79 <[email protected]>
Co-Authored-By: Yoon <[email protected]>
Co-Authored-By: June Yi <[email protected]>
k8s-ci-robot pushed a commit that referenced this pull request Jul 10, 2019
* Translate concepts/workloads/controllers/replicationcontroller in Korean (#15044)
* ko: Update outdated 1.14-ko.4 branch (#15099)
* Translate tasks/access-application-cluster/configure-access-multiple-clusters in Korean (#15121)
* Translate standardized glossary items in Tag Network into Korean (#15278)
* ko: Keep up with upstream - renamed files (#15030)

Co-Authored-By: Seokho <[email protected]>
Co-Authored-By: lapee79 <[email protected]>
Co-Authored-By: Yoon <[email protected]>
Co-Authored-By: June Yi <[email protected]>
@gochist gochist deleted the wip-ko1-renamed branch September 22, 2019 11:32
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. language/ko Issues or PRs related to Korean language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/docs Categorizes an issue or PR as relevant to SIG Docs. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants