10:55:44 <netrik182> any repo maintainer can take a look at these issues when you have a chance, please? https://github.com/monero-project/monero-site/issues/1907, https://github.com/monero-project/monero/issues/8118, https://github.com/monero-project/monero-gui/issues/3812
10:56:19 <netrik182> monero-site and monero-gui would be the most important to resolve the continuous conflicts we face on weblate
10:56:20 <netrik182> ty
12:05:26 <selsta> netrik182: did you set this up yourself in a test environment?
12:06:26 <selsta> doesn't gui translations require lupdate or so? 
12:06:57 <selsta> I don't see how that would work with just a github hook setting
13:11:35 <ErCiccione> 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
13:12:02 <ErCiccione> selsta: the weblate hooks would simply pull the latest changes from the repository continuously, without need to manually update
13:12:34 <ErCiccione> I still ahve access to the weblate backend, i'm pinging binaryfate about it
13:12:58 <selsta> ErCiccione: yes, but isn't it required to run lupdate to update the .ts files?
13:14:20 <selsta> lrelease or lupdate, don't know the exact command
13:15:17 <ErCiccione> it is, yes. It would be kinda useful (but not really much IMO) only for monero-site
13:15:37 <selsta> ok, as I thought there would be no point for the CLI and GUI repo doing this
13:15:47 <ErCiccione> correct
13:17:47 <ErCiccione> well, could be automated somehow: hook + a script that lupdate the strings at each pull, but it would be more efforts than gains
13:38:58 <netrik182> Conflicts are easy to manage now since I understood better how to deal with them 
13:39:14 <netrik182> The hooks would automate the pulls as ErCiccione said
13:39:57 <netrik182> Currently everytime there's a merge I need to manually pull/rebase them
13:40:33 <netrik182> And until I do it, weblate throws a warning and locks the resources 
13:42:07 <netrik182> Monero-site is the worst in that regard since merges are much more frequent
13:42:59 <netrik182> Locking the resource means they cannot be translated until I unlock them 
13:48:18 <netrik182> The lupdate would need to be run _before_ pushing them to github.com/monero-weblate?
13:48:58 <ErCiccione> 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
13:48:58 <ErCiccione> be no conflicts after or before
13:49:02 <netrik182> And after pulling from upstream?
13:49:20 <ErCiccione> <netrik182> "And until I do it, weblate..." <- This shouldn't happen.
13:50:05 <ErCiccione> netrik182: What are you referring to? Probably better to discuss this in #monero-translations:monero.social  tho
13:50:09 <netrik182> There's a setting called 'lock on repository errors'
13:50:26 <netrik182> Yeah, let's move there 
13:52:56 <netrik182> I think I'm doing it wrong