Overwritten Weblate component translations (language specific)

[salvador-pena]

AFAIU english man pages for components are extracted from src/components/*.comp and eventually processed to original source strings for Weblate.

I have noticed that some of my (spanish) translations are overwritten;
so it looks like there is something in between that besides to original strings updating, updates spanish translations too.

I have two cases:

1. Characters added. For example, in this string, the "transformation":

   • adds index entry triple rounded brackets, which are inconsistent with original source string.
   • adds a period at the end of string, which fires a 'Mismatched full stop' failing check in Weblate.

   Apparently, this happens for french translations too.

2. Overwritten string. For example in this string , where my translation is overwritten, from where?.

[smoe]

Are your translations still in weblate? If so, then I understand these are not lost. Maybe there are two very similar English entries (with and without a period at the end?).

Weblate provides .po files. And weblate should be the source of the perfect translation. The .po files in the source tree are newly generated when the documentation changes, which then triggers the .pot file and also adjusts the .po files in the archive. Only the updated .pot file should then be committed to the archive and weblate will update the .po files from there. Unless someone borked and also updated the .po files in the archive to then force-feed them back to weblate, what you described should not happen.

To avoid any larger confusions, it is good practive to lock the editing in weblate whenever an update of the .pot file is prepared for weblate to see. @hansu? @petterreinholdtsen?

[salvador-pena]

Fortunately, those are simple translations that can be reverted or re-applied, basically are component/parameter descriptions, but I had to correct more than 600 strings. I thought they were new strings, but nearly the end I noticed that I was reworking.

Please take a look into the sample strings history, so you can see what (and when) is happening and maybe point out where are those rewrites coming from.

[hansu]

From which date are your missing translations? Maybe they got lost when we introduced Weblate.

[salvador-pena]

My translations are mostly from Nov, 25 and around 600 of them were overwritten on Jan 18, 26.

[hansu]

The translations got lost with #3710 resp. #3711.

What I could imagine that there have been changes in Weblate which haven't been pushed/committed yet when the pot file was updated.

@smoe are you sure that there were zeroes everywhere (not like in this example) when you updated the documentation.pot?

Otherweise it's a misbehaviour of Weblate

[smoe]

Yes, in some deeper theory there should not be anything >0 when the .pot file is updated. And in particular changes made in November are in like 5 times over. What I keep doing (maybe wrongly) is that I only commit the .pot file by to LinuxCNC, not the also updated .po files, leaving the adjustments from the existing .po to the updated .pot files to weblate.

[smoe]

@salvador-pena, I can read some Spanish and like your translations a lot. Many thanks! I suggest I perform an update of the .pot files at every month's end if I am aware of notable changes to our documentation. This will keep the weblate project down for some 6-10 hours or so because of the many builds (local and on GitHub), which is why I do not do it more often.

[petterreinholdtsen]

[Steffen Möller]

What I keep doing (maybe wrongly) is that I only commit the .pot file by to LinuxCNC, not the also updated .po files, leaving the adjustments from the existing .po to the updated .pot files to weblate.

I believe this is the correct process. I also recommend to lock weblate before a new POT file ic created and commited, push all changes from weblate to github and merge the changes into the master branch, before updating the POT file and pulling it into Weblate and unlocking weblate. This reduce the chance of any git merge conflicts and ensure the authorative translation strings are in predicatble location at all times (first weblate, then github, and then weblate) before weblate is unlocked..

…

-- Happy hacking Petter Reinholdtsen

[smoe]

warning: skipped previously applied commit a3ebd945f2
warning: skipped previously applied commit 010c12a97a
warning: skipped previously applied commit 22469d0348
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Rebasing (1/1)
Auto-merging docs/po/es.po
CONFLICT (content): Merge conflict in docs/po/es.po
error: could not apply 2348c6ffa3... Translated using Weblate (Spanish)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Could not apply 2348c6ffa3... Translated using Weblate (Spanish)
 (1)

Not sure what happened.