2138 replies to this topic

[mcfly82]

Did I overwrite something? That wasn't the plan.

 

The problem is with the unplanned two way merging is that you get merge conflicts when translations are made for both. There shouldn't be much of an issue, as enigma is virtually identical in develop and rc? 

 

If you can tell me what went wrong, I can recover it.

 

Hello WanWizard,

 

yes, you reverted in this commit the translations:

https://github.com/O...5f13e9372f55a4b

 

I think that this was not the plan

What should we do now? (Not only my translation, but also Pr2's is affected). Should we do another pull request of these trnaslations into 'develop' branch?

[WanWizard]

No, it clearly wasn't.

 

If you can tell me commit contains the correct version, I can restore them from git history. We have to be careful, for example for fr.po in the meantime there has been another commit in develop, so that can't be restored.

[mcfly82]

This was the commit with the latest hungarian translation:

https://github.com/O...168ed8002c5d9bb

Please merge this into the develop (or rc? I don't know...) branch.

 

I checked, no commit was on hu.po since 13th April, so I think it is no problem:

https://github.com/O...evelop/po/hu.po

 

Another question: is there newer .pot file (since 17th April), so should I update the translation?

[WanWizard]

I think a recent pot file was posted yesterday in this thread, but I can't remember if it was rc or develop. 

 

We really need a better way to translate, and we need a more stable and predicable develop so we don't need translations in both places.

 

That commit was in develop, so I'll recover it, and re-apply it into develop.

[WanWizard]

I can't re-apply it, if gives a merge conflict, so there where other changes. If the previous update was from 13-04, those are the changes from rc that I can overwrite?

[mcfly82]

Oops, I don't know. I think yes, but I'm not sure.

Besides I updated the hu.po from the latest .pot file (see Pr2 post #1491). I finished the translation, so I will upload soon the latest translation, but this time into the 'develop' branch.

I it doesn't cause conflict, everything will be good and up-to-date

[WanWizard]

Ok, in that case, I'll do nothing. 

[mcfly82]

Ok, in that case, I'll do nothing.

...just hopefully merge the commit if travis-ci build passes
Thank you for all your help!

Edited by mcfly82, 24 April 2018 - 13:37.

[Gringosat]

We really need a better way to translate, and we need a more stable and predicable develop so we don't need translations in both places.

 

I agree that an online tool for translations should be appreciated where anyone can collaborate without need to:

 

- download .po and .pot files

- install Poedit

- load the .po file in Poedit

- update the catalog with a .pot file

- translate the strings

- put the final translation on the forum (or use a Github account to fork and create a new PR in different branches)

 

I found some online tools (but most require a subscription, other are opensource):

 

https://crowdin.com/

https://www.transifex.com/

https://launchpad.net/+tour/index (used even for Ubuntu translations)

http://pootle.translatehouse.org/ (opensource, need to be installed)

https://weblate.org/en/ (opensource) with good integration with Github repository

Edited by Gringosat, 24 April 2018 - 14:08.

[WanWizard]

Yes, I've been looking at it, but I didn't have time yet to implement it. Weblate looks interesting though.

[Gringosat]

I think Weblate is the most interesting for developers and translators since everything is in the same repository and integrate well:

 

https://docs.weblate...continuous.html

 

Here it's the demo:

 

https://demo.weblate.org/

Edited by Gringosat, 24 April 2018 - 14:20.

[Gringosat]

More, you can create documentation from the source on the fly using http://www.sphinx-doc.org/en/master/

[WanWizard]

I don't really believe in generated documentation.

 

It generates a cross-ref, but not why something was implemented, nor what it functionally does (or supposed to do), which is most important for documentation. Another challenge is that Enigma is a realtime system, which means it is littered with async processes and callbacks, most generators make a mess of that...

[Pr2]

Hi,

 

From my point of view it would be nice if the enigma2.pot file was generated at each build but not applied to the .po files. So those file remains untouched.

 

So translators can download the .po file and the (daily) generated enigma2.pot file and start translating with PoEdit.

 

I have also experience with Crowdin.com where I also perform translations and it is not a better approach. It is not because it is online that it is better and that you get more translators to do the job.

 

The boring part here is to propose the translated files, we need to have a github account, to fork, to clone to push the file, create a pull request...

 

I am not a github expert, so when I try to keep in-sync OpenPLi and my fork, each time I submit a pull request we saw the full history of my sync which is not nice.

I would like to be able to keep my fork in-sync with OpenPli and being able to easily create clean pull request (I was advised to delete my fork and then fork again it is working but this is probably not the most efficient way of working).

 

Pr2

[zeros]

I do also so- I delete my old fork and then fork again. It's a lot easier to do so, than to keep in sync with all of the changes. Clean and quick way.

[Pr2]

More, you can create documentation from the source on the fly using http://www.sphinx-doc.org/en/master/

 

And you don't need such tools if the code itself is well self-documented which is not the case with Enigma2 there are nearly no comments in the source code.  So you need to reverse it to understand what is done.

[mcfly82]

Hello,

 

sorry, but I don't understand the branches,

I committed a hungarian translation yesterday. WanWizard merged it to the 'develop' branch.

But tonight I downloaded the newest 6.2rc, and I see that my translation is not in it. There is a much older version (exactly that version which is in the 'rc' branch in github).

Last time when I committed the translation to the 'rc' branch, it was abandoned by a merge commit.

So how can I achieve that my translation be in the 6.2 rc image?

[Frenske]

I also was under the impression that all translations based on the POT from PR2 were supposed to be meant for the RC. But, as I am defenitely no specialist, my knowledgelevel is far to low, I could be wrong.

[MCelliotG]

The submitted translations will not appear on RC 6.2 until it's synced with the develop branch again. This happened last a few days ago so any translation submitted after that will not be updated immediately.

[MCelliotG]

Btw I updated the Greek translation for OpenWebif!

Edited by MCelliotG, 26 April 2018 - 02:14.