diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-02-04 12:14:53 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-02-04 12:14:53 +0000 |
| commit | c48f29c15989d260ccb72d3e4bf5973a5e0f2d25 (patch) | |
| tree | 9c87aff4904e5a34a07258264db1ec4950be653d | |
| parent | 96fdcbacf74fffc4c9389d3d122db1cdf01693d2 (diff) | |
| parent | 1af8605256b145bcd8467f120512a6d6aa432afc (diff) | |
| download | gitlab-ce-c48f29c15989d260ccb72d3e4bf5973a5e0f2d25.tar.gz | |
Merge branch 'patch-29' into 'master'
accured -> occurred, as suggested in…
See merge request gitlab-org/gitlab-ce!23629
| -rw-r--r-- | app/assets/javascripts/ide/stores/modules/commit/actions.js | 2 | ||||
| -rw-r--r-- | locale/gitlab.pot | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/ide/stores/modules/commit/actions.js b/app/assets/javascripts/ide/stores/modules/commit/actions.js index d97a950a8b2..24c2f71ae2b 100644 --- a/app/assets/javascripts/ide/stores/modules/commit/actions.js +++ b/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 }), diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 34e5e04d1cf..ccdbc63c51e 100644 --- a/locale/gitlab.pot +++ b/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 "" |