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

Translate comments #49

Merged
merged 19 commits into from
Feb 8, 2016
Merged

Conversation

alx741
Copy link

@alx741 alx741 commented Feb 8, 2016

Ok, apparently some merge conflicts where unsolved, but after fix them new conflicts appeared relative to master and everything becomes a huge mess.

So here it is again in a new branch: the translations + the corrections were applied and now it compiles.

andmarti1424 added a commit that referenced this pull request Feb 8, 2016
@andmarti1424 andmarti1424 merged commit 945074d into andmarti1424:master Feb 8, 2016
@andmarti1424
Copy link
Owner

Success. Great job.

@andmarti1424
Copy link
Owner

Hello. Did you based on the main branch or dev branch to do this work?

@andmarti1424
Copy link
Owner

I see you took the main branch. This was my mistake as I should have put the dev branch as the default for pull requests. But now I have both branches messed up, with latest dev branch commits!!

@andmarti1424
Copy link
Owner

I believe I fixed them and now are equal. Now the dev branch is the default branch for pull requests..

@alx741
Copy link
Author

alx741 commented Feb 12, 2016

Yep, i used master. Let me know if help is needed with that

@andmarti1424
Copy link
Owner

Thanks. I changed in the github conf and now dev is the default branch for
pull requests.
I am now fixing some issues with the encoding, but I have noticed the
source files at utils dir are not translated.

2016-02-12 12:26 GMT-03:00 Daniel Campoverde Carrión [alx741] <
notifications@github.com>:

Yep, i used master. Let me know if help is needed with that


Reply to this email directly or view it on GitHub
#49 (comment).

Andrés Martinelli

@alx741
Copy link
Author

alx741 commented Feb 12, 2016

Fool of me, didn't even notice the utils dir! Working on it...

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.

2 participants