9 files changed, 20 insertions, 22 deletions

diff --git a/app/views/projects/issues/_closed_by_box.html.haml b/app/views/projects/issues/_closed_by_box.html.haml
index 38469ed4774..f5b7a9e25f2 100644
--- a/app/views/projects/issues/_closed_by_box.html.haml
+++ b/app/views/projects/issues/_closed_by_box.html.haml
@@ -1,4 +1,2 @@
 .issue-closed-by-widget.second-block
-  - pluralized_mr_this = merge_request_count > 1 ? "these" : "this"
-  - pluralized_mr_is = merge_request_count > 1 ? "are" : "is"
-  When #{pluralized_mr_this} merge #{"request".pluralize(merge_request_count)} #{pluralized_mr_is} accepted, this issue will be closed automatically.
+  当合并请求被接受后，此问题将会被自动关闭。
diff --git a/app/views/projects/issues/_header_title.html.haml b/app/views/projects/issues/_header_title.html.haml
index 99f03549c44..257d1aefae2 100644
--- a/app/views/projects/issues/_header_title.html.haml
+++ b/app/views/projects/issues/_header_title.html.haml
@@ -1 +1 @@
-- header_title project_title(@project, "Issues", namespace_project_issues_path(@project.namespace, @project))
+- header_title project_title(@project, "问题", namespace_project_issues_path(@project.namespace, @project))
diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml
index 00e1a3d8069..906b9acd3df 100644
--- a/app/views/projects/issues/_issue.html.haml
+++ b/app/views/projects/issues/_issue.html.haml
@@ -10,11 +10,11 @@
     %ul.controls.light
       - if issue.closed?
         %li
-          CLOSED
+          已关闭
 
       - if issue.assignee
         %li
-          = link_to_member(@project, issue.assignee, name: false, title: "Assigned to :name")
+          = link_to_member(@project, issue.assignee, name: false, title: "指派给 :name")
 
       - upvotes, downvotes = issue.upvotes, issue.downvotes
       - if upvotes > 0
@@ -41,8 +41,8 @@
 
   .issue-info
     #{issue.to_reference} ·
-    opened #{time_ago_with_tooltip(issue.created_at, placement: 'bottom')}
-    by #{link_to_member(@project, issue.author, avatar: false)}
+    #{link_to_member(@project, issue.author, avatar: false)}
+    在 #{time_ago_with_tooltip(issue.created_at, placement: 'bottom')} 开启
     - if issue.milestone
        
       = link_to namespace_project_issues_path(issue.project.namespace, issue.project, milestone_title: issue.milestone.title) do
@@ -58,4 +58,4 @@
         = issue.task_status
 
     .pull-right.issue-updated-at
-      %span updated #{time_ago_with_tooltip(issue.updated_at, placement: 'bottom', html_class: 'issue_update_ago')}
+      %span #{time_ago_with_tooltip(issue.updated_at, placement: 'bottom', html_class: 'issue_update_ago')}更新
diff --git a/app/views/projects/issues/_issues.html.haml b/app/views/projects/issues/_issues.html.haml
index f34f3c05737..db57f515caf 100644
--- a/app/views/projects/issues/_issues.html.haml
+++ b/app/views/projects/issues/_issues.html.haml
@@ -2,7 +2,7 @@
   = render @issues
   - if @issues.blank?
     %li
-      .nothing-here-block No issues to show
+      .nothing-here-block 没有问题
 
 - if @issues.present?
   = paginate @issues, theme: "gitlab"
diff --git a/app/views/projects/issues/_merge_requests.html.haml b/app/views/projects/issues/_merge_requests.html.haml
index d6b38b327ff..f767ce3f86a 100644
--- a/app/views/projects/issues/_merge_requests.html.haml
+++ b/app/views/projects/issues/_merge_requests.html.haml
@@ -16,13 +16,13 @@
           %strong
             = link_to_gfm merge_request.title, merge_request_path(merge_request), class: "row_title"
           - unless @issue.project.id == merge_request.target_project.id
-            in
+            在
             - project = merge_request.target_project
             = link_to project.name_with_namespace, namespace_project_path(project.namespace, project)
         %span.merge-request-status.prepend-left-10
           - if merge_request.merged?
-            MERGED
+            已合并
           - elsif merge_request.closed?
-            CLOSED
+            已关闭
     - if @closed_by_merge_requests.present?
       = render partial: 'projects/issues/closed_by_box', locals: {merge_request_count: @merge_requests.count}
diff --git a/app/views/projects/issues/edit.html.haml b/app/views/projects/issues/edit.html.haml
index 20216297d25..72eaceefaff 100644
--- a/app/views/projects/issues/edit.html.haml
+++ b/app/views/projects/issues/edit.html.haml
@@ -1,8 +1,8 @@
-- page_title "Edit", "#{@issue.title} (##{@issue.iid})", "Issues"
+- page_title "编辑", "#{@issue.title} (##{@issue.iid})", "问题"
 = render "header_title"
 
 %h3.page-title
-  Edit Issue ##{@issue.iid}
+  编辑问题 ##{@issue.iid}
 %hr
 
 = render "form"
diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml
index fde9304c0f8..ba7f7cb1a56 100644
--- a/app/views/projects/issues/index.html.haml
+++ b/app/views/projects/issues/index.html.haml
@@ -1,9 +1,9 @@
-- page_title "Issues"
+- page_title "问题"
 = render "header_title"
 
 = content_for :meta_tags do
   - if current_user
-    = auto_discovery_link_tag(:atom, namespace_project_issues_url(@project.namespace, @project, :atom, private_token: current_user.private_token), title: "#{@project.name} issues")
+    = auto_discovery_link_tag(:atom, namespace_project_issues_url(@project.namespace, @project, :atom, private_token: current_user.private_token), title: "#{@project.name} 问题")
 
 .top-area
   = render 'shared/issuable/nav', type: :issues
@@ -13,9 +13,9 @@
         = icon('rss')
       = render 'shared/issuable/search_form', path: namespace_project_issues_path(@project.namespace, @project)
     - if can? current_user, :create_issue, @project
-      = link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { assignee_id: @issuable_finder.assignee.try(:id), milestone_id: @issuable_finder.milestones.try(:first).try(:id) }), class: "btn btn-new", title: "New Issue", id: "new_issue_link" do
+      = link_to new_namespace_project_issue_path(@project.namespace, @project, issue: { assignee_id: @issuable_finder.assignee.try(:id), milestone_id: @issuable_finder.milestones.try(:first).try(:id) }), class: "btn btn-new", title: "新问题", id: "new_issue_link" do
         = icon('plus')
-        New Issue
+        新问题
 
 = render 'shared/issuable/filter', type: :issues
 
diff --git a/app/views/projects/issues/new.html.haml b/app/views/projects/issues/new.html.haml
index b317a0c1cf4..cee9a064a89 100644
--- a/app/views/projects/issues/new.html.haml
+++ b/app/views/projects/issues/new.html.haml
@@ -1,8 +1,8 @@
-- page_title "New Issue"
+- page_title "新问题"
 = render "header_title"
 
 %h3.page-title
-  New Issue
+  新问题
 %hr
 
 = render "form"
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index 6fa059cbe68..2bcfdaaf4da 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -1,4 +1,4 @@
-- page_title           "#{@issue.title} (##{@issue.iid})", "Issues"
+- page_title           "#{@issue.title} (##{@issue.iid})", "问题"
 - page_description     @issue.description
 - page_card_attributes @issue.card_attributes