any repo maintainer can take a look at these issues when you have a chance, please? monero-project/monero-site #1907, monero-project/monero #8118, monero-project/monero-gui #3812

monero-site and monero-gui would be the most important to resolve the continuous conflicts we face on weblate

ty

netrik182: did you set this up yourself in a test environment?

doesn't gui translations require lupdate or so?

I don't see how that would work with just a github hook setting

netrik182: continuous integration could be useful, but not really much. If you have conflicts it's probably because the translations weren't locked after commits were pushed

selsta: the weblate hooks would simply pull the latest changes from the repository continuously, without need to manually update

I still ahve access to the weblate backend, i'm pinging binaryfate about it

ErCiccione: yes, but isn't it required to run lupdate to update the .ts files?

lrelease or lupdate, don't know the exact command

it is, yes. It would be kinda useful (but not really much IMO) only for monero-site

ok, as I thought there would be no point for the CLI and GUI repo doing this

correct

well, could be automated somehow: hook + a script that lupdate the strings at each pull, but it would be more efforts than gains

Conflicts are easy to manage now since I understood better how to deal with them

The hooks would automate the pulls as ErCiccione said

Currently everytime there's a merge I need to manually pull/rebase them

And until I do it, weblate throws a warning and locks the resources

Monero-site is the worst in that regard since merges are much more frequent

Locking the resource means they cannot be translated until I unlock them

The lupdate would need to be run _before_ pushing them to github.com/monero-weblate?

There is something wrong. You shouldn't see nay conflicts or issues if you follow the correct workflow. People will work on the strings on weblate, regardless of what happen ins the upstream repo. When it's time to push the strings back, you have to lock the component on weblate, rebase on upstream, fix conflicts if there are any and then open the PR. After the PR is merged you pull upstream and then unlock the component. That assures there will

be no conflicts after or before

And after pulling from upstream?

<netrik182> "And until I do it, weblate..." <- This shouldn't happen.

netrik182: What are you referring to? Probably better to discuss this in #monero-translations:monero.social tho

There's a setting called 'lock on repository errors'

Yeah, let's move there

I think I'm doing it wrong