Commit 920f71a0 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Merge branch 'bvl-pot-merge-conflicts-docs' into 'master'

Add a note about merge conflicts in `gitlab.pot`

See merge request !16971
parents 07e1bcc0 c807a799
Pipeline #17260504 passed with stages
in 42 minutes and 5 seconds
......@@ -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.
......
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