You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by ju...@apache.org on 2020/08/12 13:15:34 UTC
[apisix-website] branch master updated: feat: translate several
pages in Chinese (#57)
This is an automated email from the ASF dual-hosted git repository.
juzhiyuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-website.git
The following commit(s) were added to refs/heads/master by this push:
new 706c3ad feat: translate several pages in Chinese (#57)
706c3ad is described below
commit 706c3adc33c59f825c5bd86918e53c926921b7dc
Author: ceba <ce...@outlook.com>
AuthorDate: Wed Aug 12 21:15:17 2020 +0800
feat: translate several pages in Chinese (#57)
* feat: translate some pages in Chinese (#44, #45, #46, #47)
* feat: translate Release Guide in English (#35)
* fix: improve text quality
---
content/contribute/2fa/index.zh.md | 20 ++++----
content/contribute/contributor/index.zh.md | 58 +++++++++++-----------
content/contribute/release/index.en.md | 2 +-
content/contribute/release/index.zh.md | 2 +-
content/contribute/security/index.zh.md | 6 +--
content/downloads/index.zh.md | 31 +++++-------
...ey-generator.html => gpg-key-generator-en.html} | 10 ++--
...ey-generator.html => gpg-key-generator-zh.html} | 0
8 files changed, 62 insertions(+), 67 deletions(-)
diff --git a/content/contribute/2fa/index.zh.md b/content/contribute/2fa/index.zh.md
index 0061ca1..a722b80 100644
--- a/content/contribute/2fa/index.zh.md
+++ b/content/contribute/2fa/index.zh.md
@@ -5,16 +5,16 @@ include_footer: true
---
<div>
-<h2 class="title">Two-factor authentication(2FA)</h2>
-<p>Two factor authentication (2FA) refers to the authentication method that combines both passport and an object (credit card, SMS phone, token or biomarkers as fingerprint) to identify a user. To ensure the security of the committer’s account, we need you to enable 2FA to sign in and contribute codes on GitHub. More details, please refer to <a href="https://help.github.com/articles/requiring-two-factor-authentication-in-your-organization/" target="_blank">2FA</a>.</p>
-<p><strong>Note:</strong>If you do not enable 2FA, you will be removed from the project and unable to access our repositories and the fork from our private repository.</p>
+<h2 class="title">两步验证（2FA）</h2>
+<p>两步验证（2FA）是一种更加安全的用户认证手段，在除了使用用户名和密码之外，还需要使用其他材料（如信用卡、手机短信、令牌、指纹等生物特征）验证用户身份。为了确保提交者账户的安全性，您需要在 GitHub 上启用 2FA 来登录和提交贡献。更多的细节，请参考 <a href="https://help.github.com/articles/requiring-two-factor-authentication-in-your-organization/" target="_blank">2FA</a>。</p>
+<p><strong>注意：</strong>如果您没有启用 2FA，您将会被从项目中移除，亦无法访问我们的仓库、fork 我们的私有仓库。</p>
<br />
-<h2 class="title">Enable 2FA on GitHub</h2>
-<p>For detailed operations, please refer to <a href="https://help.github.com/en/github/authenticating-to-github/configuring-two-factor-authentication" target="_blank">Enable Two Factor Authentication with TOTP</a>.</p>
-<p>After enabling 2FA, you need to sign in GitHub with the way of username/password + mobile phone authentication code.</p>
-<p><strong>Tips:</strong> If you cannot download the APP through the page link, you can search and download the Google Authenticator in APP Store.</p>
+<h2 class="title">在 GitHub 上启用 2FA</h2>
+<p>具体操作细节，请参考 <a href="https://help.github.com/en/github/authenticating-to-github/configuring-two-factor-authentication" target="_blank">Enable Two Factor Authentication with TOTP</a>。</p>
+<p>在启用 2FA 之后，您需要使用用户名/密码 + 验证码，来登陆 GitHub。</p>
+<p><strong>提示：</strong> 如果您无法通过页面上的链接下载 APP，您可以在应用商店中搜索下载 Google Authenticator。</p>
<br />
-<h2 class="title">How to Submit Codes</h2>
-<p>After enabling 2FA, you need to generate a private access Token to perform operations such as git submit and so on. At this time, you will use username + private access Token in replace of username + password to submit codes.</p>
-<p>For detailed operations, please refer to <a href="https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line" target="_blank">Create a Private Token</a>.</p>
+<h2 class="title">如何提交代码</h2>
+<p>在启用 2FA 之后，您需要生成私有访问令牌（Private Access Token）来进行 Git 提交之类的操作。此时，您将使用用户名 + 令牌来提交代码，而不是原先的用户名 + 密码。</p>
+<p>具体操作细节，请参考 <a href="https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line" target="_blank">Create a Private Token</a>.</p>
</div>
\ No newline at end of file
diff --git a/content/contribute/contributor/index.zh.md b/content/contribute/contributor/index.zh.md
index 6c00dc6..b2bedfd 100644
--- a/content/contribute/contributor/index.zh.md
+++ b/content/contribute/contributor/index.zh.md
@@ -5,35 +5,35 @@ include_footer: true
---
<div>
- <p>Please fee free to report bugs, submit suggestions, or submit PRs according to this guide.</p>
+ <p>请按照这份指南，报告 bugs、提出建议或提交 PR，不必拘谨。</p>
<br />
- <h2 class="title">Submit an issue</h2>
- <p>1. Before submitting your issues, please go through a comprehensive search to make sure the problem cannot be solved just by searching.</p>
- <p>2. Check the <a href="https://github.com/apache/incubator-apisix/issues" target="_blank">Issue List</a> to make sure the problem is not repeated.</p>
- <p>3. Create a new issue and choose the type of issue.</p>
- <p>4. Define the issue with a clear and descriptive title.</p>
- <p>5. Fill in necessary information according to the template.</p>
- <p>6. Choose a label after issue created.</p>
- <p>7. Please pay attention to your issue, you may need provide more information during discussion.</p>
+ <h2 class="title">提交 Issue</h2>
+ <p>1. 在提交 Issue 之前，请充分利用搜索，确保问题无法通过搜索结果解决。</p>
+ <p>2. 检查 <a href="https://github.com/apache/incubator-apisix/issues" target="_blank">Issue 列表</a> 确保没有重复的问题</p>
+ <p>3. 创建一个新的 Issue 并选择恰当的 Issue 类型。</p>
+ <p>4. 用一个清晰准确的描述性标题来描述您的 Issue。</p>
+ <p>5. 根据模板，填写必要的信息。</p>
+ <p>6. 为您的 Issue 选择恰当的标签。</p>
+ <p>7. 请关注您的 Issue，您可能需要在讨论中提供更多的信息。</p>
<br />
- <h2 class="title">Developer Flow</h2>
+ <h2 class="title">开发者流程</h2>
<p></p>
- <h3 class="subtitle">Fork repo</h3>
- <p>Fork the Apache APISIX repo to your own repo to work, then setting proper upstream.</p>
+ <h3 class="subtitle">Fork 代码仓库</h3>
+ <p>请 Fork 一份 Apache APISIX 的代码仓库到您自己的仓库中，然后设定恰当的上游分支。</p>
<br />
{{< highlight go "linenos=table" >}}
git remote add upstream https://github.com/apache/incubator-apisix.git
{{< / highlight >}}
<br />
- <h3 class="subtitle">Choose an issue</h3>
+ <h3 class="subtitle">选择一个 Issue</h3>
<p></p>
- <p>1. Please choose your target issue. If it is a new issue discovered or a new function enhancement to offer, please create an issue and set the right label for it.</p>
- <p>2. After choosing the relevant issue, please reply with a deadline to indicate that you are working on it.</p>
- <p>3. Find a mentor from <a href="/team">the Team page</a> and your mentor will give you feedback about your PR or issue in time.</p>
+ <p>1. 请选择您的目标 Issue。如果您希望报告一个新发现的 Issue 或者一个新的功能增强，请先创建 Issue 并设定恰当的标签。</p>
+ <p>2. 在选择一个有价值的 Issue 之后，请回复一个截止时间来表明您正在尝试解决它。</p>
+ <p>3. 在 <a href="/team">团队页面</a> 选择一个导师，他将会及时对您的 Issue 和 PR 做出反馈。</p>
<br />
- <h3 class="subtitle">Create your branch</h3>
+ <h3 class="subtitle">创建您的分支</h3>
<p></p>
- <p>Switch to your forked master branch, pull codes from upstream, then create a new branch.</p>
+ <p>切换到您已经 fork 的 master 分支，从上游拉取代码，然后创建一个新的分支。</p>
<br />
{{< highlight go "linenos=table" >}}
$ git checkout master
@@ -41,12 +41,12 @@ include_footer: true
$ git checkout -b IssueNo
{{< / highlight >}}
<p></p>
- <p><strong>Notice:</strong> We will merge PR using squash, commit logs will be different form upstream if you use one older branch.</p>
+ <p><strong>注意：</strong> 我们将会使用 squash 合并 PR，较老的分支上的提交记录可能会与上游不同。</p>
<br />
<h3 class="subtitle">Coding</h3>
<p></p>
- <p>1. Please obey the Code of Conduct during the process of development and finish the check before submitting the pull request.</p>
- <p>2. Then push codes to your fork repo.</p>
+ <p>1. 请在开发过程中遵守行为准则，并在提交 Pull Request 之前完成检查。</p>
+ <p>2. 然后将您的代码推送到您 fork 的仓库中。</p>
<br />
{{< highlight go "linenos=table" >}}
$ git add modified-file-names
@@ -54,15 +54,15 @@ include_footer: true
$ git push origin issueNo
{{< / highlight >}}
<br />
- <h3 class="subtitle">Submit PR</h3>
+ <h3 class="subtitle">提交 PR</h3>
<p></p>
- <p>1. Send a pull request to the master branch.</p>
- <p>2. The mentor will do codes review before discussing some details (including the design, the implementation and the performance) with you.</p>
- <p>3. Then congratulate to you to be an official contributor of Apache APISIX.</p>
+ <p>1. 向 master 分支发送一个 pull request。</p>
+ <p>2. 导师会复查您的代码，并与您讨论一些细节问题，包括设计、实现、性能等。</p>
+ <p>3. 祝贺您成为 Apache APISIX 的一名正式贡献者。</p>
<br />
- <h3 class="subtitle">Delete branch</h3>
+ <h3 class="subtitle">删除分支</h3>
<p></p>
- <p>You can delete the remote branch (origin/IssueNo) and the local branch (IssueNo) associated with the remote branch (origin/IssueNo) after the mentor merged the PR into the master branch.</p>
+ <p>在导师将您的 PR 合并到 master 分支之后，您可以删除远程分支（origin/IssueNo）及与之关联的本地分支（IssueNo）。</p>
<br />
{{< highlight go "linenos=table" >}}
$ git checkout master
@@ -70,9 +70,9 @@ include_footer: true
$ git push origin --delete issueNo
{{< / highlight >}}
<br />
- <h3 class="subtitle">Notice</h3>
+ <h3 class="subtitle">提示</h3>
<p></p>
- <p>Please note that in order to show your ID in the contributor list, please DO NOT forget to set the configurations below:</p>
+ <p>请注意，为了让您的 ID 显示在贡献者列表中，请不要忘记进行下面的设置：</p>
<br />
{{< highlight go "linenos=table" >}}
$ git config --global user.name "username"
diff --git a/content/contribute/release/index.en.md b/content/contribute/release/index.en.md
index ae242ee..4bc920c 100644
--- a/content/contribute/release/index.en.md
+++ b/content/contribute/release/index.en.md
@@ -27,7 +27,7 @@ include_footer: true
<p>Follow the instructions to generate key：</p>
<p class="warning">Note: Please use Apache email address to generate the GPG Key.</p>
{{< highlight go "linenos=table" >}}
- {{% contribute/release/gpg-key-generator %}}
+ {{% contribute/release/gpg-key-generator-en %}}
{{< / highlight >}}
<h3 class="subtitle">View the generated key:</h3>
{{< highlight go "linenos=table" >}}
diff --git a/content/contribute/release/index.zh.md b/content/contribute/release/index.zh.md
index 58c62ce..6dd447e 100644
--- a/content/contribute/release/index.zh.md
+++ b/content/contribute/release/index.zh.md
@@ -27,7 +27,7 @@ include_footer: true
<p>根据提示完成key：</p>
<p class="warning">注意：请使用Apache mail生成GPG的Key。</p>
{{< highlight go "linenos=table" >}}
- {{% contribute/release/gpg-key-generator %}}
+ {{% contribute/release/gpg-key-generator-zh %}}
{{< / highlight >}}
<h3 class="subtitle">查看生成的key</h3>
{{< highlight go "linenos=table" >}}
diff --git a/content/contribute/security/index.zh.md b/content/contribute/security/index.zh.md
index 70a23e8..d4df836 100644
--- a/content/contribute/security/index.zh.md
+++ b/content/contribute/security/index.zh.md
@@ -5,9 +5,9 @@ include_footer: true
---
<div class="security">
- <p>The Apache Software Foundation takes a rigorous stance on eliminating security issues in its software projects. Apache APISIX is also very concerned Security issues related to its features and functionality.</p>
+ <p>Apache 软件基金会采取严格的立场来消除软件项目中的安全问题，Apache APISIX 同样非常重视与其特性和功能相关的安全问题。</p>
- <p>If you have apprehensions regarding APISIX’s security or you discover vulnerability or potential threat, don’t hesitate to get in touch with the Apache Security Team by dropping a mail at <a href="mailto:security@apache.org">security@apache.org</a>. Please specify the project name as APISIX and its product name APISIX or APISIX-Dashboard in the email and provide a description of the relevant problem or potential threat. You are also urged to recommend the way to reproduce and replic [...]
+ <p>如果您对 APISIX 的安全性感到担忧，或者发现了漏洞或潜在的威胁，请立即通过电子邮箱 <a href="mailto:security@apache.org">security@apache.org</a> 与 Apache 安全团队联系。请在邮件中指明项目名称 APISIX 及产品名称 APISIX 或 APISIX-Dashboard，并提供相关问题或潜在威胁的描述。我们建议您同时给出复现问题的方法。Apache 安全团队及 APISIX 社区将会在调查分析后与您联系。</p>
- <p>Please pay attention to report the security issue on the security email before disclosing it on public domain.</p>
+ <p>请您注意：在通过安全邮件报告安全问题前，请不要在公开场合披露相关问题。</p>
</div>
\ No newline at end of file
diff --git a/content/downloads/index.zh.md b/content/downloads/index.zh.md
index 413f78b..2fd198b 100644
--- a/content/downloads/index.zh.md
+++ b/content/downloads/index.zh.md
@@ -6,16 +6,15 @@ include_footer: true
<div class="downloads">
<section>
- <h2 class="title">Releases</h2>
+ <h2 class="title">发行版本</h2>
<p class="description">
- Apache APISIX is released as source code tarballs. The downloads are distributed via mirror sites and should be
- checked for tampering using GPG or SHA-512.
+ Apache APISIX 以源码包的形式发行，通过镜像站分发下载。为保证内容没有被篡改，需要使用 GPG 或 SHA-512 校验。
</p>
<div class="table-container" role="table" aria-label="Destinations">
<div class="flex-table header" role="rowgroup">
- <div class="flex-row first" role="columnheader">Version</div>
- <div class="flex-row" role="columnheader">Release date</div>
- <div class="flex-row" role="columnheader">Source download</div>
+ <div class="flex-row first" role="columnheader">版本</div>
+ <div class="flex-row" role="columnheader">发行时间</div>
+ <div class="flex-row" role="columnheader">源码下载</div>
</div>
<div class="flex-table row" role="rowgroup">
<div class="flex-row first" role="cell"><span class="flag-icon flag-icon-gb"></span>0.9</div>
@@ -128,13 +127,10 @@ include_footer: true
</div>
</section>
<section>
- <h2 class="title">Verify the releases</h2>
- <a href="https://www.apache.org/dist/incubator/apisix/KEYS">PGP signatures KEYS</a>
+ <h2 class="title">校验发行版本</h2>
+ <a href="https://www.apache.org/dist/incubator/apisix/KEYS">PGP 签名密钥</a>
<p>
- It is essential that you verify the integrity of the downloaded files using the PGP or SHA signatures. The PGP
- signatures can be verified using GPG or PGP. Please download the KEYS as well as the asc signature files for
- relevant distribution. It is recommended to get these files from the main distribution directory and not from the
- mirrors.
+ 使用 PGP 或 SHA 签名检验下载文件的完整性非常重要。PGP 签名可用 GPG 或 PGP 验证。请下载密钥以及对应版本的 acs 签名文件，我们建议您从主发布目录而不是镜像中获取这些文件。
</p>
{{< highlight go "linenos=table" >}}
@@ -142,7 +138,7 @@ include_footer: true
{{< / highlight >}}
<p>
- or
+ 或者
</p>
{{< highlight go "linenos=table,hl_lines=8 15-17,linenostart=1" >}}
@@ -150,7 +146,7 @@ include_footer: true
{{< / highlight >}}
<p>
- or
+ 或者
</p>
{{< highlight go "linenos=table,hl_lines=8 15-17,linenostart=1" >}}
@@ -158,8 +154,7 @@ include_footer: true
{{< / highlight >}}
<p>
- To verify the binaries/sources you can download the relevant asc files for it from main distribution directory and
- follow the below guide.
+ 要验证二进制文件或源代码，您可以从主发布目录下载相关的 asc 文件，并根据下面的指南操作。
</p>
{{< highlight go "linenos=table,hl_lines=8 15-17,linenostart=1" >}}
@@ -167,7 +162,7 @@ include_footer: true
{{< / highlight >}}
<p>
- or
+ 或者
</p>
{{< highlight go "linenos=table,hl_lines=8 15-17,linenostart=1" >}}
@@ -175,7 +170,7 @@ include_footer: true
{{< / highlight >}}
<p>
- or
+ 或者
</p>
{{< highlight go "linenos=table,hl_lines=8 15-17,linenostart=1" >}}
diff --git a/layouts/shortcodes/contribute/release/gpg-key-generator.html b/layouts/shortcodes/contribute/release/gpg-key-generator-en.html
similarity index 78%
copy from layouts/shortcodes/contribute/release/gpg-key-generator.html
copy to layouts/shortcodes/contribute/release/gpg-key-generator-en.html
index 292acc3..87ed2b2 100644
--- a/layouts/shortcodes/contribute/release/gpg-key-generator.html
+++ b/layouts/shortcodes/contribute/release/gpg-key-generator-en.html
@@ -23,11 +23,11 @@ Is this correct? (y/N) y
GnuPG needs to construct a user ID to identify your key.
-Real name: ${输入用户名}
-Email address: ${输入邮件地址}
-Comment: ${输入注释}
+Real name: ${Enter your username}
+Email address: ${Enter your email address}
+Comment: ${Enter comments}
You selected this USER-ID:
- "${输入的用户名} (${输入的注释}) <${输入的邮件地址}>"
+ "${Entered username} (${Entered comments}) <${Entered email address}>"
Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? O
-You need a Passphrase to protect your secret key. # 输入密码
\ No newline at end of file
+You need a Passphrase to protect your secret key. # Enter passphrase
\ No newline at end of file
diff --git a/layouts/shortcodes/contribute/release/gpg-key-generator.html b/layouts/shortcodes/contribute/release/gpg-key-generator-zh.html
similarity index 100%
rename from layouts/shortcodes/contribute/release/gpg-key-generator.html
rename to layouts/shortcodes/contribute/release/gpg-key-generator-zh.html