Skip to content
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

Closed
wants to merge 1 commit into from
Closed

Conversation

@SimplyRyan
Copy link
Contributor

SimplyRyan commented Jan 30, 2014

Re-formatted file, all current 0.40 strings translated (thanks mec).

Re-formatted file, all current 0.40 strings translated (thanks mec).
@mrtnptrs

This comment has been minimized.

Copy link
Member

mrtnptrs commented Mar 20, 2014

GitHub sais there are conflicts, so it can't automaticly merge.... How can this be fixed?

@mrtnptrs mrtnptrs added the Patch label Mar 20, 2014
@MarkL1961

This comment has been minimized.

Copy link
Contributor

MarkL1961 commented Mar 20, 2014

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.

@SimplyRyan

This comment has been minimized.

Copy link
Contributor Author

SimplyRyan commented Mar 20, 2014

I think its conflicting as I re-ordered the entire file as it was getting a
little messy. Feel free to roll this in, I will review it later for the
missing strings.

On 20 March 2014 15:47, MarkL notifications@github.com wrote:

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.

Reply to this email directly or view it on GitHubhttps://github.com//pull/158#issuecomment-38183593
.

@MarkL1961

This comment has been minimized.

Copy link
Contributor

MarkL1961 commented Mar 20, 2014

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

@SimplyRyan

This comment has been minimized.

Copy link
Contributor Author

SimplyRyan commented Mar 20, 2014

Perfect, thanks Mark.

On 20 March 2014 15:54, MarkL notifications@github.com wrote:

The change was in issue #192https://github.com/CorsixTH/CorsixTH/pull/192and 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


Reply to this email directly or view it on GitHubhttps://github.com//pull/158#issuecomment-38184526
.

MarkL1961 added a commit to MarkL1961/CorsixTH that referenced this pull request Mar 21, 2014
@mrtnptrs

This comment has been minimized.

Copy link
Member

mrtnptrs commented Apr 1, 2014

Conflict here, probably caused by issue #237

@TheCycoONE

This comment has been minimized.

Copy link
Member

TheCycoONE commented Aug 20, 2014

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.

@SimplyRyan

This comment has been minimized.

Copy link
Contributor Author

SimplyRyan commented Oct 15, 2014

I will close this out and submit a new pull request this week as I'm currently updating translations at the moment.

@SimplyRyan SimplyRyan closed this Oct 15, 2014
@Alberth289346 Alberth289346 removed the 0.40 label Apr 3, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.