diff options
| author | Achilleas Pipinellis <axil@gitlab.com> | 2018-02-08 11:50:54 +0000 |
|---|---|---|
| committer | Ian Baum <ibaum@gitlab.com> | 2018-02-12 11:18:54 -0600 |
| commit | 948938797a5ad204960a56f0e80be9f372da36a0 (patch) | |
| tree | 48824e86e9e4421fb8ee4691b5dd09567350575e /doc | |
| parent | 2347e31671333cb1957bca91aae2ff81b641751d (diff) | |
| download | gitlab-ce-948938797a5ad204960a56f0e80be9f372da36a0.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
Diffstat (limited to 'doc')
| -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. |