search

NicolasGrosjean / Translate_helper

A Java application to help to translate the localisation files of the Paradox games.
31 stars 0 forks source link

Errors translating VIET? #46

Closed Sourenics closed 4 years ago

Sourenics commented 4 years ago

Hi again! I stepped on a "serious" problem that's happening to me. I was translating VIET, when I noticed the program was not only editing the spanish files, but also the english ones, which resulted on continous errors when trying to merge and request pulls. Since I'm noob in al this git and github thing, the only solution I found to the problem created was to delete everything and start over again.

NicolasGrosjean commented 4 years ago

If the English files are edited with space or empty line at line, it is normal. The Translate Helper allow you to edit English file to fix some issues when translating.

I use GitHub Desktop to control what changes are in committed.

With this tool, you can discard changes in English files image

Or choose the lines you want to commit, by clicking on the lines (the blues are committed). image

Sourenics commented 4 years ago

Okay. Thanks for the explanation. And may I ask you for another thing about this git/github thing? How can I keep my fork updated? I mean, imagine I'm translating VIET and the original files get an update on the original repository, how can I update my fork then?

Sourenics commented 4 years ago

And another doubt, will the "No newline at the end of text" be an issue in the future? The original files have no blank line...

NicolasGrosjean commented 4 years ago

To keep your fork updated, you should refresh the repository by clicking on the button to synchronize your repository with Github. image

Then you should merge another branch in your branch. image

Finally choose the upstream/master image

For the newline at the end of the file, it is a minor issue and not so easy to fix because some files ends with empty lines some files not. You have the issue in VIET because it is the beginning of the mod and there is new lines frequently at the end of the file but in other projects, it is rare.

Sourenics commented 4 years ago

Okay, I understood everything. Thanks for your efforts explaining this! It's so much clear now!