Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/ide/components/commit_sidebar/list.vue

@@ -87,7 +87,7 @@ export default {
     },
   },
   discardModalText: __(
-    "You will loose all the unstaged changes you've made in this project. This action cannot be undone.",
+    "You will lose all the unstaged changes you've made in this project. This action cannot be undone.",
   ),
 };
 </script>

app/assets/javascripts/ide/components/commit_sidebar/stage_button.vue

@@ -72,7 +72,7 @@ export default {
       footer-primary-button-variant="danger"
       @submit="discardFileChanges(path)"
     >
-      {{ __("You will loose all changes you've made to this file. This action cannot be undone.") }}
+      {{ __("You will lose all changes you've made to this file. This action cannot be undone.") }}
     </gl-modal>
   </div>
 </template>

locale/gitlab.pot

@@ -10419,10 +10419,10 @@ msgstr ""
 msgid "You need to register a two-factor authentication app before you can set up a U2F device."
 msgstr ""
 
-msgid "You will loose all changes you've made to this file. This action cannot be undone."
+msgid "You will lose all changes you've made to this file. This action cannot be undone."
 msgstr ""
 
-msgid "You will loose all the unstaged changes you've made in this project. This action cannot be undone."
+msgid "You will lose all the unstaged changes you've made in this project. This action cannot be undone."
 msgstr ""
 
 msgid "You will not get any notifications via email"