Change in Weblate - How to continue?
- zz912
- Topic Author
- Offline
- Platinum Member
Less
More
- Posts: 508
- Thank you received: 81
01 Apr 2024 13:42 #297370
by zz912
Change in Weblate - How to continue? was created by zz912
Attachments:
Please Log in or Create an account to join the conversation.
- zz912
- Topic Author
- Offline
- Platinum Member
Less
More
- Posts: 508
- Thank you received: 81
02 Apr 2024 04:15 #297415
by zz912
Replied by zz912 on topic Change in Weblate - How to continue?
I found out that from weblate the translations to LCNC are automatically received. However, weblate sends it to the master branch. I want to make changes in the 2.9 branch. Can I do a normal Pull Request with a patched *.po file to version 2.9? I remember there were some issues with weblate and Pull Request collisions. I should have written a note about immediately merging to master and ignoring the *.po file.
Please Log in or Create an account to join the conversation.
- HansU
- Offline
- Moderator
Less
More
- Posts: 633
- Thank you received: 182
02 Apr 2024 07:32 #297422
by HansU
Replied by HansU on topic Change in Weblate - How to continue?
The changes you make via Weblate will only aopearn in the Master branch.
If you update the po file in older branches, there will be conflicts when merging up or when Weblate wants to push its changes.
I am pretty sure that updating a 2.9 po file will work with this receipe.
I will try it the next time:
github.com/LinuxCNC/linuxcnc/pull/2946#issuecomment-2018364607
If you update the po file in older branches, there will be conflicts when merging up or when Weblate wants to push its changes.
I am pretty sure that updating a 2.9 po file will work with this receipe.
I will try it the next time:
github.com/LinuxCNC/linuxcnc/pull/2946#issuecomment-2018364607
Please Log in or Create an account to join the conversation.
Moderators: newbynobi, HansU
Time to create page: 0.075 seconds