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

Fix missing translation string #288

Closed

Conversation

shanyin
Copy link
Contributor

@shanyin shanyin commented Nov 30, 2016

Fix missing translation string.

@MartinBasti
Copy link
Contributor

Hello, could you please remove fix miss translation in Chinese and Delete zh_CN.po from this PR?

@shanyin
Copy link
Contributor Author

shanyin commented Dec 1, 2016

Hello,
I am sorry that I sent redundant files. I have tried to remove it, but seem to be failed. It may not be the right way, I try again.

@shanyin
Copy link
Contributor Author

shanyin commented Dec 1, 2016

Hello,
I am sorry that I don't know if I removed it successfully. If not, Should I send a PR again?

@martbab
Copy link
Contributor

martbab commented Dec 1, 2016

Shanyin,

you can try to rebase your local branch interactively against master and just throw out the redundant commits. See https://git-scm.com/docs/git-rebase for more details.

Then force push into your remote branch to update PR.

@MartinBasti
Copy link
Contributor

git rebase -i master fix-missing-translation-string

it will open interactive mode and you can remove all lines (commits) that you want to remove.
Then save that document

@shanyin
Copy link
Contributor Author

shanyin commented Dec 2, 2016

Ok, I have done changes, commit and push operations on local branch.

Thanks! @martbab @mbasti-rh

@MartinBasti
Copy link
Contributor

@shanyin could you force push to github remote branch to have updated PR?

@shanyin shanyin force-pushed the fix-missing-translation-string branch from 10e0f8a to 30dae1e Compare December 5, 2016 01:12
@shanyin
Copy link
Contributor Author

shanyin commented Dec 5, 2016

Oh my god, git rebase or push command has a problem. I force push my local branch to remote branch. Is this time whether meet the requirement?

@MartinBasti
Copy link
Contributor

I pushed just commit fix missing translation string

  • 0499ba5 fix missing translation string

Thank you!

@MartinBasti MartinBasti closed this Dec 6, 2016
@MartinBasti MartinBasti added ack Pull Request approved, can be merged pushed Pull Request has already been pushed labels Dec 6, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ack Pull Request approved, can be merged pushed Pull Request has already been pushed
Projects
None yet
3 participants