Merge branch 'aa-fix-spelling-for-occur' into 'master'

Fix spelling for occurred

See merge request gitlab-org/gitlab!81783

app/assets/javascripts/activities.js

@@ -33,7 +33,7 @@ export default class Activities {
       errorCallback: () =>
         createFlash({
           message: s__(
-            'Activity|An error occured while retrieving activity. Reload the page to try again.',
+            'Activity|An error occurred while retrieving activity. Reload the page to try again.',
           ),
           parent: this.containerEl,
         }),

app/assets/javascripts/pages/shared/wikis/components/wiki_form.vue

@@ -60,7 +60,7 @@ export default {
     contentEditor: {
       renderFailed: {
         message: s__(
-          'WikiPage|An error occured while trying to render the content editor. Please try again later.',
+          'WikiPage|An error occurred while trying to render the content editor. Please try again later.',
         ),
         primaryAction: s__('WikiPage|Retry'),
       },

locale/gitlab.pot

@@ -2016,7 +2016,7 @@ msgstr ""
 msgid "Activity"
 msgstr ""
 
-msgid "Activity|An error occured while retrieving activity. Reload the page to try again."
+msgid "Activity|An error occurred while retrieving activity. Reload the page to try again."
 msgstr ""
 
 msgid "Add"
@@ -41499,7 +41499,7 @@ msgstr ""
 msgid "WikiPageConflictMessage|Someone edited the page the same time you did. Please check out %{wikiLinkStart}the page%{wikiLinkEnd} and make sure your changes will not unintentionally remove theirs."
 msgstr ""
 
-msgid "WikiPage|An error occured while trying to render the content editor. Please try again later."
+msgid "WikiPage|An error occurred while trying to render the content editor. Please try again later."
 msgstr ""
 
 msgid "WikiPage|Are you sure you want to switch back to the classic editor?"

spec/fixtures/markdown/markdown_golden_master_examples.yml

@@ -553,7 +553,7 @@
     * The concert starts at <time datetime="20:00">20:00</time> and you'll be able to enjoy the band for at least <time datetime="PT2H30M">2h 30m</time>.
     * Press <kbd>Ctrl</kbd> + <kbd>C</kbd> to copy text (Windows).
     * WWF's goal is to: <q>Build a future where people live in harmony with nature.</q> We hope they succeed.
-    * The error occured was: <samp>Keyboard not found. Press F1 to continue.</samp>
+    * The error occurred was: <samp>Keyboard not found. Press F1 to continue.</samp>
     * The area of a triangle is: 1/2 x <var>b</var> x <var>h</var>, where <var>b</var> is the base, and <var>h</var> is the vertical height.
     * <ruby>漢<rt>ㄏㄢˋ</rt></ruby>
     * C<sub>7</sub>H<sub>16</sub> + O<sub>2</sub> → CO<sub>2</sub> + H<sub>2</sub>O
@@ -572,7 +572,7 @@
     <li data-sourcepos="8:1-8:149">The concert starts at <time datetime="20:00">20:00</time> and you'll be able to enjoy the band for at least <time datetime="PT2H30M">2h 30m</time>.</li>
     <li data-sourcepos="9:1-9:62">Press <kbd>Ctrl</kbd> + <kbd>C</kbd> to copy text (Windows).</li>
     <li data-sourcepos="10:1-10:105">WWF's goal is to: <q>Build a future where people live in harmony with nature.</q> We hope they succeed.</li>
-    <li data-sourcepos="11:1-11:79">The error occured was: <samp>Keyboard not found. Press F1 to continue.</samp>
+    <li data-sourcepos="11:1-11:79">The error occurred was: <samp>Keyboard not found. Press F1 to continue.</samp>
     </li>
     <li data-sourcepos="12:1-12:136">The area of a triangle is: 1/2 x <var>b</var> x <var>h</var>, where <var>b</var> is the base, and <var>h</var> is the vertical height.</li>
     <li data-sourcepos="13:1-13:35"><ruby>漢<rt>ㄏㄢˋ</rt></ruby></li>