diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-02-08 11:50:54 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axil@gitlab.com> | 2018-02-08 11:50:54 +0000 |
| commit | 920f71a03c4254db0e8a503ab49fbf9a7e8f5f6d (patch) | |
| tree | 342dc089980d8ee09331a49df82a1b62246272a4 | |
| parent | 07e1bcc0768d74b85135a2dff1d7cd3afd13f6de (diff) | |
| parent | c807a79979fe7c6335c625fcd0eaa9fd5cb900b2 (diff) | |
| download | gitlab-ce-920f71a03c4254db0e8a503ab49fbf9a7e8f5f6d.tar.gz | |
Merge branch 'bvl-pot-merge-conflicts-docs' into 'master'
Add a note about merge conflicts in `gitlab.pot`
See merge request gitlab-org/gitlab-ce!16971
| -rw-r--r-- | doc/development/i18n/externalization.md | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/development/i18n/externalization.md b/doc/development/i18n/externalization.md index f4542932295..c0a325a83e9 100644 --- a/doc/development/i18n/externalization.md +++ b/doc/development/i18n/externalization.md @@ -126,6 +126,9 @@ 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 translation. +If there are merge conflicts in the `gitlab.pot` file, you can delete the file +and regenerate it using the same command. Confirm that you are not deleting any strings accidentally by looking over the diff. + The command also updates the translation files for each language: `locale/*/gitlab.po` These changes can be discarded, the languange files will be updated by Crowdin automatically. |