Merge branch 'fix-ee-error-message' into 'master'

Fix misspellings in error messages

See merge request gitlab-org/gitlab-ee!9928

ee/app/assets/javascripts/design_management/pages/index.vue

@@ -35,7 +35,7 @@ export default {
     <div class="mt-4">
       <gl-loading-icon v-if="isLoading" :size="2" />
       <div v-else-if="error" class="alert alert-danger">
-        {{ __('An error occured while loading designs. Please try again.') }}
+        {{ __('An error occurred while loading designs. Please try again.') }}
       </div>
       <design-list v-else-if="designs.length" :designs="designs" />
       <div v-else>{{ __('No designs found.') }}</div>

ee/spec/frontend/design_management/pages/__snapshots__/index_spec.js.snap

@@ -33,7 +33,7 @@ exports[`Design management index page designs renders error 1`] = `
       class="alert alert-danger"
     >
       
-      An error occured while loading designs. Please try again.
+      An error occurred while loading designs. Please try again.
     
     </div>
   </div>

locale/gitlab.pot

@@ -811,9 +811,6 @@ msgstr ""
 msgid "An error has occurred"
 msgstr ""
 
-msgid "An error occured while loading designs. Please try again."
-msgstr ""
-
 msgid "An error occurred adding a draft to the discussion."
 msgstr ""
 
@@ -901,6 +898,9 @@ msgstr ""
 msgid "An error occurred while loading commit signatures"
 msgstr ""
 
+msgid "An error occurred while loading designs. Please try again."
+msgstr ""
+
 msgid "An error occurred while loading diff"
 msgstr ""