New Crowdin updates - Githubissues

Crazy-Marvin / PimplePopper

Game to pop pimples using the awesome Godot Engine

https://crazymarvin.com/pimple-popper/

MIT License

33 stars 16 forks source link

New Crowdin updates #113

Closed CrazyMarvin closed 1 year ago

rockgem commented 1 year ago

this commit has a very confusing merge conflicts lmao.

rockgem commented 1 year ago

this commit has a very confusing merge conflicts lmao.

i will try fixing them tho

rockgem commented 1 year ago

Conflicts needs fixing:

there are HEAD >>>>>> and "===========" everywhere and it is very difficult to track down which are to remove.

CrazyMarvin commented 1 year ago

May you please have a look, @Andrulko?

rockgem commented 1 year ago

merge conflicts resolved: I have completely removed the unnecessary .csv files since we are not using them in the game anyways. :D

CrazyMarvin commented 1 year ago

@JordanMotta used the .csv files for the translation workflow if I understood correctly. I am not sure about the details though. He sent me this.

rockgem commented 1 year ago

yea, i know but there were unnecessary csv files that aren't event being used in the game. i think we only needed the translations.csv the other ones are not.

CrazyMarvin commented 1 year ago

yea, i know but there were unnecessary csv files that aren't event being used in the game. i think we only needed the translations.csv the other ones are not.

Alright, then I will merge now. 👍

rockgem commented 1 year ago

awesome!

Andrulko commented 1 year ago

I've seen it only now 😬 All good now? I see <<<<<<< HEAD in the source as well, probably it should be removed to prevent future conflicts? https://github.com/Crazy-Marvin/PimplePopper/blob/development/assets/i18n/translation.csv#L1

CrazyMarvin commented 1 year ago

I've seen it only now grimacing All good now? I see <<<<<<< HEAD in the source as well, probably it should be removed to prevent future conflicts? https://github.com/Crazy-Marvin/PimplePopper/blob/development/assets/i18n/translation.csv#L1

Thanks for checking, @Andrulko! 👍

I removed the <<<<<<< HEAD and <<<<<<< development entries. Please check, @rockgem & @Andrulko.

Andrulko commented 1 year ago

What about this? https://github.com/Crazy-Marvin/PimplePopper/blob/development/assets/i18n/translation.csv#L2096

Same here: https://github.com/Crazy-Marvin/PimplePopper/blob/development/assets/i18n/translation.csv#L2159

I tried importing your file to my test project, it's broken... I'll play a bit more with it

Andrulko commented 1 year ago

Just checked in LibreOffice Calc, it's not processed well. Everything goes wrong starting from this line: https://github.com/Crazy-Marvin/PimplePopper/blob/development/assets/i18n/translation.csv#L24

It looks like content got duplicated

You have many column headers, there should be only one, I suppose. Here are a few samples: https://github.com/Crazy-Marvin/PimplePopper/blob/development/assets/i18n/translation.csv#L26 https://github.com/Crazy-Marvin/PimplePopper/blob/development/assets/i18n/translation.csv#L51 https://github.com/Crazy-Marvin/PimplePopper/blob/development/assets/i18n/translation.csv#L82 https://github.com/Crazy-Marvin/PimplePopper/blob/development/assets/i18n/translation.csv#L82

CrazyMarvin commented 1 year ago

Oh, now I see it. I just uploaded a fixed version, @rockgem and @Andrulko with commit 16a10d30a97cb711b5423b04966a92b74065e95e.

Andrulko commented 1 year ago

It looks much better now 😁

CrazyMarvin commented 1 year ago

Thank you so much for your help. 😘