@ Talented Doge: You need a compatible font for it. For Chinese, search your C:\Windows\Fonts folder for Microsoft YuHei UI Regular (File name is msyh.ttc). Copy it to *CS2D root*\gfx\fonts. Then add this in the language file:
1
font=msyh.ttc
That was the one I used, but you might not have it if you have a different OS (I have Windows 10).
Fairly sure Bitbucket fucked up with the encoding type in the previous commit back then and now all characters with diacritic are turned in A. Luckily, the last commit didn't screw up with the characters encoding so that's a good point. It'd be appreciated if you can update CS2D again by replacing the last updated translation file only.
Bump: Unfortunately I have lost access to my Bitbucket account thus I'll get the advantage of File Archive to update the translation file. If you, DC, can implement my updated Italian Translation for CS2D (14) when you have your spare time it'll be a pleasure.
@ DC: I hate to bother you but a few days ago I helped some friends to create a pull request for Spanish, and there's an error and I'm not really sure how to fix it, I'm pretty new at bitbucket tbh.
I made a new commit changes to check if this can be fixed.
@ DC: I hate to bother you but a few days ago I helped some friends to create a pull request for Spanish, and there's an error and I'm not really sure how to fix it, I'm pretty new at bitbucket tbh.
I made a new commit changes to check if this can be fixed.
Well.. By resolving conflicts manually it means that you open your source and git's source and add your update manually.
Conflicts can appear when you're commiting old version of the translation. For example actual version is r15535, someone edited it and commited, so new version is r15536, and you also commited your version which is r15535, and tada, conflict, because you didn't update the file before rewritting.. There are merging and conflict solving tools.
Yes, someone else already updated the Spanish language file recently. So there are changes from two different sources and the system can't decide automatically which changes should be used. You have to do that manually.
Unfortunately I can't judge which changes to use because I don't understand Spanish at all...
I sent a message on bitbucket, anyways I'm leaving the same message here just in case.
Quote
Well, this was made by a team in Spain, there are a few things different from South America / Latin. Based on diacritics and words approved by RAE. Maybe this can be selected as Spanish (International) file. Like Portuguese from Brazil and Portugal.
Which version is international Spanish? Yours or the other one? Of course we can introduce 2 Spanish translations if it makes sense.
btw regarding Chinese: Chinese is now available as separate download because it requires quite a big alternative font containing all the required characters. It is available from the cs2d download page / here: http://www.unrealsoftware.de/get.php?get=cs2d_chinese.zip
(just extract to your CS2D folder)
LOL, I know. To avoid more issues, I will create a new pull request with the Spanish International (Spain), so you can leave the actual Spanish file as South America Spanish. What do you think?