Commit 4ca1c8c5 authored by Evan Read's avatar Evan Read

Merge branch 'docs-po-files-update-grammar' into 'master'

Fix grammar in i18n .po file details

See merge request gitlab-org/gitlab!17695
parents 1d3b2bf7 c7ae83a8
...@@ -326,9 +326,8 @@ file in. Once the changes are on master, they will be picked up by ...@@ -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 [Crowdin](https://translate.gitlab.com) and be presented for
translation. translation.
We don't need to check in any changes to the We don't need to check in any changes to the `locale/[language]/gitlab.po` files.
`locale/[language]/gitlab.po` files. Those will be updated in a [when They are updated automatically when [translations from Crowdin are merged](merging_translations.md).
translations from Crowdin are merged](merging_translations.md).
If there are merge conflicts in the `gitlab.pot` file, you can delete the file If there are merge conflicts in the `gitlab.pot` file, you can delete the file
and regenerate it using the same command. and regenerate it using the same command.
......
# Merging translations from Crowdin # Merging translations from Crowdin
Crowdin automatically syncs the `gitlab.pot` file presenting newly Crowdin automatically syncs the `gitlab.pot` file with the Crowdin service, presenting
added translations to the community of translators. newly added externalized strings to the community of translators.
At the same time, it creates a merge request to merge all newly added [GitLab Crowdin Bot](https://gitlab.com/gitlab-crowdin-bot) also creates merge requests
& approved translations. Find the [merge request created by to take newly approved translation submissions and merge them into the `locale/<language>/gitlab.po`
`gitlab-crowdin-bot`](https://gitlab.com/gitlab-org/gitlab/merge_requests?scope=all&utf8=%E2%9C%93&state=opened&author_username=gitlab-crowdin-bot) 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. to see new and merged merge requests.
## Validation ## Validation
...@@ -31,17 +31,16 @@ clicking `Pause sync` on the [Crowdin integration settings ...@@ -31,17 +31,16 @@ clicking `Pause sync` on the [Crowdin integration settings
page](https://translate.gitlab.com/project/gitlab-ee/settings#integration). page](https://translate.gitlab.com/project/gitlab-ee/settings#integration).
When all failures are resolved, the translations need to be double 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 ## Merging translations
When all translations are found good and pipelines pass the 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 translations can be merged into the master branch. When merging the translations,
source branch` checkbox, so Crowdin recreates the `master-i18n` from make sure to check the **Remove source branch** checkbox, so Crowdin recreates the
master after the new translation was merged. `master-i18n` from master after the new translation was merged.
We are discussing automating this entire process We are discussing [automating this entire process](https://gitlab.com/gitlab-org/gitlab/issues/19896).
[here](https://gitlab.com/gitlab-org/gitlab/issues/19896).
## Recreate the merge request ## Recreate the merge request
......
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