From e41cc24d93813879dacf16a0effcdedc419f1280 Mon Sep 17 00:00:00 2001
From: andyhu <huyifan@vip.sina.com>
Date: Fri, 20 May 2016 14:48:46 +0800
Subject: [PATCH 1/2] Rename zh.json to zh_CN.json

This is for simplified Chinese so the correct locale should be zh_CN. For traditional Chinese it should be something like zh_HK or zh_TW.
---
 locales/{zh.json => zh_CN.json} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename locales/{zh.json => zh_CN.json} (100%)

diff --git a/locales/zh.json b/locales/zh_CN.json
similarity index 100%
rename from locales/zh.json
rename to locales/zh_CN.json

From 0f8faa79a4156a621dacedc2d2960daf3f4a4a49 Mon Sep 17 00:00:00 2001
From: Benjamin Coe <ben@npmjs.com>
Date: Tue, 31 May 2016 22:27:32 -0700
Subject: [PATCH 2/2] fix: keep both zh and zh_CN until yargs@5.x

---
 locales/zh.json | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 locales/zh.json

diff --git a/locales/zh.json b/locales/zh.json
new file mode 100644
index 000000000..b25c7b9d2
--- /dev/null
+++ b/locales/zh.json
@@ -0,0 +1,37 @@
+{
+  "Commands:": "命令：",
+  "Options:": "选项：",
+  "Examples:": "示例：",
+  "boolean": "布尔",
+  "count": "计数",
+  "string": "字符串",
+  "number": "数字",
+  "array": "数组",
+  "required": "必需",
+  "default:": "默认值:",
+  "choices:": "可选值:",
+  "generated-value": "生成的值",
+  "Not enough non-option arguments: got %s, need at least %s": "缺少 non-option 参数：传入了 %s 个, 至少需要 %s 个",
+  "Too many non-option arguments: got %s, maximum of %s": "non-option 参数过多：传入了 %s 个, 最大允许 %s 个",
+  "Missing argument value: %s": {
+    "one": "没有给此选项指定值：%s",
+    "other": "没有给这些选项指定值：%s"
+  },
+  "Missing required argument: %s": {
+    "one": "缺少必须的选项：%s",
+    "other": "缺少这些必须的选项：%s"
+  },
+  "Unknown argument: %s": {
+    "one": "无法识别的选项：%s",
+    "other": "无法识别这些选项：%s"
+  },
+  "Invalid values:": "无效的选项值：",
+  "Argument: %s, Given: %s, Choices: %s": "选项名称: %s, 传入的值: %s, 可选的值：%s",
+  "Argument check failed: %s": "选项值验证失败：%s",
+  "Implications failed:": "缺少依赖的选项：",
+  "Not enough arguments following: %s": "没有提供足够的值给此选项：%s",
+  "Invalid JSON config file: %s": "无效的 JSON 配置文件：%s",
+  "Path to JSON config file": "JSON 配置文件的路径",
+  "Show help": "显示帮助信息",
+  "Show version number": "显示版本号"
+}