1 files changed, 22 insertions, 24 deletions
diff --git a/app/views/projects/_merge_request_merge_method_settings.html.haml b/app/views/projects/_merge_request_merge_method_settings.html.haml
index 935581643cd..47c311f42d0 100644
--- a/app/views/projects/_merge_request_merge_method_settings.html.haml
+++ b/app/views/projects/_merge_request_merge_method_settings.html.haml
@@ -1,35 +1,33 @@
 - form = local_assigns.fetch(:form)
 
 .form-group
-  = label_tag :merge_method_merge, class: 'label-bold' do
-    Merge method
-  .form-check
+  %b= s_('ProjectSettings|Merge method')
+  %p.text-secondary= s_('ProjectSettings|This will dictate the commit history when you merge a merge request')
+  .form-check.mb-2
     = form.radio_button :merge_method, :merge, class: "js-merge-method-radio form-check-input"
     = label_tag :project_merge_method_merge, class: 'form-check-label' do
-      %strong Merge commit
-      %br
-      %span.descr
-        A merge commit is created for every merge, and merging is allowed as long as there are no conflicts.
+      = s_('ProjectSettings|Merge commit')
+      .descr.text-secondary
+        = s_('ProjectSettings|Every merge creates a merge commit')
 
-  .form-check
+  .form-check.mb-2
     = form.radio_button :merge_method, :rebase_merge, class: "js-merge-method-radio form-check-input"
     = label_tag :project_merge_method_rebase_merge, class: 'form-check-label' do
-      %strong Merge commit with semi-linear history
-      %br
-      %span.descr
-        A merge commit is created for every merge, but merging is only allowed if fast-forward merge is possible.
-        This way you could make sure that if this merge request would build, after merging to target branch it would also build.
-      %br
-      %span.descr
-        When fast-forward merge is not possible, the user is given the option to rebase.
+      = s_('ProjectSettings|Merge commit with semi-linear history')
+      .descr.text-secondary
+        = s_('ProjectSettings|Every merge creates a merge commit')
+        %br
+        = s_('ProjectSettings|Fast-forward merges only')
+        %br
+        = s_('ProjectSettings|When conflicts arise the user is given the option to rebase')
 
-  .form-check
+  .form-check.mb-2
     = form.radio_button :merge_method, :ff, class: "js-merge-method-radio qa-radio-button-merge-ff form-check-input"
     = label_tag :project_merge_method_ff, class: 'form-check-label' do
-      %strong Fast-forward merge
-      %br
-      %span.descr
-        No merge commits are created and all merges are fast-forwarded, which means that merging is only allowed if the branch could be fast-forwarded.
-      %br
-      %span.descr
-        When fast-forward merge is not possible, the user is given the option to rebase.
+      = s_('ProjectSettings|Fast-forward merge')
+      .descr.text-secondary
+        = s_('ProjectSettings|No merge commits are created')
+        %br
+        = s_('ProjectSettings|Fast-forward merges only')
+        %br
+        = s_('ProjectSettings|When conflicts arise the user is given the option to rebase')