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
Language: Polish update for 0.40. #158
Conversation
Re-formatted file, all current 0.40 strings translated (thanks mec).
GitHub sais there are conflicts, so it can't automaticly merge.... How can this be fixed? |
I think the polish file has had an update recently, so perhaps this conflicts with the above changes. If it is that, then simplyryan will need to include that recent change - I think it was only one line anyway, so not a big change to do. |
I think its conflicting as I re-ordered the entire file as it was getting a On 20 March 2014 15:47, MarkL notifications@github.com wrote:
|
The change was in issue #192 and was only new_game = "Zacznij grę od samego początku", So it will be simple enough for you to add this again if that line gets lost when this is merged |
Perfect, thanks Mark. On 20 March 2014 15:54, MarkL notifications@github.com wrote:
|
Conflict here, probably caused by issue #237 |
The commit referenced by @MarkL1961 seems to change the file format so every line conflicts with @SimplyRyan 's pull request. I attempted to copy the translation out of MarkL's comment but it didn't preserve the diacritics. Could one of you add that line, and double check that nothing else has changed since this pull request was made. I'd like to have it merged in time for 0.40 Edit: I can resolve any merge conflicts, as long as the final file is correct. |
I will close this out and submit a new pull request this week as I'm currently updating translations at the moment. |
Re-formatted file, all current 0.40 strings translated (thanks mec).