Hello Grégoire, Am Mo., 24. Feb. 2020 um 10:35 Uhr schrieb Grégoire Scano <gregoire.sc...@malloc.fr>: > > Hello Mario, > > thanks for the explanation on this, it is much clearer now. > > I have integrated the changes for min-100-occurences in a branch [1] of > my personal copy of the repo and would like to know if you agree with > the following flow before pushing it to the public repo: > > [1] https://salsa.debian.org/gscano-guest/manpages-l10n/tree/tmp > > 1) update the common/* files since you made some changes to them as you > warned us before; > 2) apply use-for-compendium for files pushed by Jean-Philippe, > Jean-Pierre and any other translator, so that I would spot differences > and rule between conflicts based on the fact that the compendium would > precede the translation itself for homogeneity purposes; > 3) merge with my branch of translated and proofread min-100-occurences, > and resolve conflicts here if any; > 4) apply update-translations; > > and proceed as such for the rest of the occurences files that have been > translated, integrating updated translations into the common files > first before apply them to the entire tree. >
Because you've already edited the common files directly, you should commit the changed files first. Then, run use-for-compendium for already pushed files, and finally commit and push all. If you would run use-for-compendium first, it could happen that the changes partially get overwritten by committing the changed common files. Some additional note about the compendium: In some cases it could happen that gettext messages are somewhat ambiguous. This means, they cannot be added to the compendium because it would produce a unique translation although the gettext message has different meanings in different *.po files. in such cases, add the message to the file templates/exclude.pot (with an empty »msgstrg ""«. Next time the compendium files get updated, this message will disappear from all compendium files in all languages. Best Regards, Mario