diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-09 19:30:30 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-06-09 19:30:30 +0000 |
| commit | 07e05c6f0bea9821951217d6dd82d6dd014d773a (patch) | |
| tree | b03c76e28c8319e9d2e6697c56a52dd853b4087c /doc | |
| parent | ce4fe4dc76bfa55b44cb61c6eb0b2dee3a776850 (diff) | |
| parent | 0ed2996819f6ec2b8b257d9b8e66a8eef101158b (diff) | |
| download | gitlab-ce-07e05c6f0bea9821951217d6dd82d6dd014d773a.tar.gz | |
Merge branch 'bvl-revert-regenerating-translations' into 'master'
Revert "Regenerate po and js files"
See merge request !12044
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/development/i18n_guide.md | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/development/i18n_guide.md b/doc/development/i18n_guide.md index bfb0779fbfa..756535e28bc 100644 --- a/doc/development/i18n_guide.md +++ b/doc/development/i18n_guide.md @@ -127,6 +127,14 @@ New translations will be added with their default content and will be marked fuzzy. To use the translation, look for the `#, fuzzy` mention in `gitlab.edit.po` and remove it. +We need to make sure we remove the `fuzzy` translations before generating the +`locale/**/gitlab.po` file. When they aren't removed, the resulting `.po` will +be treated as a binary file which could overwrite translations that were merged +before the new translations. + +When we are just preparing a page to be translated, but not actually adding any +translations. There's no need to generate `.po` files. + Translations that aren't used in the source code anymore will be marked with `~#`; these can be removed to keep our translation files clutter-free. |