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

Change 'zh' to 'zh-cn' #869

Merged
merged 12 commits into from
May 9, 2022
2 changes: 1 addition & 1 deletion .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ lang/pt:
- content/pt-br/*

lang/zh:
- content/zh/*
- content/zh-cn/*


2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@
/content/es/ @raelga @electrocucaracha @krol3

# Approvers for Chinese contents
/content/zh/ @hanyuancheung @Jacob953 @Rocksnake @Submarinee
/content/zh-cn/ @hanyuancheung @Jacob953 @Rocksnake @Submarinee
4 changes: 2 additions & 2 deletions config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,11 @@ languageName ="Español(Spanish)"
contentDir = "content/es"
weight = 6

[languages.zh]
[languages.zh-cn]
title = "Cloud Native(云原生) Glossary"
description = "CNCF 云原生 Glossary 项目旨在用作讨论云原生应用程序时常用术语的参考"
languageName ="中文(Chinese)"
contentDir = "content/zh"
contentDir = "content/zh-cn"
weight = 7

[markup]
Expand Down
28 changes: 28 additions & 0 deletions content/zh-cn/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@

---
title: "云原生词汇表"
---

# 云原生词汇表

云原生词汇表是由 CNCF 商业价值小组委员会 (BVS, Business Value Subcommittee) 领导的一个项目。该项目目的是在不需要先验技术知识的情况下,以清晰通俗的语言解释云原生概念。

<p><img class="mt-5" src="/images/homepage/stage.jpg" alt="A woman and two men presenting technical info on a stage"></p>

## 社区贡献

对本机词汇表的更改、添加和改进对所有人开放。我们使用由 CNCF 管理的社区驱动流程来开发和完善这个共享词典。该词汇表提供了一个厂商中立的平台,用于管理云原生技术的共享词汇表。欢迎所有参与者根据本项目的目的和章程作出贡献。

任何想要贡献的人都可以提交 GitHub issue 或 创建 PR。欲了解更多信息,请查看 [如何贡献](/zh-cn/contribute/) 和遵循 [样式指南](/zh-cn/style-guide/),并加入 CNCF Slack 中的 #glossary 频道。这里有 #glossary-localizations 频道,供想要将 glossarg 翻译成母语的人使用。
jihoon-seo marked this conversation as resolved.
Show resolved Hide resolved

## 致谢

云原生词汇表可从 CNCF 营销委员会 (CNCF Marketing Committee) (商业价值小组委员会) 获得,
包括 [Catherine Paganini](https://www.linkedin.com/in/catherinepaganini/en/), [Chris Aniszczyk](https://www.linkedin.com/in/caniszczyk/),
[Daniel Jones](https://www.linkedin.com/in/danieljoneseb/?originalSubdomain=uk), [Jason Morgan](https://www.linkedin.com/in/jasonmorgan2/), [Katelin Ramer](https://www.linkedin.com/in/katelinramer/), [Mike Foster](https://www.linkedin.com/in/mfosterche/?originalSubdomain=ca), [Seokho Son](https://www.linkedin.com/in/seokho-son/) 以及更多的贡献者. 如想获得完整的贡献者名单, 请跳转至 [GitHub Pages 页](https://github.com/cncf/glossary/graphs/contributors).

该词汇表由 [Catherine Paganini](https://www.linkedin.com/in/catherinepaganini/en/), [Jason Morgan](https://www.linkedin.com/in/jasonmorgan2/), [Jihoon Seo](https://www.linkedin.com/in/jihoon-seo/), [Noah Ispas](https://www.linkedin.com/in/noah-ispas-0665b42a/), [Seokho Son](https://www.linkedin.com/in/seokho-son/) 进行运维。

## 协议

所有代码贡献都在 Apache 2.0 许可下。文档在 CC BY 4.0 下分发。
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Cloud Native Glossary 内容存储在 [this GitHub repo](https://github.com/cncf
## 提出新术语
您可以提出一个新术语供其他人使用或自己创建一个新定义. 无论哪种方式, 您都将从创建问题开始(请注意, 您需要一个 GitHub 帐户来执行此操作).

以下是针对尚未熟悉 GitHub 的人的分步指南. **如果你是 GitHub Pro 账户**, 请快速查看以确保您使用我们的问题模板、适当的命名约定、在 Slack 上声明 PR(否则我们可能会错过它)以及在哪里可以找到文件模板. 在开始之前, 请务必阅读 [Style Guide](https://glossary.cncf.io/style-guide/).
以下是针对尚未熟悉 GitHub 的人的分步指南. **如果你是 GitHub Pro 账户**, 请快速查看以确保您使用我们的问题模板、适当的命名约定、在 Slack 上声明 PR(否则我们可能会错过它)以及在哪里可以找到文件模板. 在开始之前, 请务必阅读 [Style Guide](/zh-cn/style-guide/).

### 创建 issue
前往 [Glossary GitHub repo](https://github.com/cncf/glossary/issues) 并点击 "new issue".
Expand All @@ -46,7 +46,7 @@ Cloud Native Glossary 内容存储在 [this GitHub repo](https://github.com/cncf

### 提交新术语 (创建 PR)

在开始之前, 请阅读 [Style Guide](https://glossary.cncf.io/style-guide/) — 它将帮助减少来回次数. 如样式指南中所述, 我们强烈建议从 Google 或 Word 文档开始.
在开始之前, 请阅读 [Style Guide](/zh-cn/style-guide/) — 它将帮助减少来回次数. 如样式指南中所述, 我们强烈建议从 Google 或 Word 文档开始.

准备好提交术语后, 转到内容(在代码中)...

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ The following style guide is designed to help you understand the glossary defini
The Cloud Native Glossary follows the [default style guide](https://github.com/cncf/foundation/blob/master/style-guide.md) located in the CNCF's repository. Additionally it follows the following rules:

1. [Avoid colloquial language](https://en.wikipedia.org/wiki/Colloquialism)
2. [Use literal and concrete language](http://guidetogrammar.org/grammar/composition/abstract.htm)
2. [Use literal and concrete language](https://guidetogrammar.org/grammar/composition/abstract.htm)
3. [Omit contractions](https://en.wikipedia.org/wiki/Contraction_(grammar))
4. [Use passive voice sparingly](https://www.ef.com/ca/english-resources/english-grammar/passive-voice/)
5. [Aim to phrase statements in a positive form](https://examples.yourdictionary.com/positive-sentence-examples.html)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ category: 技术
## 是什么

虚拟机(VM)是一台计算机及其操作系统,不受特定硬件的约束。
虚拟机依靠 [虚拟化](https://glossary.cncf.io/virtualization/) 将一台物理计算机分割成多个虚拟计算机。
虚拟机依靠 [虚拟化](/zh-cn/virtualization/) 将一台物理计算机分割成多个虚拟计算机。
这种分离使组织和基础设施供应商能够轻松地创建和销毁虚拟机,而不影响底层硬件。

## 解决的问题

虚拟机利用了虚拟化的优势。
当 [裸机](https://glossary.cncf.io/bare_metal_machine/) 机器被束缚在一个单一的操作系统上时,该机器的资源的使用受到一定的限制。
当 [裸机](/bare_metal_machine/) 机器被束缚在一个单一的操作系统上时,该机器的资源的使用受到一定的限制。
另外,当一个操作系统被绑定在一个单一的物理机上时,它的可用性直接与该硬件联系在一起。
如果物理机由于维护或硬件故障而脱机,操作系统也会脱机。

Expand Down
File renamed without changes.
24 changes: 0 additions & 24 deletions content/zh/_index.md

This file was deleted.

File renamed without changes.