diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-27 12:06:07 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-27 12:06:07 +0000 |
| commit | 45482d5a2704da7fabe4ccf07f85d9be6e0a791a (patch) | |
| tree | 838353cda1b2a06a08799e852f3a7f338c715b44 /doc/development/i18n/merging_translations.md | |
| parent | 20450649ca3132e55aea60436fa6117ca6c1ae5f (diff) | |
| download | gitlab-ce-45482d5a2704da7fabe4ccf07f85d9be6e0a791a.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/i18n/merging_translations.md')
| -rw-r--r-- | doc/development/i18n/merging_translations.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/development/i18n/merging_translations.md b/doc/development/i18n/merging_translations.md index 7a8046ccdd9..f5953cc5f6c 100644 --- a/doc/development/i18n/merging_translations.md +++ b/doc/development/i18n/merging_translations.md @@ -15,8 +15,8 @@ By default Crowdin commits translations with `[skip ci]` in the commit message. This is done to avoid a bunch of pipelines being run. Before merging translations, make sure to trigger a pipeline to validate translations, we have static analysis validating things Crowdin -doesn't do. Create a [new pipeline](https://gitlab.com/gitlab-org/gitlab/pipelines/new) for the -`master-i18n` branch. +doesn't do. Create a new pipeline at `https://gitlab.com/gitlab-org/gitlab/pipelines/new` +(need Developer access permissions) for the `master-i18n` branch. If there are validation errors, the easiest solution is to disapprove the offending string in Crowdin, leaving a comment with what is @@ -53,7 +53,7 @@ or merged. But it won't recreate the `master-i18n` branch every time. To force Crowdin to recreate the branch, close any [open merge request](https://gitlab.com/gitlab-org/gitlab/merge_requests?scope=all&utf8=%E2%9C%93&state=opened&author_username=gitlab-crowdin-bot) and delete the -[`master-18n`](https://gitlab.com/gitlab-org/gitlab/branches/all?utf8=%E2%9C%93&search=master-i18n). +[`master-18n`](https://gitlab.com/gitlab-org/gitlab/-/branches/all?utf8=✓&search=master-i18n). This might be needed when the merge request contains failures that have been fixed on master. |