Change in Weblate - How to continue?

  • zz912
  • zz912's Avatar Topic Author
  • Offline
  • Platinum Member
  • Platinum Member
More
01 Apr 2024 13:42 #297370 by zz912
I made wrong translate in Weblate in past. I corrected it:
 
What should I do now?

Wrong translate Vel. => G0
Right translate Vel. => Rych.

Vel. is Velocity
Rych. is Rychlost

Will the fix be done automatically after some time, or do I have to send it from weblate to Github somehow?
Attachments:

Please Log in or Create an account to join the conversation.

  • zz912
  • zz912's Avatar Topic Author
  • Offline
  • Platinum Member
  • Platinum Member
More
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.

More
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

Please Log in or Create an account to join the conversation.

Moderators: newbynobiHansU
Time to create page: 0.075 seconds
Powered by Kunena Forum