Skip to content

zh-translation:/faq/general/what-is-the-license.md #5503

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
Merged
merged 4 commits into from
Nov 9, 2019
Merged

zh-translation:/faq/general/what-is-the-license.md #5503

merged 4 commits into from
Nov 9, 2019

Conversation

sniperking1234
Copy link
Contributor

@sniperking1234 sniperking1234 commented Nov 8, 2019 •
edited by istio-policy-bot
Loading

@sniperking1234 sniperking1234 requested a review from a team as a code owner November 8, 2019 07:21
@istio-testing istio-testing added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 8, 2019
@googlebot googlebot added the cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. label Nov 8, 2019
@istio-testing
Copy link
Contributor

Hi @sniperking1234. Thanks for your PR.

I'm waiting for a istio member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

rootsongjc
rootsongjc reviewed Nov 8, 2019
View reviewed changes
content/zh/faq/general/what-is-the-license.md Outdated
@@ -1,5 +1,5 @@
---
title:ISTIO 的许可证是什么？
title: ISTIO 的许可证是什么？
Copy link
Member

Choose a reason for hiding this comment

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

ISTIO -> Istio

@rootsongjc rootsongjc added the translation/chinese Translation item label Nov 8, 2019
@rootsongjc rootsongjc self-assigned this Nov 8, 2019
rootsongjc
rootsongjc reviewed Nov 8, 2019
View reviewed changes
content/zh/faq/general/what-is-the-license.md Outdated
weight: 40
---

Istio uses the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0.html).
Istio 使用了 [Apache 许可证 2.0](https://www.apache.org/licenses/LICENSE-2.0.html)。
Copy link
Member

Choose a reason for hiding this comment

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

Apache License 2.0 保留原文不用翻译。

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@rootsongjc 好的，我再改下。我是看1.2版本的中文文档是这么翻译的

@rootsongjc
Copy link
Member

/ok-to-test

@istio-testing istio-testing added ok-to-test Set this label allow normal testing to take place for a PR not submitted by an Istio org member. and removed needs-ok-to-test labels Nov 8, 2019
rootsongjc
rootsongjc approved these changes Nov 9, 2019
View reviewed changes
Copy link
Member

@rootsongjc rootsongjc left a comment

Choose a reason for hiding this comment

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

/lgtm

@istio-testing istio-testing merged commit e03acd7 into istio:master Nov 9, 2019
charili pushed a commit to charili/istio.io that referenced this pull request Nov 10, 2019
@sniperking1234 @istio-testing
zh-translation:/faq/general/what-is-the-license.md (istio#5503)
e675fa8 
* zh-translation:/faq/general/what-is-the-license.md

* zh-translation:/faq/general/what-is-the-license.md

* zh-translation:/faq/general/what-is-the-license.md

* zh-translation:/faq/general/what-is-the-license.md
@sniperking1234 sniperking1234 mentioned this pull request Jan 14, 2020
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
1 more reviewer

@rootsongjc rootsongjc rootsongjc approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees

@rootsongjc rootsongjc

Labels
cla: yes Set by the Google CLA bot to indicate the author of a PR has signed the Google CLA. kind/docs ok-to-test Set this label allow normal testing to take place for a PR not submitted by an Istio org member. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. translation/chinese Translation item
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@sniperking1234 @istio-testing @rootsongjc @googlebot @istio-policy-bot