Skip to content

Conversation

@xGattoMattox
Copy link
Contributor

Upgrade the WHOLE global ini from the original' translator on Spectrum
There's something i don't understand, how to upgrade from my branch to the main branch?

Upgrade the WHOLE global ini from the original' translator on Spectrum
4.3.0 LIVE 10098575
@xGattoMattox
Copy link
Contributor Author

What's wrong with encoding ?

@ROBdk97
Copy link
Collaborator

ROBdk97 commented Aug 25, 2025

Your PR isn't going through because of a few conflicts that need fixing:

Encoding problem: Your file is UTF-8 but needs to be UTF-8-BOM. Just open it in Notepad++ and go to Encoding → Convert to UTF-8-BOM, or use VS Code/Visual Studio to save it with BOM.

Wrong order: The entries are all mixed up. They need should be in the same order as in the english file.

Duplicates everywhere: You've got the same entries appearing multiple times. Need to clean those up.

Fix these three things, commit, and push again. Should merge fine after that.

For the wrong order and the duplicate entries you can use my tool: https://github.com/ROBdk97/FileEqualizer

@ROBdk97
Copy link
Collaborator

ROBdk97 commented Aug 25, 2025

There seem also to be a lot of missing entries

@xGattoMattox
Copy link
Contributor Author

No missing entries, order verified, encoding is utf-8 bom, duplicates gone.
Do i have to do a new pull request for the new version?

@ROBdk97 ROBdk97 changed the title Update global.ini Italian 4.3 Aug 26, 2025
@ROBdk97
Copy link
Collaborator

ROBdk97 commented Aug 26, 2025

You can just commit it to your xGattoMattox-patch-1 branch. Probably the one you are currently in. It will update your pull request and re-check everything

@xGattoMattox
Copy link
Contributor Author

Ok i've updated in my branch both italian's global.ini and english globa.ini with the 4.3.0 live versions .
I still don't get if my branch is synchronized with your ... i'm so poooor in githubbing :-D

Polishing
Latest
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants