From 769bed9dbc8e115a54cc05dbf12c4b866dbcdf9f Mon Sep 17 00:00:00 2001
From: JimhHan <50871214+JimhHan@users.noreply.github.com>
Date: Sun, 7 Mar 2021 12:51:54 +0800
Subject: [PATCH] Update issue templates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: 惜别 <realsekibetu@gmail.com>
Co-Authored-By: R3pl4c3r <30682790+R3pl4c3r@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/bug-en.md         | 11 ++++++-----
 .github/ISSUE_TEMPLATE/bug-zh-CN.md      |  8 ++++----
 .github/ISSUE_TEMPLATE/feature-en.md     |  6 +++---
 .github/ISSUE_TEMPLATE/feature-zh-CN.md  |  4 ++--
 .github/ISSUE_TEMPLATE/question-en.md    |  6 +++---
 .github/ISSUE_TEMPLATE/question-zh-CN.md |  6 +++---
 6 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug-en.md b/.github/ISSUE_TEMPLATE/bug-en.md
index c2f0b00b..8402308e 100644
--- a/.github/ISSUE_TEMPLATE/bug-en.md
+++ b/.github/ISSUE_TEMPLATE/bug-en.md
@@ -8,11 +8,12 @@ assignees: ''
 ---
 
 <!-- Thanks for your reporting.
-1. Please make sure you are submitting a bug of Xray-core. If you are not sure, please give feedback in our telegram group.
-2. Please check existing issues and discussions first and read the documentation in detail. If you are submitting a known issue, it will be closed
-3. Please don't report issue like "I can't use a feature". It's probably your fault.
-4. You should fully complete the following contents.
-5. Make sure the content you are submitting does not contain your private information.
+1. Please make sure you are submitting a bug of Xray-Core instead of acquiring usage or bug in third-party programs. If you are not sure, please contact us in our official Telegram group.
+2. Bug: **An error, flaw or fault in a program ** that causes it to produce an incorrect or unexpected result. (Reference: Wikipedia)
+3. Please check existing Issues and Discussions first and read the documentation in detail. Duplicated issues will be closed.
+4. Please don't report issue like "I can't use a feature". It's probably your own mistake.
+5. You should fully complete the following contents or this issue may not be handled.
+6. Please *make sure* the content you are submitting does not contain your private information.
 -->
 
 
diff --git a/.github/ISSUE_TEMPLATE/bug-zh-CN.md b/.github/ISSUE_TEMPLATE/bug-zh-CN.md
index f3462ce4..6450f078 100644
--- a/.github/ISSUE_TEMPLATE/bug-zh-CN.md
+++ b/.github/ISSUE_TEMPLATE/bug-zh-CN.md
@@ -8,12 +8,12 @@ assignees: ''
 ---
 
 <!-- 感谢您的反馈!
-1. 请先确认您提交的是 Xray-Core 的 Bug,而非使用咨询。如果您不确定,请在群中反馈。
+1. 请先确认您提交的是 Xray-Core 的 Bug,而非使用咨询,抑或是第三方程序的 Bug。如果您不确定,请在 Telegram 群中反馈。
 2. Bug:软件运行中因为 **程序本身有错误** 而造成的功能不正常。(Reference: Wikipedia)
-3. 请先查询已有的 issue 与 discussion ,并且详细阅读文档的相关内容。如果您提出的是已知的问题,此 issue 将有可能被关闭。
-4. 请不要轻易提出类似“不能使用某功能”的问题。这往往是配置文件错误。
+3. 请先查询已有的 Issues 与 Discussions ,并且详细阅读文档的相关内容。如果您提出的是已知的问题,此 issue 将有可能被关闭。
+4. 请不要轻易提出类似“不能使用某功能”的问题。这往往是你自己的问题。
 5. 您需要完整地完成下列内容,否则此 issue 可能不会被处理。
-6. 请 *务必* 打码域名、密码和 Path 等隐私信息。
+6. 请 *务必* 确保不包含任何个人隐私信息。
 -->
 
 **问题描述**
diff --git a/.github/ISSUE_TEMPLATE/feature-en.md b/.github/ISSUE_TEMPLATE/feature-en.md
index caaa25ae..8814cd0c 100644
--- a/.github/ISSUE_TEMPLATE/feature-en.md
+++ b/.github/ISSUE_TEMPLATE/feature-en.md
@@ -8,9 +8,9 @@ assignees: ''
 ---
 
 <!-- Thanks for your supporting!
-1. Please confirm that you are submitting a feature request。
-2. We do not recommend any inexperienced users to request new feature. 
-3. Please check the existing issues, discussions and documentation in detail. Duplicated issue may be closed.
+1. Please confirm that you are submitting a feature request.
+2. We do not recommend any inexperienced users to request a new feature. 
+3. Please check existing Issues and Discussions first and read the documentation in detail. Duplicated issues will be closed
 4. To be clear: none of developers is obliged to meet your needs. In particular, features that do not make any sense.
 5. You should fully complete the following contents.
 -->
diff --git a/.github/ISSUE_TEMPLATE/feature-zh-CN.md b/.github/ISSUE_TEMPLATE/feature-zh-CN.md
index ef0be197..aa0c6d0b 100644
--- a/.github/ISSUE_TEMPLATE/feature-zh-CN.md
+++ b/.github/ISSUE_TEMPLATE/feature-zh-CN.md
@@ -9,8 +9,8 @@ assignees: ''
 
 <!-- 感谢您的反馈!
 1. 请先确认您提交的是功能请求。
-2. 我们不建议缺少经验的用户提出功能请求。如果您执意提出,请使用 tg 群组。
-3. 请先查询已有的 issue 与 discussion ,并且详细阅读文档的相关内容。重复的功能请求将有可能被关闭。
+2. 我们不建议缺少经验的用户提出功能请求。
+3. 请先查询已有的 Issues 与 Discussions ,并且详细阅读文档的相关内容。重复的 issue 将有可能被关闭。
 4. 需要向您明确一点:任何开发者均没有义务满足您的需求。特别是不合理或没有意义的功能。
 5. 您需要完整地完成下列内容,否则此 issue 可能不会被处理。
 -->
diff --git a/.github/ISSUE_TEMPLATE/question-en.md b/.github/ISSUE_TEMPLATE/question-en.md
index 535572c0..7848ecce 100644
--- a/.github/ISSUE_TEMPLATE/question-en.md
+++ b/.github/ISSUE_TEMPLATE/question-en.md
@@ -8,9 +8,9 @@ assignees: ''
 ---
 
 <!-- Thanks for your supporting!
-1. This isn't a proper place to aks question, otherwise your issue may be closed.
-2. Please check the existing issues, discussions and documentation in detail. You may find the answers you need there.
-3. If it is still not resolved, please give feedback in the tg group or discussion.
+1. Issue is **NOT** a proper place to ask a question, otherwise your issue may be closed.
+2. Please check existing Issues, Discussions and documentation in detail first. You may find the answers you want before you ask the question.
+3. If it is still not resolved, please give feedback in the our official Telegram group or Discussions.
 4. Wherever you ask a question, please *make sure* the content does not contain your private information.
 5. We highly recommend you to read https://github.com/tvvocold/How-To-Ask-Questions-The-Smart-Way.
 -->
diff --git a/.github/ISSUE_TEMPLATE/question-zh-CN.md b/.github/ISSUE_TEMPLATE/question-zh-CN.md
index 7ab07db0..a8dd89bc 100644
--- a/.github/ISSUE_TEMPLATE/question-zh-CN.md
+++ b/.github/ISSUE_TEMPLATE/question-zh-CN.md
@@ -8,10 +8,10 @@ assignees: ''
 ---
 
 <!-- 感谢您的支持!
-1. 我们十分理解您的急切之情。但是,这里**不是**用来提问的。
+1. Issue **不是**用来提问的, 否则将可能会被 close。
 2. 请先查询已有的 issue、discussion ,并且详细阅读文档的相关内容。那里可能有您需要的答案。
-3. 如果仍未解决,请在 tg 群中或 discussion 区反馈。请不要使用 Issue 反馈,否则将可能会被 close。
-4. 无论在何处提问,请 *务必* 打码域名、密码和 Path 等隐私信息。
+3. 如果仍未解决,请在官方 Telegram 群中或 Discussion 区反馈。
+4. 无论在何处提问,请 *务必确保* 其不包含任何个人隐私信息。
 5. 我们强烈推荐您阅读 https://github.com/tvvocold/How-To-Ask-Questions-The-Smart-Way。
 -->