Commit c48f29c1 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'patch-29' into 'master'

accured -> occurred, as suggested in…

See merge request gitlab-org/gitlab-ce!23629
parents 96fdcbac 1af86052
...@@ -202,7 +202,7 @@ export const commitChanges = ({ commit, state, getters, dispatch, rootState, roo ...@@ -202,7 +202,7 @@ export const commitChanges = ({ commit, state, getters, dispatch, rootState, roo
dispatch( dispatch(
'setErrorMessage', 'setErrorMessage',
{ {
text: __('An error accured whilst committing your changes.'), text: __('An error occurred whilst committing your changes.'),
action: () => action: () =>
dispatch('commitChanges').then(() => dispatch('commitChanges').then(() =>
dispatch('setErrorMessage', null, { root: true }), dispatch('setErrorMessage', null, { root: true }),
......
...@@ -552,9 +552,6 @@ msgstr "" ...@@ -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." 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 "" msgstr ""
msgid "An error accured whilst committing your changes."
msgstr ""
msgid "An error has occurred" msgid "An error has occurred"
msgstr "" msgstr ""
...@@ -639,6 +636,9 @@ msgstr "" ...@@ -639,6 +636,9 @@ msgstr ""
msgid "An error occurred while validating username" msgid "An error occurred while validating username"
msgstr "" msgstr ""
msgid "An error occurred whilst committing your changes."
msgstr ""
msgid "An error occurred whilst fetching the job trace." msgid "An error occurred whilst fetching the job trace."
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment