diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-27 15:06:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-27 15:06:07 +0300 |
commit | 45482d5a2704da7fabe4ccf07f85d9be6e0a791a (patch) | |
tree | 838353cda1b2a06a08799e852f3a7f338c715b44 /doc/development/i18n | |
parent | 20450649ca3132e55aea60436fa6117ca6c1ae5f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/i18n')
-rw-r--r-- | doc/development/i18n/externalization.md | 2 | ||||
-rw-r--r-- | doc/development/i18n/merging_translations.md | 6 | ||||
-rw-r--r-- | doc/development/i18n/proofreader.md | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/doc/development/i18n/externalization.md b/doc/development/i18n/externalization.md index ff75ba8c73b..2f067ede70f 100644 --- a/doc/development/i18n/externalization.md +++ b/doc/development/i18n/externalization.md @@ -323,7 +323,7 @@ bin/rake gettext:regenerate This command will update `locale/gitlab.pot` file with the newly externalized strings and remove any strings that aren't used anymore. You should check this file in. Once the changes are on master, they will be picked up by -[Crowdin](http://translate.gitlab.com) and be presented for +[Crowdin](https://translate.gitlab.com) and be presented for translation. We don't need to check in any changes to the 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. diff --git a/doc/development/i18n/proofreader.md b/doc/development/i18n/proofreader.md index db15633fc73..44d96145eb9 100644 --- a/doc/development/i18n/proofreader.md +++ b/doc/development/i18n/proofreader.md @@ -128,10 +128,10 @@ are very appreciative of the work done by translators and proofreaders! have previously translated. 1. Your request to become a proofreader will be considered on the merits of - your previous translations by [GitLab team members](https://about.gitlab.com/team/) - or [Core team members](https://about.gitlab.com/core-team/) who are fluent in + your previous translations by [GitLab team members](https://about.gitlab.com/company/team/) + or [Core team members](https://about.gitlab.com/community/core-team/) who are fluent in the language or current proofreaders. - - When a request is made for the first proofreader for a language and there are no [GitLab team members](https://about.gitlab.com/team/) - or [Core team members](https://about.gitlab.com/core-team/) who speak the language, we will request links to previous translation work in other communities or projects. + - When a request is made for the first proofreader for a language and there are no [GitLab team members](https://about.gitlab.com/company/team/) + or [Core team members](https://about.gitlab.com/community/core-team/) who speak the language, we will request links to previous translation work in other communities or projects. [proofreader-src]: https://gitlab.com/gitlab-org/gitlab/blob/master/doc/development/i18n/proofreader.md |