Merge branch 'Update-markup-in-blob/edit-haml-file' into 'master'

Update markup in blob/edit.html.haml

See merge request gitlab-org/gitlab!63180

app/views/projects/blob/edit.html.haml

@@ -5,10 +5,12 @@
 
 - if @conflict
   .gl-alert.gl-alert-danger.gl-mb-5.gl-mt-5
+    .gl-alert-container
       = sprite_icon('error', size: 16, css_class: 'gl-icon gl-alert-icon gl-alert-icon-no-title')
+      .gl-alert-content
         .gl-alert-body
           Someone edited the file the same time you did. Please check out
-      = link_to "the file", project_blob_path(@project, tree_join(@branch_name, @file_path)), target: "_blank", rel: 'noopener noreferrer', class: 'gl-link'
+          = link_to _('the file'), project_blob_path(@project, tree_join(@branch_name, @file_path)), target: "_blank", rel: 'noopener noreferrer', class: 'gl-link'
           and make sure your changes will not unintentionally remove theirs.
 
 %h3.page-title.blob-edit-page-title

locale/gitlab.pot

@@ -39385,6 +39385,9 @@ msgstr ""
 msgid "the correct format."
 msgstr ""
 
+msgid "the file"
+msgstr ""
+
 msgid "the following issue(s)"
 msgstr ""