Add internationlization for conflict description

1 files changed, 4 insertions, 4 deletions

diff --git a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml
index 6af07c8998c..ebcb37ab5b2 100644
--- a/app/views/projects/merge_requests/conflicts/_submit_form.html.haml
+++ b/app/views/projects/merge_requests/conflicts/_submit_form.html.haml
@@ -2,13 +2,13 @@
 .form-horizontal.resolve-conflicts-form
   .form-group
     .col-md-4
-      %h4 Resolve conflicts on source branch
+      %h4= _('Resolve conflicts on source branch')
       .resolve-info
-        You can resolve the merge conflict using either the Interactive mode, by choosing
+        #{ _('You can resolve the merge conflict using either the Interactive mode, by choosing') }
         %code Use ours
-        or
+        #{ _('or') }
         %code Use theirs
-        buttons, or by editing the files directly. Commit these changes into
+        #{ _('buttons, or by editing the files directly. Commit these changes into') }
         #{link_to @merge_request.source_branch, project_tree_path(@merge_request.project, @merge_request.source_branch), class: "ref-name"}.
     .col-md-8
       %label.label-light{ "for" => "commit-message" }