-
Notifications
You must be signed in to change notification settings - Fork 41
Italian 4.3 #597
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Italian 4.3 #597
Conversation
Upgrade the WHOLE global ini from the original' translator on Spectrum
4.3.0 LIVE 10098575
|
What's wrong with encoding ? |
|
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 |
|
There seem also to be a lot of missing entries |
|
No missing entries, order verified, encoding is utf-8 bom, duplicates gone. |
|
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 |
|
Ok i've updated in my branch both italian's global.ini and english globa.ini with the 4.3.0 live versions . |
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?