diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-25 03:06:02 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-25 03:06:02 +0000 |
commit | 543081566d10160511ef09e929195ef3f48f5fa3 (patch) | |
tree | 7c9078aa42eb450ca20bed02b74e8e15e4d2e5e5 /doc/development/i18n | |
parent | 6d43720a1a86ccca9618417a6d0415e7d522fa49 (diff) | |
download | gitlab-ce-543081566d10160511ef09e929195ef3f48f5fa3.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/i18n')
-rw-r--r-- | doc/development/i18n/externalization.md | 5 | ||||
-rw-r--r-- | doc/development/i18n/merging_translations.md | 21 |
2 files changed, 12 insertions, 14 deletions
diff --git a/doc/development/i18n/externalization.md b/doc/development/i18n/externalization.md index 2f067ede70f..c8960ac0f61 100644 --- a/doc/development/i18n/externalization.md +++ b/doc/development/i18n/externalization.md @@ -326,9 +326,8 @@ file in. Once the changes are on master, they will be picked up by [Crowdin](https://translate.gitlab.com) and be presented for translation. -We don't need to check in any changes to the -`locale/[language]/gitlab.po` files. Those will be updated in a [when -translations from Crowdin are merged](merging_translations.md). +We don't need to check in any changes to the `locale/[language]/gitlab.po` files. +They are updated automatically when [translations from Crowdin are merged](merging_translations.md). If there are merge conflicts in the `gitlab.pot` file, you can delete the file and regenerate it using the same command. diff --git a/doc/development/i18n/merging_translations.md b/doc/development/i18n/merging_translations.md index 9d305b6ac4e..c773b187cc1 100644 --- a/doc/development/i18n/merging_translations.md +++ b/doc/development/i18n/merging_translations.md @@ -1,11 +1,11 @@ # Merging translations from Crowdin -Crowdin automatically syncs the `gitlab.pot` file presenting newly -added translations to the community of translators. +Crowdin automatically syncs the `gitlab.pot` file with the Crowdin service, presenting +newly added externalized strings to the community of translators. -At the same time, it creates a merge request to merge all newly added -& approved translations. Find the [merge request created by -`gitlab-crowdin-bot`](https://gitlab.com/gitlab-org/gitlab/merge_requests?scope=all&utf8=%E2%9C%93&state=opened&author_username=gitlab-crowdin-bot) +[GitLab Crowdin Bot](https://gitlab.com/gitlab-crowdin-bot) also creates merge requests +to take newly approved translation submissions and merge them into the `locale/<language>/gitlab.po` +files. Check the [merge requests created by `gitlab-crowdin-bot`](https://gitlab.com/gitlab-org/gitlab/merge_requests?scope=all&utf8=%E2%9C%93&state=opened&author_username=gitlab-crowdin-bot) to see new and merged merge requests. ## Validation @@ -31,17 +31,16 @@ clicking `Pause sync` on the [Crowdin integration settings page](https://translate.gitlab.com/project/gitlab-ee/settings#integration). When all failures are resolved, the translations need to be double -checked once more as discussed in [confidential issue](../../user/project/issues/confidential_issues.md) `https://gitlab.com/gitlab-org/gitlab-foss/issues/37850`. +checked once more as discussed in [confidential issue](../../user/project/issues/confidential_issues.md) `https://gitlab.com/gitlab-org/gitlab/issues/19485`. ## Merging translations When all translations are found good and pipelines pass the -translations can be merged into the master branch. When merging the translations, make sure to check the `Remove -source branch` checkbox, so Crowdin recreates the `master-i18n` from -master after the new translation was merged. +translations can be merged into the master branch. When merging the translations, +make sure to check the **Remove source branch** checkbox, so Crowdin recreates the +`master-i18n` from master after the new translation was merged. -We are discussing automating this entire process -[here](https://gitlab.com/gitlab-org/gitlab/issues/19896). +We are discussing [automating this entire process](https://gitlab.com/gitlab-org/gitlab/issues/19896). ## Recreate the merge request |