diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-02-07 14:24:47 +0100 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2018-02-07 14:24:47 +0100 |
| commit | c807a79979fe7c6335c625fcd0eaa9fd5cb900b2 (patch) | |
| tree | 3b56debb41ea52632261425fc53cafe862c64a09 | |
| parent | 3f3b84e026aa79535fa639bf08962e7b7c6b63cd (diff) | |
| download | gitlab-ce-bvl-pot-merge-conflicts-docs.tar.gz | |
Add a note about merge conflicts in `gitlab.pot`bvl-pot-merge-conflicts-docs
| -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 f493ad4ae66..695b2dbbfdb 100644 --- a/doc/development/i18n/externalization.md +++ b/doc/development/i18n/externalization.md @@ -124,6 +124,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. |