导入上一版本 8.5 汉化v8.6.0.zh0

Signed-off-by: Larry Li <larryli@qq.com>

27 files changed, 115 insertions, 113 deletions

diff --git a/app/views/projects/merge_requests/_head.html.haml b/app/views/projects/merge_requests/_head.html.haml
index 19e4dab874b..e18af67b683 100644
--- a/app/views/projects/merge_requests/_head.html.haml
+++ b/app/views/projects/merge_requests/_head.html.haml
@@ -1,5 +1,5 @@
 .top-tabs
   = link_to namespace_project_merge_requests_path(@project.namespace, @project), class: "tab #{'active' if current_page?(namespace_project_merge_requests_path(@project.namespace, @project)) }" do
     %span
-    Merge Requests
+    合并请求
 
diff --git a/app/views/projects/merge_requests/_header_title.html.haml b/app/views/projects/merge_requests/_header_title.html.haml
index 669a9b06bdf..2397ed6bd2d 100644
--- a/app/views/projects/merge_requests/_header_title.html.haml
+++ b/app/views/projects/merge_requests/_header_title.html.haml
@@ -1 +1 @@
-- header_title project_title(@project, "Merge Requests", namespace_project_merge_requests_path(@project.namespace, @project))
+- header_title project_title(@project, "合并请求", namespace_project_merge_requests_path(@project.namespace, @project))
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index 18cf3f14f0b..bcfec88c3a6 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -5,11 +5,11 @@
     %ul.controls.light
       - if merge_request.merged?
         %li
-          MERGED
+          已合并
       - elsif merge_request.closed?
         %li
           = icon('ban')
-          CLOSED
+          已关闭
 
       - if merge_request.ci_commit
         %li
@@ -17,12 +17,12 @@
 
       - if merge_request.open? && merge_request.broken?
         %li
-          = link_to merge_request_path(merge_request), class: "has_tooltip", title: "Cannot be merged automatically", data: { container: 'body' } do
+          = link_to merge_request_path(merge_request), class: "has_tooltip", title: "无法被自动合并", data: { container: 'body' } do
             = icon('exclamation-triangle')
 
       - if merge_request.assignee
         %li
-          = link_to_member(merge_request.source_project, merge_request.assignee, name: false, title: "Assigned to :name")
+          = link_to_member(merge_request.source_project, merge_request.assignee, name: false, title: "指派给 :name")
 
       - upvotes, downvotes = merge_request.upvotes, merge_request.downvotes
       - if upvotes > 0
@@ -71,4 +71,4 @@
         = merge_request.task_status
 
     .pull-right.hidden-xs
-      %span updated #{time_ago_with_tooltip(merge_request.updated_at, placement: 'bottom', html_class: 'merge_request_updated_ago')}
+      %span #{time_ago_with_tooltip(merge_request.updated_at, placement: 'bottom', html_class: 'merge_request_updated_ago')}更新
diff --git a/app/views/projects/merge_requests/_merge_requests.html.haml b/app/views/projects/merge_requests/_merge_requests.html.haml
index 5473fa19166..5c1f5484976 100644
--- a/app/views/projects/merge_requests/_merge_requests.html.haml
+++ b/app/views/projects/merge_requests/_merge_requests.html.haml
@@ -2,7 +2,7 @@
   = render @merge_requests
   - if @merge_requests.blank?
     %li
-      .nothing-here-block No merge requests to show
+      .nothing-here-block 没有合并请求
 
 - if @merge_requests.present?
   = paginate @merge_requests, theme: "gitlab"
diff --git a/app/views/projects/merge_requests/_new_compare.html.haml b/app/views/projects/merge_requests/_new_compare.html.haml
index 01dc7519bee..74572b9b370 100644
--- a/app/views/projects/merge_requests/_new_compare.html.haml
+++ b/app/views/projects/merge_requests/_new_compare.html.haml
@@ -1,5 +1,5 @@
 %h3.page-title
-  New Merge Request
+  新合并请求
 
 = form_for [@project.namespace.becomes(Namespace), @project, @merge_request], url: new_namespace_project_merge_request_path(@project.namespace, @project), method: :get, html: { class: "merge-request-form form-inline js-requires-input" } do |f|
   .hide.alert.alert-danger.mr-compare-errors
@@ -7,23 +7,23 @@
     .col-md-6
       .panel.panel-default
         .panel-heading
-          %strong Source branch
+          %strong 来源分支
         .panel-body
           = f.select(:source_project_id, [[@merge_request.source_project_path,@merge_request.source_project.id]] , {}, { class: 'source_project select2 span3', disabled: @merge_request.persisted?, required: true })
            
-          = f.select(:source_branch, @merge_request.source_branches, { include_blank: true }, { class: 'source_branch select2 span2', required: true, data: { placeholder: "Select source branch" } })
+          = f.select(:source_branch, @merge_request.source_branches, { include_blank: true }, { class: 'source_branch select2 span2', required: true, data: { placeholder: "选择来源分支" } })
         .panel-footer
           .mr_source_commit
 
     .col-md-6
       .panel.panel-default
         .panel-heading
-          %strong Target branch
+          %strong 目标分支
         .panel-body
           - projects =  @project.forked_from_project.nil? ? [@project] : [@project, @project.forked_from_project]
           = f.select(:target_project_id, options_from_collection_for_select(projects, 'id', 'path_with_namespace', f.object.target_project_id), {}, { class: 'target_project select2 span3', disabled: @merge_request.persisted?, required: true })
            
-          = f.select(:target_branch, @merge_request.target_branches, { include_blank: true }, { class: 'target_branch select2 span2', required: true, data: { placeholder: "Select target branch" } })
+          = f.select(:target_branch, @merge_request.target_branches, { include_blank: true }, { class: 'target_branch select2 span2', required: true, data: { placeholder: "选择目标分支" } })
         .panel-footer
           .mr_target_commit
 
@@ -76,7 +76,7 @@
 :javascript
   $(".merge-request-form").on('submit', function () {
     if ($("#merge_request_source_branch").val() === "" || $('#merge_request_target_branch').val() === "") {
-      $(".mr-compare-errors").html("You must select source and target branch to proceed");
+      $(".mr-compare-errors").html("必须选择来源和目标分支去处理");
       $(".mr-compare-errors").fadeIn();
       event.preventDefault();
       return;
diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml
index 9e59f7df71b..4fad7e9f6fd 100644
--- a/app/views/projects/merge_requests/_new_submit.html.haml
+++ b/app/views/projects/merge_requests/_new_submit.html.haml
@@ -1,14 +1,14 @@
 %h3.page-title
-  New Merge Request
+  新合并请求
 %p.slead
   - source_title, target_title = format_mr_branch_names(@merge_request)
-  From
+  从
   %strong.label-branch #{source_title}
-  %span into
+  %span 合并到
   %strong.label-branch #{target_title}
 
   %span.pull-right
-    = link_to 'Change branches', mr_change_branches_path(@merge_request)
+    = link_to '改变分支', mr_change_branches_path(@merge_request)
 %hr
 = form_for [@project.namespace.becomes(Namespace), @project, @merge_request], html: { class: 'merge-request-form form-horizontal gfm-form js-requires-input' } do |f|
   = render 'shared/issuable/form', f: f, issuable: @merge_request
diff --git a/app/views/projects/merge_requests/edit.html.haml b/app/views/projects/merge_requests/edit.html.haml
index fc62bb5bce9..5377cc65836 100644
--- a/app/views/projects/merge_requests/edit.html.haml
+++ b/app/views/projects/merge_requests/edit.html.haml
@@ -1,7 +1,7 @@
-- page_title "Edit", "#{@merge_request.title} (##{@merge_request.iid})", "Merge Requests"
+- page_title "编辑", "#{@merge_request.title} (##{@merge_request.iid})", "合并请求"
 = render "header_title"
 
 %h3.page-title
-  Edit Merge Request ##{@merge_request.iid}
+  编辑合并请求 ##{@merge_request.iid}
 %hr
 = render 'form'
diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml
index e56a44e0a79..c4bff00892f 100644
--- a/app/views/projects/merge_requests/index.html.haml
+++ b/app/views/projects/merge_requests/index.html.haml
@@ -1,4 +1,4 @@
-- page_title "Merge Requests"
+- page_title "合并请求"
 = render "header_title"
 
 = render 'projects/last_push'
@@ -10,9 +10,9 @@
 
     - merge_project = can?(current_user, :create_merge_request, @project) ? @project : (current_user && current_user.fork_of(@project))
     - if merge_project
-      = link_to new_namespace_project_merge_request_path(merge_project.namespace, merge_project), class: "btn btn-new", title: "New Merge Request" do
+      = link_to new_namespace_project_merge_request_path(merge_project.namespace, merge_project), class: "btn btn-new", title: "新合并请求" do
         = icon('plus')
-        New Merge Request
+        新合并请求
 
 = render 'shared/issuable/filter', type: :merge_requests
 
diff --git a/app/views/projects/merge_requests/invalid.html.haml b/app/views/projects/merge_requests/invalid.html.haml
index fc03ee73a3d..a9cf26c83d5 100644
--- a/app/views/projects/merge_requests/invalid.html.haml
+++ b/app/views/projects/merge_requests/invalid.html.haml
@@ -1,4 +1,4 @@
-- page_title "#{@merge_request.title} (##{@merge_request.iid})", "Merge Requests"
+- page_title "#{@merge_request.title} (##{@merge_request.iid})", "合并请求"
 = render "header_title"
 
 .merge-request
@@ -7,20 +7,20 @@
 
   .alert.alert-danger
     %p
-      We cannot render this merge request properly because
+      我们不能展示此合并请求，是因为
       - if @merge_request.for_fork? && !@merge_request.source_project
-        fork project was removed
+        派生项目被删除
       - elsif !@merge_request.source_branch_exists?
-        %span.label.label-inverse= @merge_request.source_branch
-        does not exist in
         %span.label.label-info= @merge_request.source_project_path
+        中不存在
+        %span.label.label-inverse= @merge_request.source_branch
       - elsif !@merge_request.target_branch_exists?
-        %span.label.label-inverse= @merge_request.target_branch
-        does not exist in
         %span.label.label-info= @merge_request.target_project_path
+        中不存在
+        %span.label.label-inverse= @merge_request.target_branch
       - else
-        of internal error
+        存在内部错误
 
     %strong
-      Please close Merge Request or change branches with existing one
+      请关闭此合并请求或者修改为存在的分支
 
diff --git a/app/views/projects/merge_requests/new.html.haml b/app/views/projects/merge_requests/new.html.haml
index d259968030e..a7973637078 100644
--- a/app/views/projects/merge_requests/new.html.haml
+++ b/app/views/projects/merge_requests/new.html.haml
@@ -1,4 +1,4 @@
-- page_title "New Merge Request"
+- page_title "新合并请求"
 = render "header_title"
 
 - if @merge_request.can_be_created && !params[:change_branches]
diff --git a/app/views/projects/merge_requests/show/_commits.html.haml b/app/views/projects/merge_requests/show/_commits.html.haml
index a8f09f855d4..5c73c53045a 100644
--- a/app/views/projects/merge_requests/show/_commits.html.haml
+++ b/app/views/projects/merge_requests/show/_commits.html.haml
@@ -1,5 +1,5 @@
 .content-block.oneline-block
   = icon("sort-amount-desc")
-  Most recent commits displayed first
+  首先显示最近提交
 
 = render "projects/commits/commits", project: @merge_request.project
diff --git a/app/views/projects/merge_requests/show/_how_to_merge.html.haml b/app/views/projects/merge_requests/show/_how_to_merge.html.haml
index 0dbd159298e..ce5adf837b4 100644
--- a/app/views/projects/merge_requests/show/_how_to_merge.html.haml
+++ b/app/views/projects/merge_requests/show/_how_to_merge.html.haml
@@ -3,11 +3,11 @@
     .modal-content
       .modal-header
         %a.close{href: "#", "data-dismiss" => "modal"} ×
-        %h3 Check out, review, and merge locally
+        %h3 检出，在本地审查和合并
       .modal-body
         %p
-          %strong Step 1.
-          Fetch and check out the branch for this merge request
+          %strong 第 1 步.
+          获取并检出此合并请求的分支
         = clipboard_button(clipboard_target: 'pre#merge-info-1')
         %pre.dark#merge-info-1
           - if @merge_request.for_fork?
@@ -19,12 +19,12 @@
               git fetch origin
               git checkout -b #{h @merge_request.source_branch} origin/#{h @merge_request.source_branch}
         %p
-          %strong Step 2.
-          Review the changes locally
+          %strong 第 2 步.
+          本地审查变更
 
         %p
-          %strong Step 3.
-          Merge the branch and fix any conflicts that come up
+          %strong 第 3 步.
+          合并分支并修复出现的任何冲突
         = clipboard_button(clipboard_target: 'pre#merge-info-3')
         %pre.dark#merge-info-3
           - if @merge_request.for_fork?
@@ -36,19 +36,20 @@
               git checkout #{h @merge_request.target_branch}
               git merge --no-ff #{h @merge_request.source_branch}
         %p
-          %strong Step 4.
-          Push the result of the merge to GitLab
+          %strong 第 4 步.
+          推送合并的结果到 GitLab
         = clipboard_button(clipboard_target: 'pre#merge-info-4')
         %pre.dark#merge-info-4
           :preserve
             git push origin #{h @merge_request.target_branch}
         - unless @merge_request.can_be_merged_by?(current_user)
           %p
-            Note that pushing to GitLab requires write access to this repository.
+            请注意推送到 GitLab 需要有此仓库的写权限。
         %p
-          %strong Tip:
-          You can also checkout merge requests locally by
-          %a{href: 'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/workflow/merge_requests.md#checkout-merge-requests-locally', target: '_blank'} following these guidelines
+          %strong 提示：
+          你可以使用
+          %a{href: 'https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/workflow/merge_requests.md#checkout-merge-requests-locally', target: '_blank'} 此指南
+          在本地检出合并请求
 
 :javascript
   $(function(){
diff --git a/app/views/projects/merge_requests/widget/_closed.html.haml b/app/views/projects/merge_requests/widget/_closed.html.haml
index f3cc0e7e8a1..9d399d1c932 100644
--- a/app/views/projects/merge_requests/widget/_closed.html.haml
+++ b/app/views/projects/merge_requests/widget/_closed.html.haml
@@ -2,11 +2,11 @@
   = render 'projects/merge_requests/widget/heading'
   .mr-widget-body
     %h4
-      Closed
+      已关闭
       - if @merge_request.closed_event
-        by #{link_to_member(@project, @merge_request.closed_event.author, avatar: true)}
+        由 #{link_to_member(@project, @merge_request.closed_event.author, avatar: true)}
         #{time_ago_with_tooltip(@merge_request.closed_event.created_at)}
     %p 
-      = succeed '.' do
-        The changes were not merged into
+      = succeed '。' do
+        变更未合并到
         %span.label-branch= @merge_request.target_branch
diff --git a/app/views/projects/merge_requests/widget/_heading.html.haml b/app/views/projects/merge_requests/widget/_heading.html.haml
index b05ab869215..355150e812b 100644
--- a/app/views/projects/merge_requests/widget/_heading.html.haml
+++ b/app/views/projects/merge_requests/widget/_heading.html.haml
@@ -3,13 +3,13 @@
     .ci_widget{class: "ci-#{@ci_commit.status}"}
       = ci_status_icon(@ci_commit)
       %span
-        Build
+        构建
         = ci_status_label(@ci_commit)
-      for
-      = succeed "." do
+      ：
+      = succeed "。" do
         = link_to @ci_commit.short_sha, namespace_project_commit_path(@merge_request.source_project.namespace, @merge_request.source_project, @ci_commit.sha), class: "monospace"
       %span.ci-coverage
-      = link_to "View details", builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "js-show-tab", data: {action: 'builds'}
+      = link_to "查看构建明细", builds_namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: "js-show-tab", data: {action: 'builds'}
 
 - elsif @merge_request.has_ci?
   - # Compatibility with old CI integrations (ex jenkins) when you request status from CI server via AJAX
@@ -19,27 +19,27 @@
       .ci_widget{class: "ci-#{status}", style: "display:none"}
         = ci_icon_for_status(status)
         %span
-          CI build
+          CI 构建
           = ci_label_for_status(status)
-        for
+        ：
         - commit = @merge_request.last_commit
-        = succeed "." do
+        = succeed "。" do
           = link_to commit.short_id, namespace_project_commit_path(@merge_request.source_project.namespace, @merge_request.source_project, commit), class: "monospace"
         %span.ci-coverage
         - if details_path = ci_build_details_path(@merge_request)
-          = link_to "View details", details_path, :"data-no-turbolink" => "data-no-turbolink"
+          = link_to "查看明细", details_path, :"data-no-turbolink" => "data-no-turbolink"
 
     .ci_widget
       = icon("spinner spin")
-      Checking CI status for #{@merge_request.last_commit_short_sha}…
+      正在检查 #{@merge_request.last_commit_short_sha} 的构建状态…
 
     .ci_widget.ci-not_found{style: "display:none"}
       = icon("times-circle")
-      Could not find CI status for #{@merge_request.last_commit_short_sha}.
+      在 CI 服务器上无法找到 #{@merge_request.last_commit_short_sha} 的提交。
 
     .ci_widget.ci-error{style: "display:none"}
       = icon("times-circle")
-      Could not connect to the CI server. Please check your settings and try again.
+      无法连接到 CI 服务器。请检查相关设置并重试。
 
   :javascript
     $(function() {
diff --git a/app/views/projects/merge_requests/widget/_locked.html.haml b/app/views/projects/merge_requests/widget/_locked.html.haml
index 78d0783cba0..8afbe93f4ae 100644
--- a/app/views/projects/merge_requests/widget/_locked.html.haml
+++ b/app/views/projects/merge_requests/widget/_locked.html.haml
@@ -3,7 +3,7 @@
   .mr-widget-body
     %h4
       = icon("spinner spin")
-      Merge in progress…
+      正在合并…
     %p
-      This merge request is in the process of being merged, during which time it is locked and cannot be closed.
+      正在合并中。合并时此请求被锁定且不能被关闭。
 
diff --git a/app/views/projects/merge_requests/widget/_merged.html.haml b/app/views/projects/merge_requests/widget/_merged.html.haml
index 3abae9f0bf6..b137fe11831 100644
--- a/app/views/projects/merge_requests/widget/_merged.html.haml
+++ b/app/views/projects/merge_requests/widget/_merged.html.haml
@@ -2,32 +2,32 @@
   = render 'projects/merge_requests/widget/heading'
   .mr-widget-body
     %h4
-      Merged
+      已合并
       - if @merge_request.merge_event
-        by #{link_to_member(@project, @merge_request.merge_event.author, avatar: true)}
+        提交者：#{link_to_member(@project, @merge_request.merge_event.author, avatar: true)}
         #{time_ago_with_tooltip(@merge_request.merge_event.created_at)}
     %div
       - if !@merge_request.source_branch_exists? || (params[:delete_source] == 'true')
         %p
-          The changes were merged into
-          #{link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch"}.
-          The source branch has been removed.
+          变更已合并到
+          #{link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch"}，
+          来源分支已被删除。
         = render 'projects/merge_requests/widget/merged_buttons'
       - elsif @merge_request.can_remove_source_branch?(current_user)
         .remove_source_branch_widget
           %p
-            The changes were merged into
-            #{link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch"}.
-            You can remove the source branch now.
+            变更已合并到
+            #{link_to @merge_request.target_branch, namespace_project_commits_path(@project.namespace, @project, @merge_request.target_branch), class: "label-branch"}，
+            你现在可以删除来源分支。
           = render 'projects/merge_requests/widget/merged_buttons', source_branch_exists: true
         .remove_source_branch_widget.failed.hide
           %p
-            Failed to remove source branch '#{@merge_request.source_branch}'.
+            删除来源分支 '#{@merge_request.source_branch}' 失败。
 
         .remove_source_branch_in_progress.hide
           %p
             = icon('spinner spin')
-            Removing source branch '#{@merge_request.source_branch}'. Please wait, this page will be automatically reloaded.
+            正在删除来源分支 '#{@merge_request.source_branch}'。请稍候，页面将会被自动重载。
 
         :javascript
           $('.remove_source_branch').on('click', function() {
diff --git a/app/views/projects/merge_requests/widget/_merged_buttons.haml b/app/views/projects/merge_requests/widget/_merged_buttons.haml
index 85a3a6ba9e2..586aa2a167e 100644
--- a/app/views/projects/merge_requests/widget/_merged_buttons.haml
+++ b/app/views/projects/merge_requests/widget/_merged_buttons.haml
@@ -6,6 +6,6 @@
     - if source_branch_exists
       = link_to namespace_project_branch_path(@merge_request.source_project.namespace, @merge_request.source_project, @merge_request.source_branch), remote: true, method: :delete, class: "btn btn-default btn-grouped btn-sm remove_source_branch" do
         = icon('trash-o')
-        Remove Source Branch
+        删除来源分支
     - if mr_can_be_reverted
       = revert_commit_link(@merge_request.merge_commit, namespace_project_merge_request_path(@project.namespace, @project, @merge_request), btn_class: 'sm')
diff --git a/app/views/projects/merge_requests/widget/_open.html.haml b/app/views/projects/merge_requests/widget/_open.html.haml
index 55dbae598d3..07986141e68 100644
--- a/app/views/projects/merge_requests/widget/_open.html.haml
+++ b/app/views/projects/merge_requests/widget/_open.html.haml
@@ -24,6 +24,6 @@
     .mr-widget-footer
       %span
         %i.fa.fa-check
-        Accepting this merge request will close #{"issue".pluralize(@closes_issues.size)}
-        = succeed '.' do
+        正在接受此合并请求并将关闭 #{"个问题".pluralize(@closes_issues.size)}
+        = succeed '。' do
           != markdown issues_sentence(@closes_issues), pipeline: :gfm
diff --git a/app/views/projects/merge_requests/widget/open/_accept.html.haml b/app/views/projects/merge_requests/widget/open/_accept.html.haml
index 807833741af..3a87e98db45 100644
--- a/app/views/projects/merge_requests/widget/open/_accept.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_accept.html.haml
@@ -8,32 +8,32 @@
         - if @ci_commit && @ci_commit.active?
           %span.btn-group
             = button_tag class: "btn btn-create js-merge-button merge_when_build_succeeds" do
-              Merge When Build Succeeds
+              构建成功时合并
             = button_tag class: "btn btn-success dropdown-toggle", 'data-toggle' => 'dropdown' do
               %span.caret
               %span.sr-only
-                Select Merge Moment
+                选择合并瞬间
             %ul.js-merge-dropdown.dropdown-menu.dropdown-menu-right{ role: 'menu' }
               %li
                 = link_to "#", class: "merge_when_build_succeeds" do
                   = icon('check fw')
-                  Merge When Build Succeeds
+                  构建成功时合并
               %li
                 = link_to "#", class: "accept_merge_request" do
                   = icon('warning fw')
-                  Merge Immediately
+                  立即合并
         - else
           = f.button class: "btn btn-create btn-grouped js-merge-button accept_merge_request #{status_class}" do
-            Accept Merge Request
+            接受合并请求
       - if @merge_request.can_remove_source_branch?(current_user)
         .accept-control.checkbox
           = label_tag :should_remove_source_branch, class: "remove_source_checkbox" do
             = check_box_tag :should_remove_source_branch
-            Remove source branch
+            删除来源分支
       .accept-control.right
         = link_to "#", class: "modify-merge-commit-link js-toggle-button" do
           = icon('edit')
-          Modify commit message
+          修改提交信息
     .js-toggle-content.hide.prepend-top-default
       = render 'shared/commit_message_container', params: params,
           text: @merge_request.merge_commit_message,
@@ -47,7 +47,7 @@
     });
 
     $('.accept_merge_request').on('click', function() {
-      $('.js-merge-button').html("<i class='fa fa-spinner fa-spin'></i> Merge in progress");
+      $('.js-merge-button').html("<i class='fa fa-spinner fa-spin'></i> 正在合并");
     });
 
     $('.merge_when_build_succeeds').on('click', function() {
diff --git a/app/views/projects/merge_requests/widget/open/_archived.html.haml b/app/views/projects/merge_requests/widget/open/_archived.html.haml
index ab30fa6b243..21e6086f9ae 100644
--- a/app/views/projects/merge_requests/widget/open/_archived.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_archived.html.haml
@@ -1,4 +1,4 @@
 %h4 
-  Project is archived
+  项目已归档。
 %p
-  This merge request cannot be merged because archived projects cannot be written to.
+  此合并请求无法被合并，因为已归档的项目无法写入。
diff --git a/app/views/projects/merge_requests/widget/open/_check.html.haml b/app/views/projects/merge_requests/widget/open/_check.html.haml
index e16878ba513..c86ebe086b6 100644
--- a/app/views/projects/merge_requests/widget/open/_check.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_check.html.haml
@@ -1,6 +1,6 @@
 %strong
   = icon("spinner spin")
-  Checking ability to merge automatically&hellip;
+  正在检查自动合并&hellip;
 
 :javascript
   $(function() {
diff --git a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml
index e6c089fefb2..38e47ee0bf6 100644
--- a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml
@@ -1,10 +1,10 @@
 %h4
   = icon("exclamation-triangle")
-  This merge request contains merge conflicts
+  此合并请求包含有合并冲突
 
 %p
-  Please resolve these conflicts or 
+  请解决这些冲突或
   - if @merge_request.can_be_merged_by?(current_user)
-    #{link_to "merge this request manually", "#modal_merge_info", class: "how_to_merge_link vlink", "data-toggle" => "modal"}.
+    #{link_to "手工合并此请求", "#modal_merge_info", class: "how_to_merge_link vlink", "data-toggle" => "modal"}.
   - else
-    ask someone with write access to this repository to merge this request manually.
+    询问具有此仓库写权限的成员来手工合并此请求。
diff --git a/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml b/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml
index 2168294c683..cd0bae04cd8 100644
--- a/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml
@@ -1,16 +1,16 @@
 %h4
-  Set by #{link_to_member(@project, @merge_request.merge_user, avatar: true)}
-  to be merged automatically when the build succeeds.
+  #{link_to_member(@project, @merge_request.merge_user, avatar: true)} 设置了
+  构建成功时自动合并。
 %div
   - should_remove_source_branch = @merge_request.merge_params["should_remove_source_branch"].present?
   %p
-    = succeed '.' do
-      The changes will be merged into
+    = succeed '。' do
+      变更将被合并到
       %span.label-branch= @merge_request.target_branch
     - if should_remove_source_branch
-      The source branch will be removed.
+      来源分支将被删除。
     - else
-      The source branch will not be removed.
+      来源分支将不会删除。
 
   - remove_source_branch_button = @merge_request.can_remove_source_branch?(current_user) && !should_remove_source_branch && @merge_request.merge_user == current_user
   - user_can_cancel_automatic_merge = @merge_request.can_cancel_merge_when_build_succeeds?(current_user)
@@ -19,8 +19,8 @@
       - if remove_source_branch_button
         = link_to merge_namespace_project_merge_request_path(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request, merge_when_build_succeeds: true, should_remove_source_branch: true), remote: true, method: :post, class: "btn btn-grouped btn-primary btn-sm remove_source_branch" do
           = icon('times')
-          Remove Source Branch When Merged
+          合并时删除来源分支
 
       - if user_can_cancel_automatic_merge
         = link_to cancel_merge_when_build_succeeds_namespace_project_merge_request_path(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request), remote: true, method: :post, class: "btn btn-grouped btn-warning btn-sm" do
-          Cancel Automatic Merge
+          取消自动合并
diff --git a/app/views/projects/merge_requests/widget/open/_missing_branch.html.haml b/app/views/projects/merge_requests/widget/open/_missing_branch.html.haml
index c9f07629493..fd2aa3aa0c0 100644
--- a/app/views/projects/merge_requests/widget/open/_missing_branch.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_missing_branch.html.haml
@@ -1,16 +1,16 @@
 - unless @merge_request.source_branch_exists?
   %h4
     = icon("exclamation-triangle")
-    Source branch
+    来源分支
     %span.label-branch= source_branch_with_namespace(@merge_request)
-    does not exist
+    不存在
   %p
-    Please restore the source branch or close this merge request and open a new merge request with a different source branch.
+    请恢复来源分支或关闭此合并请求并使用其他的来源分支开启新的合并请求。
 - else
   %h4
     = icon("exclamation-triangle")
-    Target branch
+    目标分支
     %span.label-branch= @merge_request.target_branch
-    does not exist
+    不存在
   %p
-    Please restore the target branch or use a different target branch.
+    请恢复目标分支或者使用其他的目标分支。
diff --git a/app/views/projects/merge_requests/widget/open/_not_allowed.html.haml b/app/views/projects/merge_requests/widget/open/_not_allowed.html.haml
index a8145558ca8..cbbd959ebb2 100644
--- a/app/views/projects/merge_requests/widget/open/_not_allowed.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_not_allowed.html.haml
@@ -1,4 +1,4 @@
 %h4 
-  Ready to be merged automatically
+  已准备好自动合并
 %p
-  Ask someone with write access to this repository to merge this request.
+  请询问具有此仓库写权限的成员来合并此请求。
diff --git a/app/views/projects/merge_requests/widget/open/_nothing.html.haml b/app/views/projects/merge_requests/widget/open/_nothing.html.haml
index 35626b624b7..617566885ba 100644
--- a/app/views/projects/merge_requests/widget/open/_nothing.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_nothing.html.haml
@@ -1,8 +1,9 @@
 %h4 
   = icon("exclamation-triangle")
-  Nothing to merge from
+  从
   %span.label-branch= source_branch_with_namespace(@merge_request)
-  into
+  到
   %span.label-branch= @merge_request.target_branch
+  无需合并
 %p
-  Please push new commits to the source branch or use a different target branch.
+  请推送新的提交到来源分支或者使用其他的目标分支。
diff --git a/app/views/projects/merge_requests/widget/open/_reload.html.haml b/app/views/projects/merge_requests/widget/open/_reload.html.haml
index acfc31725eb..63d2ccd33a5 100644
--- a/app/views/projects/merge_requests/widget/open/_reload.html.haml
+++ b/app/views/projects/merge_requests/widget/open/_reload.html.haml
@@ -1,6 +1,6 @@
 %h4
   = icon("exclamation-triangle")
-  This merge request failed to be merged automatically
+  此合并请求自动合并失败
 
 %p
-  Please reload the page to find out the reason.
+  请重新载入本页面寻找原因。