Change the language name zh to zh_CN

5 files changed, 4 insertions, 198 deletions

diff --git a/app/assets/javascripts/locale/zh/app.js b/app/assets/javascripts/locale/zh/app.js
deleted file mode 100644
index 18b834ef32e..00000000000
--- a/app/assets/javascripts/locale/zh/app.js
+++ /dev/null
@@ -1,195 +0,0 @@
-var locales = locales || {};
-locales['zh'] = {
-    "domain": "app",
-    "locale_data": {
-        "app": {
-            "": {
-                "Project-Id-Version": "gitlab 1.0.0",
-                "Report-Msgid-Bugs-To": "",
-                "POT-Creation-Date": "2017-05-04 19:24-0500",
-                "PO-Revision-Date": "2017-05-04 19:24-0500",
-                "Last-Translator": "HuangTao <htve@outlook.com>, 2017",
-                "Language-Team": "Chinese (China) (https://www.transifex.com/gitlab-zh/teams/75177/zh_CN/)",
-                "MIME-Version": "1.0",
-                "Content-Type": "text/plain; charset=UTF-8",
-                "Content-Transfer-Encoding": "8bit",
-                "Language": "zh_CN",
-                "Plural-Forms": "nplurals=1; plural=0;",
-                "lang": "zh",
-                "domain": "app",
-                "plural_forms": "nplurals=1; plural=0;"
-            },
-            "ByAuthor|by": [
-                "作者:"
-            ],
-            "Commit": [
-                "提交"
-            ],
-            "Cycle Analytics gives an overview of how much time it takes to go from idea to production in your project.": [
-                "周期分析概述了项目从想法到产品实现的各阶段所需的时间。"
-            ],
-            "CycleAnalyticsStage|Code": [
-                "编码"
-            ],
-            "CycleAnalyticsStage|Issue": [
-                "议题"
-            ],
-            "CycleAnalyticsStage|Plan": [
-                "计划"
-            ],
-            "CycleAnalyticsStage|Production": [
-                "生产"
-            ],
-            "CycleAnalyticsStage|Review": [
-                "评审"
-            ],
-            "CycleAnalyticsStage|Staging": [
-                "预发布"
-            ],
-            "CycleAnalyticsStage|Test": [
-                "测试"
-            ],
-            "Deploy": [
-                "部署"
-            ],
-            "FirstPushedBy|First": [
-                "首个推送"
-            ],
-            "FirstPushedBy|pushed by": [
-                "推送者:"
-            ],
-            "From issue creation until deploy to production": [
-                "从创建议题到部署到生产环境"
-            ],
-            "From merge request merge until deploy to production": [
-                "从合并请求的合并到部署至生产环境"
-            ],
-            "Introducing Cycle Analytics": [
-                "周期分析简介"
-            ],
-            "Last %d day": [
-                "最后%d天"
-            ],
-            "Limited to showing %d event at most": [
-                "最多显示%d个事件"
-            ],
-            "Median": [
-                "平均数"
-            ],
-            "New Issue": [
-                "新议题"
-            ],
-            "Not available": [
-                "不可用"
-            ],
-            "Not enough data": [
-                "数据不足"
-            ],
-            "OpenedNDaysAgo|Opened": [
-                "开始于"
-            ],
-            "Pipeline Health": [
-                "流水线健康指标"
-            ],
-            "ProjectLifecycle|Stage": [
-                "项目生命周期"
-            ],
-            "Read more": [
-                "了解更多"
-            ],
-            "Related Commits": [
-                "相关的提交"
-            ],
-            "Related Deployed Jobs": [
-                "相关的部署作业"
-            ],
-            "Related Issues": [
-                "相关的议题"
-            ],
-            "Related Jobs": [
-                "相关的作业"
-            ],
-            "Related Merge Requests": [
-                "相关的合并请求"
-            ],
-            "Related Merged Requests": [
-                "相关已合并的合并请求"
-            ],
-            "Showing %d event": [
-                "显示%d个事件"
-            ],
-            "The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request.": [
-                "编码阶段概述了从第一次提交到创建合并请求的时间。创建第一个合并请求后，数据将自动添加到此处。"
-            ],
-            "The collection of events added to the data gathered for that stage.": [
-                "将收集的事件添加到该阶段的相关统计数据中。"
-            ],
-            "The issue stage shows the time it takes from creating an issue to assigning the issue to a milestone, or add the issue to a list on your Issue Board. Begin creating issues to see data for this stage.": [
-                "议题阶段概述了从创建议题到将议题分配给里程碑或将议题添加到议题看板列表中所需的时间。开始创建议题以查看此阶段的数据。"
-            ],
-            "The phase of the development lifecycle.": [
-                "项目生命周期中的各个阶段。"
-            ],
-            "The planning stage shows the time from the previous step to pushing your first commit. This time will be added automatically once you push your first commit.": [
-                "计划阶段概述了从议题到推送第一次提交的时间。当你第一次推送提交，数据将自动添加到此处。"
-            ],
-            "The production stage shows the total time it takes between creating an issue and deploying the code to production. The data will be automatically added once you have completed the full idea to production cycle.": [
-                "生产阶段概述了从创建议题到将代码部署到生产环境的时间。一旦完成完整的想法到部署生产，数据将自动添加到此处。"
-            ],
-            "The review stage shows the time from creating the merge request to merging it. The data will automatically be added after you merge your first merge request.": [
-                "评审阶段概述了从创建合并请求到合并的时间。在您合并第一个合并请求后，数据将自动添加到此处。"
-            ],
-            "The staging stage shows the time between merging the MR and deploying code to the production environment. The data will be automatically added once you deploy to production for the first time.": [
-                "预发布阶段概述了合并请求的合并到部署代码到生产环境的时间。首次部署到生产环境后，数据将自动添加到此处。"
-            ],
-            "The testing stage shows the time GitLab CI takes to run every pipeline for the related merge request. The data will automatically be added after your first pipeline finishes running.": [
-                "测试阶段概述了GitLab CI为相关合并请求运行每个流水线所需的时间。在您的第一个流水线完成运行后，数据将自动添加到此处。"
-            ],
-            "The time taken by each data entry gathered by that stage.": [
-                "由该阶段收集的每个数据条目所用的时间总和。"
-            ],
-            "The value lying at the midpoint of a series of observed values. E.g., between 3, 5, 9, the median is 5. Between 3, 5, 7, 8, the median is (5+7)/2 = 6.": [
-                "该值概述了一系列观察值的平均值。例如，在3、5、9之间，平均值是5。在3、5、7、8之间，平均值是（5 + 7）/ 2 = 6。"
-            ],
-            "Time before an issue gets scheduled": [
-                "创建议题之前的时间"
-            ],
-            "Time before an issue starts implementation": [
-                "从创建议题到开始编码的时间"
-            ],
-            "Time between merge request creation and merge/close": [
-                "从创建合并请求到合并或关闭合并请求的时间"
-            ],
-            "Time until first merge request": [
-                "创建第一个合并请求之前的时间"
-            ],
-            "Time|hr": [
-                "小时"
-            ],
-            "Time|min": [
-                "分钟"
-            ],
-            "Time|s": [
-                "秒"
-            ],
-            "Total Time": [
-                "总时间"
-            ],
-            "Total test time for all commits/merges": [
-                "所有提交和合并的总测试时间"
-            ],
-            "Want to see the data? Please ask an administrator for access.": [
-                "权限不足。如需查看相关数据，请向管理员申请权限。"
-            ],
-            "We don't have enough data to show this stage.": [
-                "我们没有足够的数据显示这个阶段。"
-            ],
-            "You need permission.": [
-                "您需要相关的权限。"
-            ],
-            "day": [
-                "天"
-            ]
-        }
-    }
-};
\ No newline at end of file
diff --git a/app/assets/javascripts/locale/zh_CN/app.js b/app/assets/javascripts/locale/zh_CN/app.js
new file mode 100644
index 00000000000..913235ead5d
--- /dev/null
+++ b/app/assets/javascripts/locale/zh_CN/app.js
@@ -0,0 +1 @@
+var locales = locales || {}; locales['zh_CN'] = {"domain":"app","locale_data":{"app":{"":{"Project-Id-Version":"gitlab 1.0.0","Report-Msgid-Bugs-To":"","POT-Creation-Date":"2017-05-04 19:24-0500","PO-Revision-Date":"2017-05-04 19:24-0500","Last-Translator":"HuangTao <htve@outlook.com>, 2017","Language-Team":"Chinese (China) (https://www.transifex.com/gitlab-zh/teams/75177/zh_CN/)","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Language":"zh_CN","Plural-Forms":"nplurals=1; plural=0;","lang":"zh_CN","domain":"app","plural_forms":"nplurals=1; plural=0;"},"ByAuthor|by":["作者:"],"Commit":["提交"],"Cycle Analytics gives an overview of how much time it takes to go from idea to production in your project.":["周期分析概述了项目从想法到产品实现的各阶段所需的时间。"],"CycleAnalyticsStage|Code":["编码"],"CycleAnalyticsStage|Issue":["议题"],"CycleAnalyticsStage|Plan":["计划"],"CycleAnalyticsStage|Production":["生产"],"CycleAnalyticsStage|Review":["评审"],"CycleAnalyticsStage|Staging":["预发布"],"CycleAnalyticsStage|Test":["测试"],"Deploy":["部署"],"FirstPushedBy|First":["首个推送"],"FirstPushedBy|pushed by":["推送者:"],"From issue creation until deploy to production":["从创建议题到部署到生产环境"],"From merge request merge until deploy to production":["从合并请求的合并到部署至生产环境"],"Introducing Cycle Analytics":["周期分析简介"],"Last %d day":["最后%d天"],"Limited to showing %d event at most":["最多显示%d个事件"],"Median":["中位数"],"New Issue":["新议题"],"Not available":["不可用"],"Not enough data":["数据不足"],"OpenedNDaysAgo|Opened":["开始于"],"Pipeline Health":["流水线健康指标"],"ProjectLifecycle|Stage":["项目生命周期"],"Read more":["了解更多"],"Related Commits":["相关的提交"],"Related Deployed Jobs":["相关的部署作业"],"Related Issues":["相关的议题"],"Related Jobs":["相关的作业"],"Related Merge Requests":["相关的合并请求"],"Related Merged Requests":["相关已合并的合并请求"],"Showing %d event":["显示%d个事件"],"The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request.":["编码阶段概述了从第一次提交到创建合并请求的时间。创建第一个合并请求后，数据将自动添加到此处。"],"The collection of events added to the data gathered for that stage.":["将收集的事件添加到该阶段的相关统计数据中。"],"The issue stage shows the time it takes from creating an issue to assigning the issue to a milestone, or add the issue to a list on your Issue Board. Begin creating issues to see data for this stage.":["议题阶段概述了从创建议题到将议题分配给里程碑或将议题添加到议题看板列表中所需的时间。开始创建议题以查看此阶段的数据。"],"The phase of the development lifecycle.":["项目生命周期中的各个阶段。"],"The planning stage shows the time from the previous step to pushing your first commit. This time will be added automatically once you push your first commit.":["计划阶段概述了从议题到推送第一次提交的时间。当你第一次推送提交，数据将自动添加到此处。"],"The production stage shows the total time it takes between creating an issue and deploying the code to production. The data will be automatically added once you have completed the full idea to production cycle.":["生产阶段概述了从创建议题到将代码部署到生产环境的时间。一旦完成完整的想法到部署生产，数据将自动添加到此处。"],"The review stage shows the time from creating the merge request to merging it. The data will automatically be added after you merge your first merge request.":["评审阶段概述了从创建合并请求到合并的时间。在您合并第一个合并请求后，数据将自动添加到此处。"],"The staging stage shows the time between merging the MR and deploying code to the production environment. The data will be automatically added once you deploy to production for the first time.":["预发布阶段概述了合并请求的合并到部署代码到生产环境的时间。首次部署到生产环境后，数据将自动添加到此处。"],"The testing stage shows the time GitLab CI takes to run every pipeline for the related merge request. The data will automatically be added after your first pipeline finishes running.":["测试阶段概述了GitLab CI为相关合并请求运行每个流水线所需的时间。在您的第一个流水线完成运行后，数据将自动添加到此处。"],"The time taken by each data entry gathered by that stage.":["由该阶段收集的每个数据条目所用的时间总和。"],"The value lying at the midpoint of a series of observed values. E.g., between 3, 5, 9, the median is 5. Between 3, 5, 7, 8, the median is (5+7)/2 = 6.":["该值概述了一系列观察值的中位数。例如，在3、5、9之间，中位数是5。在3、5、7、8之间，中位数是（5 + 7）/ 2 = 6。"],"Time before an issue gets scheduled":["创建议题之前的时间"],"Time before an issue starts implementation":["从创建议题到开始编码的时间"],"Time between merge request creation and merge/close":["从创建合并请求到合并或关闭合并请求的时间"],"Time until first merge request":["创建第一个合并请求之前的时间"],"Time|hr":["小时"],"Time|min":["分钟"],"Time|s":["秒"],"Total Time":["总时间"],"Total test time for all commits/merges":["所有提交和合并的总测试时间"],"Want to see the data? Please ask an administrator for access.":["权限不足。如需查看相关数据，请向管理员申请权限。"],"We don't have enough data to show this stage.":["我们没有足够的数据显示这个阶段。"],"You need permission.":["您需要相关的权限。"],"day":["天"]}}};
\ No newline at end of file
diff --git a/lib/gitlab/i18n.rb b/lib/gitlab/i18n.rb
index 347313d71b6..6fbbeb07fb2 100644
--- a/lib/gitlab/i18n.rb
+++ b/lib/gitlab/i18n.rb
@@ -6,7 +6,7 @@ module Gitlab
       'en' => 'English',
       'es' => 'Español',
       'de' => 'Deutsch',
-      'zh' => '简体中文'
+	  'zh_CN' => '简体中文'
     }.freeze
 
     def available_locales
diff --git a/locale/zh/gitlab.po b/locale/zh_CN/gitlab.po
index 72c9fe71d15..5fb8dbe5fdd 100644
--- a/locale/zh/gitlab.po
+++ b/locale/zh_CN/gitlab.po
@@ -79,7 +79,7 @@ msgid_plural "Limited to showing %d events at most"
 msgstr[0] "最多显示%d个事件"
 
 msgid "Median"
-msgstr "平均数"
+msgstr "中位数"
 
 msgid "New Issue"
 msgid_plural "New Issues"
@@ -180,7 +180,7 @@ msgid ""
 "The value lying at the midpoint of a series of observed values. E.g., "
 "between 3, 5, 9, the median is 5. Between 3, 5, 7, 8, the median is (5+7)/2 "
 "= 6."
-msgstr "该值概述了一系列观察值的平均值。例如，在3、5、9之间，平均值是5。在3、5、7、8之间，平均值是（5 + 7）/ 2 = 6。"
+msgstr "该值概述了一系列观察值的中位数。例如，在3、5、9之间，中位数是5。在3、5、7、8之间，中位数是（5 + 7）/ 2 = 6。"
 
 msgid "Time before an issue gets scheduled"
 msgstr "创建议题之前的时间"
diff --git a/locale/zh/gitlab.po.time_stamp b/locale/zh_CN/gitlab.po.time_stamp
index e69de29bb2d..e69de29bb2d 100644
--- a/locale/zh/gitlab.po.time_stamp
+++ b/locale/zh_CN/gitlab.po.time_stamp