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

Pull request for Croatian translation of TGM-Plugin-Activation #573

Closed
wants to merge 2 commits into from
Closed

Pull request for Croatian translation of TGM-Plugin-Activation #573

wants to merge 2 commits into from

Conversation

dingo-d
Copy link
Contributor

@dingo-d dingo-d commented May 1, 2016

I've added the Croatian translation of the TGM-Plugin-Activation, up for a review.

dingo-d added 2 commits May 1, 2016 17:55
Added Croatian translation of the TGM-Plugin-Activation
@jrfnl
Copy link
Contributor

jrfnl commented May 2, 2016

Hi @dingo-d Thank you very much for creating this translation.
Would you mind squashing the commits and issuing the pull request against the feature/additional-translations branch ? That way it will become part of PR #564 where I'm currently collecting the latest versions for the 2.6.0 release.

@jrfnl jrfnl added this to the 2.6.0 milestone May 2, 2016
@dingo-d
Copy link
Contributor Author

dingo-d commented May 2, 2016

Hi! No problem. I'm a bit green in the Git commit/pull requests, I just change the branch from develop to feature/additional-translations and make a new pull request, right?

@jrfnl
Copy link
Contributor

jrfnl commented May 2, 2016

Hi @dingo-d,

I'm a bit green in the Git commit/pull requests

Not to worry, we all were once ;-) I'm happy to help you along. Let me know if you have any questions.

I just change the branch from develop to feature/additional-translations and make a new pull request, right?

Yes, that should work.

Pro-tip (for the future): you can create a new branch at any commit or branch, so you could branch off the feature/additional-translations and then pull against it. This will avoid conflicts in case the develop branch would have moved on already.

@dingo-d
Copy link
Contributor Author

dingo-d commented May 2, 2016

Ok so I deleted the old fork and created a new one, but this time from feature/additional-translations and I made a pull request to it, I hope it's ok now.

@jrfnl
Copy link
Contributor

jrfnl commented May 2, 2016

Thanks @dingo-d Sounds good, however I don't see the PR yet ? Did you do the PR against this repo or against your own fork ? It needs to be against this repo for me to be able to merge it in.

@dingo-d
Copy link
Contributor Author

dingo-d commented May 2, 2016

I guess I did something wrong, I can see the PR now #574 Is this ok?

@jrfnl
Copy link
Contributor

jrfnl commented May 2, 2016

Absolutely! Thank you so much for bearing with me on this. I've merged it now ;-)

@jrfnl jrfnl closed this May 2, 2016
@dingo-d
Copy link
Contributor Author

dingo-d commented May 3, 2016

No problem, happy to help and learn a bit in the process :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants