Gmoccapy - czech translate#1874
Conversation
I made a translation for Gmoccapy. This is not a literal translation, but a translation that is user friendly. Contains many untranslated phrases. I am of the opinion that the original text is better than a bad translation.
I totally agree. @petterreinholdtsen, @silopolis Is the following the correct order for adding this new language to Weblate?
Or should the new language created first on Weblate? |
|
[Hans]
@petterreinholdtsen, @silopolis Is the following the correct order for
adding this new language to Weblate?
1. Accept this PR
2. Merge 2.8 to master
3. Create a new language on Weblate
Or should the new language created first on Weblate?
As long as the language is not yet on Weblate, you only need to accept
the PO file into master (via 2.8 if you want), and then pull the new PO
file into Weblate using the 'pull' option.
If the language is already listed on Weblate, this will cause a merge
conflict and the translator should put his texts directly into Weblate
after setting up the new language there.
…--
Happy hacking
Petter Reinholdtsen
|
|
If this cs.po file is also added to the main branch, will it be possible to change it directly? I don't know how Weblate works, I'm fine with Poedit, but I don't want to create any problems in the future if I change the cs.po file directly without solving anything with weblate. |
|
Thanks Petter!
If you plan to extend/improve this po file for 2.8 in the next time, we should better postpone this PR. When it's in Weblate, it should be only edited there. And getting these changes back to 2.8 would probably cause conflicts as well. |
|
[zz912]
If this cs.po file is also added to the main branch, will it be
possible to change it directly? I don't know how Weblate works, I'm
fine with Poedit, but I don't want to create any problems in the
future if I change the cs.po file directly without solving anything
with weblate.
Modifying it directly in git after the initial commit will cause
problems in the future. Modifications both places will cause git
conflicts. And we get 'drive by translations' on Weblate, random people
showing up to help with the translations unannounced. The number of
translators have increased 40% since last month already. This tell me
that it is likely that someone will update the translation on Weblate
too. I strongly suggest you checkout Weblate as a translation option,
to avoid git conflicts.
…--
Happy hacking
Peter Reinholdtsen
|
|
I studied many videos in Youtube aboat git an Github and I am not sure about right working. I dont understand:
Exist some automatic proces for merging from master branche to 2.8 branche? I'm not against weblate, but my main goal was to translate for version 2.8 |
|
We are using the merge upward workflow, that means 2.8 is merged more or less regularly into master. So the cs.po will go to master at some point. And then be modified by Weblate. And if you then make changes in 2.8 it would cause merge conflicts on the next merge from 2.8 to master.
No.
Providing an initial version for 2.8 is no problem. Only changes to this afterwards would cause conflicts. |
|
Is there any way to split cs.po for version 2.8 and for master version? |
|
[zz912]
Is there any way to split cs.po for version 2.8 and for master
version?
Are you volunteering to get deep into git, LinuxCNC and Weblate and
maintain cs.po in LinuxCNC using a special system only for this file? I
am sure there are ways to special case it, but I doubt anyone else will
be volunteering to maintain such system.
…--
Happy hacking
Petter Reinholdtsen
|
|
The only possibility I see is to commit the changes of cs.po to 2.8 and then merge 2.8 immediately to master and select the changes from master on conflicts, so that the file doesn't change on master. But this is a bit risky if someone else does the merge and don't know about this. |
I don't want to do anything risky. I discussed this problem with a Czech-speaking programmer over the phone. The solution could be something like this: Let's do everything as HansU suggested first. As soon as I make another Pull request for cs.po for the 2.8 branch, I will put in the message:
Do you think this is a clean solution? Currently, HansU has done some bug fixing that affects the cs.po file. Therefore, I would like to ask you to hold this Pull Request until I process all the information that HansU sent me on the forum. |
|
If you want to hold back this PR, you can click "Convert to draft" in the upper right corner in the "Reviewers" section, then everybody knows that there is work in progress.
Better: "Warning: After merging this PR, please merge the 2.8 branch immediately into master and make sure the changes from this file don't go into master" Because with your message you cannot prevent that the merge will be done at some time later. |
|
Hm. First off: I am very happy for CZ translations - welcome!!! Just, how to get there. I am somewhat confident that all translation work should be done via weblate. And since these strings change in the English all the time, we would have conflicts between 2.8 and 2.9 all the time. Since 2.9 should surface somewhen in the not too far future, I suggest to not touch 2.8 for CZ at all and focus with all your might on 2.9 and getting that out of the door. |
|
I would like to finish the Czech language for 2.8. I devoted a lot of time to it. HansU helped me a lot to fix the errors that were in 2.8 and were related to the translation. I hope there will be a version 2.8.3. Currently the translation is stuck on the problem of poorly generated pot files in version 2.8. It is fixed in version 2.9, but if we keep telling ourselves that it is not worth maintaining a stable version of LCNC, then a good stable version will never exist. |
|
Hello, I made last change for translate Gmoccapy for LCNC 2.8. I would like ask you only for merge to Branche 2.8 . I am not sure If I will have enough time for version 2.9 with Weblate. So I don't want to oblige anyone else. I made query in forum https://forum.linuxcnc.org/37-international-linuxcnc-users/46703-split-po-files-weblate-manual |
|
Nice, I'll merge it later.
I answered 😉 |
|
Yes, this was my mistake. I uploaded two same files. Now it is correct. |
|
The Czech translation is now on Weblate 🎉 |
4 participants
I made a translation for Gmoccapy. This is not a literal translation, but a translation that is user friendly. Contains many untranslated phrases. I am of the opinion that the original text is better than a bad translation.