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

Add Korean language #240

Merged
merged 1 commit into from
Sep 6, 2016
Merged

Add Korean language #240

merged 1 commit into from
Sep 6, 2016

Conversation

diluculo
Copy link
Contributor

@diluculo diluculo commented Aug 25, 2016

Last sibling of #237

@tgjones
Copy link
Owner

tgjones commented Sep 4, 2016

Please could you rebase this?

@diluculo
Copy link
Contributor Author

diluculo commented Sep 5, 2016

Done.

@tgjones tgjones merged commit ad13cda into tgjones:master Sep 6, 2016
@tgjones
Copy link
Owner

tgjones commented Sep 6, 2016

Thank you!

@diluculo diluculo deleted the 215_Korean branch September 6, 2016 08:12
@EchterAgo
Copy link
Contributor

EchterAgo commented Sep 13, 2016

Hmmm, I don't know how but somehow this commit includes the text for AdvancedSliderCommitErrorFormat from #192 which has not been merged yet.

7d94cf9e (diluculo 2016-09-05 13:39:32 +0900 267) <data name="AdvancedSliderCommitErrorFormat" xml:space="preserve">

@diluculo
Copy link
Contributor Author

After rebasing and resolving conflicts, I opened ResXManager and noticed the key was included. But I couldn't find it in codes, so I simply ignored it.

I can't find it in all my local branches, but it's more reasonable to say my initial PR had it, By the way, how can I fix this? new PR removing the key? or wait until the AdvancedSlider was introduced?

@EchterAgo
Copy link
Contributor

Yes, you fix it by PR removing the key, or maybe I can get the advanced slider merged soon. Maybe it was my mistake when I cleaned up your initial PR.

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.

3 participants