Skip to content

Commit e8d4d5f

Browse files
committed
[zh] sync cncf-code-of-conduct.md
1 parent 5f83394 commit e8d4d5f

File tree

2 files changed

+150
-32
lines changed

2 files changed

+150
-32
lines changed

content/zh-cn/community/code-of-conduct.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ community_styles_migrated: true
1717
Kubernetes follows the
1818
<a href="https://github.com/cncf/foundation/blob/main/code-of-conduct.md">CNCF Code of Conduct</a>.
1919
The text of the CNCF CoC is replicated below, as of
20-
<a href="https://github.com/cncf/foundation/blob/fff715fb000ba4d7422684eca1d50d80676be254/code-of-conduct.md">commit fff715fb0</a>.
20+
<a href="https://github.com/cncf/foundation/blob/c79711b5127e2d963107bc1be4a41975c8791acc/code-of-conduct.md">commit c79711b51</a>.
2121
If you notice that this is out of date, please
2222
<a href="https://github.com/kubernetes/website/issues/new">file an issue</a>.
2323
-->
2424
Kubernetes 遵循
2525
<a href="https://github.com/cncf/foundation/blob/main/code-of-conduct-languages/zh.md">CNCF 行为准则</a>。
2626
有关 CNCF 行为准则的文本,请参阅
27-
<a href="https://github.com/cncf/foundation/blob/fff715fb000ba4d7422684eca1d50d80676be254/code-of-conduct.md">commit fff715fb0</a>。
27+
<a href="https://github.com/cncf/foundation/blob/c79711b5127e2d963107bc1be4a41975c8791acc/code-of-conduct.md">commit c79711b51</a>。
2828
如果你发现此 CNCF 行为准则的文本已经过时,
2929
请<a href="https://github.com/kubernetes/website/issues/new">提交 Issue</a>。
3030
</p>
Lines changed: 148 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,189 @@
1-
<!-- Do not edit this file directly. Get the latest from
2-
https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/zh.md -->
3-
## 云原生计算基金会(CNCF)社区行为准则 1.2 版本
1+
<!--
2+
Do not edit this file directly. Get the latest from
3+
https://github.com/cncf/foundation/blob/master/code-of-conduct-languages/zh.md
4+
-->
5+
6+
<!--
7+
## CNCF Community Code of Conduct v1.3
8+
9+
### Community Code of Conduct
10+
-->
11+
## 云原生计算基金会(CNCF)社区行为准则 1.3 版本
12+
13+
### 社区行为准则
14+
15+
<!--
16+
As contributors, maintainers, and participants in the CNCF community, and in the interest of fostering
17+
an open and welcoming community, we pledge to respect all people who participate or contribute
18+
through reporting issues, posting feature requests, updating documentation,
19+
submitting pull requests or patches, attending conferences or events, or engaging in other community or project activities.
20+
21+
We are committed to making participation in the CNCF community a harassment-free experience for everyone, regardless of age, body size, caste, disability, ethnicity, level of experience, family status, gender, gender identity and expression, marital status, military or veteran status, nationality, personal appearance, race, religion, sexual orientation, socieconomic status, tribe, or any other dimension of diversity.
22+
-->
23+
作为 CNCF 社区的贡献者、维护者和参与者,我们努力建设一个开放和受欢迎的社区,我们承诺尊重所有上报
24+
Issue、发布功能需求、更新文档、提交 PR 或补丁、参加会议活动以及其他社区和项目活动的贡献者和参与者。
25+
26+
我们致力于让参与 CNCF 社区项目的每个人都不受骚扰,无论其年龄、体型、种姓、残疾、族裔、经验水平、
27+
家庭状况、性别、性别认同和表达、婚姻状况、军人或退伍军人身份、国籍、个人外表、种族、宗教、性取向、
28+
社会经济地位、部落或任何其他方面的多样性。
29+
30+
<!--
31+
## Scope
32+
33+
This code of conduct applies:
34+
* within project and community spaces,
35+
* in other spaces when an individual CNCF community participant's words or actions are directed at or are about a CNCF project, the CNCF community, or another CNCF community participant.
36+
-->
37+
## 范围
438

5-
### 贡献者行为准则
39+
本行为准则适用于:
640

7-
作为 CNCF 社区的贡献者和维护者,我们努力建设一个开放和受欢迎的社区,我们承诺尊重所有上报
8-
Issue、发布功能需求、更新文档、提交 PR 或补丁的贡献者以及其他相关活动的所有参与者。
41+
* 在项目和社区空间内,
42+
* 在其他空间,当某个 CNCF 社区参与者的言语或行为提及 CNCF 项目、CNCF 社区或其他 CNCF 社区参与者时
943

10-
我们致力于让参与此项目的每个人都不受骚扰,无论其经验水平、性别、性别认同和表达、性取向、残疾、个人外貌、体型、人种、种族、年龄、宗教或国籍等。
44+
<!--
45+
### CNCF Events
1146
12-
## 范围
47+
CNCF events that are produced by the Linux Foundation with professional events staff are governed by the Linux Foundation [Events Code of Conduct](https://events.linuxfoundation.org/code-of-conduct/) available on the event page. This is designed to be used in conjunction with the CNCF Code of Conduct.
48+
-->
49+
### CNCF 活动行为准则
1350

14-
当某个人代表项目或其社区时,本行为准则适用于项目空间和公共空间。
51+
由 Linux 基金会和专业活动人员举办的 CNCF 活动受 Linux
52+
基金会[活动行为准则](https://events.linuxfoundation.org/code-of-conduct/)管辖,
53+
该行为准则可在活动页面获得。其旨在与 CNCF 行为准则兼容。
1554

16-
### CNCF 活动行为准则
55+
<!--
56+
## Our Standards
1757
18-
云原生计算基金会(CNCF)活动受 Linux
19-
基金会[活动行为准则](https://events.linuxfoundation.org/code-of-conduct/)管辖,该行为准则可在活动页面获得。
20-
其旨在与 CNCF 行为准则兼容。
58+
The CNCF Community is open, inclusive and respectful. Every member of our community has the right to have their identity respected.
2159
60+
Examples of behavior that contributes to a positive environment include but are not limited to:
61+
-->
2262
## 我们的标准
2363

24-
对社区贡献具有积极正向作用的行为包括:
64+
CNCF 社区是开放、包容和尊重的。社区的每个成员都有权让自己的身份受到尊重。
2565

66+
对社区贡献具有积极正向作用的行为包括但不限于:
67+
68+
<!--
69+
* Demonstrating empathy and kindness toward other people
70+
* Being respectful of differing opinions, viewpoints, and experiences
71+
* Giving and gracefully accepting constructive feedback
72+
* Accepting responsibility and apologizing to those affected by our mistakes,
73+
and learning from the experience
74+
* Focusing on what is best not just for us as individuals, but for the
75+
overall community
76+
* Using welcoming and inclusive language
77+
-->
2678
* 表现出对他人的共情和善意
2779
* 尊重不同的意见、观点和经验
2880
* 提出和优雅地接受建设性的反馈
2981
* 有担当,如因自己的错误影响到别人能适时道歉,吸取经验教训
3082
* 关注点不只放在如何让我们自己受益,还能着眼于整个社区
31-
32-
不可接受的参与者行为包括:
33-
34-
* 使用性语言或图像以及任何类型的性关注和性倾向
83+
* 使用欢迎和包容的语言
84+
85+
<!--
86+
Examples of unacceptable behavior include but are not limited to:
87+
88+
* The use of sexualized language or imagery
89+
* Trolling, insulting or derogatory comments, and personal or political attacks
90+
* Public or private harassment in any form
91+
* Publishing others' private information, such as a physical or email
92+
address, without their explicit permission
93+
* Violence, threatening violence, or encouraging others to engage in violent behavior
94+
* Stalking or following someone without their consent
95+
* Unwelcome physical contact
96+
* Unwelcome sexual or romantic attention or advances
97+
* Other conduct which could reasonably be considered inappropriate in a
98+
professional setting
99+
-->
100+
不可接受的参与者行为包括但不限于:
101+
102+
* 使用性语言或图像
35103
* 挑衅、侮辱或贬低性评论以及人身或政治攻击
36-
* 公开或私下骚扰
104+
* 任何形式的公开或私下骚扰
37105
* 未经明确许可,发布他人的私密信息,比如地址或电子邮箱
106+
* 暴力、暴力威胁或鼓励他人从事暴力行为
107+
* 未经同意跟踪或跟随他人
108+
* 不受欢迎的身体接触
109+
* 不受欢迎的性或浪漫的追求和挑逗
38110
* 其他可能视为不道德或不专业的行为
39111

112+
<!--
113+
The following behaviors are also prohibited:
114+
* Providing knowingly false or misleading information in connection with a Code of Conduct investigation or otherwise intentionally tampering with an investigation.
115+
* Retaliating against a person because they reported an incident or provided information about an incident as a witness.
116+
-->
117+
同时禁止下列行为:
118+
119+
* 故意提供针对行为准则调查的虚假或误导性信息,或以其他方式故意篡改调查内容。
120+
* 由于某人报告事件或作为证人提供有关事件的信息而对其进行报复。
121+
122+
<!--
123+
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct.
124+
By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect
125+
of managing a CNCF project.
126+
Project maintainers who do not follow or enforce the Code of Conduct may be temporarily or permanently removed from the project team.
127+
-->
40128
项目维护者有权利和责任删除、编辑或拒绝不符合本行为准则的评论、提交、编写代码、编辑维基、提问和其它贡献。
41129
通过采用本行为准则,项目维护者承诺将这些原则公平且一致地应用到这个项目管理的各个方面。
42130
不遵守或不执行行为准则的项目维护者可能被永久地从项目团队中移除。
43131

132+
<!--
133+
## Reporting
134+
135+
For incidents occurring in the Kubernetes community, contact the [Kubernetes Code of Conduct Committee](https://git.k8s.io/community/committee-code-of-conduct) via <[email protected]>. You can expect a response within three business days.
136+
-->
44137
## 上报
45138

46139
对于 Kubernetes 社区中出现的事件,请发送邮件至 <[email protected]> 联系
47140
[Kubernetes 行为准则委员会](https://git.k8s.io/community/committee-code-of-conduct)
48141
预计你可以在三个工作日内收到答复。
49142

50-
对于其他项目、或与项目无关或影响到多个 CNCF 项目的事件,请通过 [email protected]
51-
联系 [CNCF 行为准则委员会](https://www.cncf.io/conduct/committee/)
143+
<!--
144+
For other projects, or for incidents that are project-agnostic or impact multiple CNCF projects, please contact the [CNCF Code of Conduct Committee](https://www.cncf.io/conduct/committee/) via [email protected]. Alternatively, you can contact any of the individual members of the [CNCF Code of Conduct Committee](https://www.cncf.io/conduct/committee/) to submit your report. For more detailed instructions on how to submit a report, including how to submit a report anonymously, please see our [Incident Resolution Procedures](https://www.cncf.io/conduct/procedures/). You can expect a response within three business days.
145+
146+
For incidents ocurring at CNCF event that is produced by the Linux Foundation, please contact [email protected].
147+
-->
148+
对于其他项目、或与项目无关或影响到多个 CNCF 项目的事件,请通过 <[email protected]> 联系
149+
[CNCF 行为准则委员会](https://www.cncf.io/conduct/committee/)
52150
你也可以联系 [CNCF 行为准则委员会](https://www.cncf.io/conduct/committee/)的任何成员提交你的报告。
53151
包括匿名提交报告在内有关如何提交报告的更多详细指示,
54-
请参阅我们的[事件解决程序](https://www.cncf.io/conduct/procedures/)
55-
预计你可以在三个工作日内收到答复。
152+
请参阅我们的[事件解决程序](https://www.cncf.io/conduct/procedures/)。预计你可以在三个工作日内收到答复。
153+
154+
对于 Linux 基金会举办的 CNCF 活动中所发生的事件,请联系 <[email protected]>
155+
156+
<!--
157+
## Enforcement
56158
159+
Upon review and investigation of a reported incident, the CoC response team that has jurisdiction will determine what action is appropriate based on this Code of Conduct and its related documentation.
160+
161+
For information about which Code of Conduct incidents are handled by project leadership, which incidents are handled by the CNCF Code of Conduct Committee, and which incidents are handled by the Linux Foundation (including its events team), see our [Jurisdiction Policy](https://www.cncf.io/conduct/jurisdiction/).
162+
-->
57163
## 执行
58164

59-
Kubernetes 项目的[行为准则委员会](https://github.com/kubernetes/community/tree/master/committee-code-of-conduct)负责解决
60-
Kubernetes 项目有关的行为准则问题。
165+
在对报告的事件进行审查和调查后,具有管辖权的行为准则应变小组(CoC)将根据本行为准则及其相关文档采取适当的行动。
166+
167+
关于哪些行为准则事件由项目领导层处理、哪些事件由 CNCF 行为准则委员会处理以及哪些事件由 Linux
168+
基金会(包括其活动团队)处理,请参阅我们的[管辖及逐级上报政策](https://www.cncf.io/conduct/jurisdiction/)
169+
170+
<!--
171+
## Amendments
172+
173+
Consistent with the CNCF Charter, any substantive changes to this Code of Conduct must be approved by the Technical Oversight Committee.
174+
-->
175+
## 修正
61176

62-
对于未设立行为准则委员会或没有行为准则事件应变人员的其他所有项目,以及与项目无关或影响到多个项目的事件,
63-
[CNCF 行为准则委员会](https://www.cncf.io/conduct/committee/)负责解决行为准则问题。
64-
有关更多信息,请参阅我们的[管辖及逐级上报政策](https://www.cncf.io/conduct/jurisdiction/)
177+
根据 CNCF 章程,对本行为准则的任何实质性变更都必须得到技术监督委员会的批准。
65178

66-
这两个委员会将尝试以零惩罚平息事件,但可能自行决定将相关人员从项目或 CNCF 社区中移除。
179+
<!--
180+
## Acknowledgements
67181
182+
This Code of Conduct is adapted from the Contributor Covenant
183+
(http://contributor-covenant.org), version 2.0 available at
184+
http://contributor-covenant.org/version/2/0/code_of_conduct/
185+
-->
68186
## 致谢
69187

70188
本行为准则改编自[贡献者契约(Contributor Covenant)](http://contributor-covenant.org) v2.0,
71-
具体可查阅 http://contributor-covenant.org/version/2/0/code_of_conduct/
189+
具体可查阅 <http://contributor-covenant.org/version/2/0/code_of_conduct/>

0 commit comments

Comments
 (0)