Merge branch 'patch-29' into 'master'

accured -> occurred, as suggested in…

See merge request gitlab-org/gitlab-ce!23629

app/assets/javascripts/ide/stores/modules/commit/actions.js

@@ -202,7 +202,7 @@ export const commitChanges = ({ commit, state, getters, dispatch, rootState, roo
         dispatch(
           'setErrorMessage',
           {
-            text: __('An error accured whilst committing your changes.'),
+            text: __('An error occurred whilst committing your changes.'),
             action: () =>
               dispatch('commitChanges').then(() =>
                 dispatch('setErrorMessage', null, { root: true }),

locale/gitlab.pot

@@ -552,9 +552,6 @@ msgstr ""
 msgid "An empty GitLab User field will add the FogBugz user's full name (e.g. \"By John Smith\") in the description of all issues and comments. It will also associate and/or assign these issues and comments with the project creator."
 msgstr ""
 
-msgid "An error accured whilst committing your changes."
-msgstr ""
-
 msgid "An error has occurred"
 msgstr ""
 
@@ -639,6 +636,9 @@ msgstr ""
 msgid "An error occurred while validating username"
 msgstr ""
 
+msgid "An error occurred whilst committing your changes."
+msgstr ""
+
 msgid "An error occurred whilst fetching the job trace."
 msgstr ""