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

Translation from English to Portuguese Finished. #1279

Merged

Conversation

KoreaComK
Copy link
Contributor

Translation from English to Portuguese Finished.

@ben-kaufman ben-kaufman mentioned this pull request Jul 8, 2021
@ben-kaufman
Copy link
Contributor

Thanks! Just need this fix and we could merge KoreaComK#1

@KoreaComK
Copy link
Contributor Author

Hey @ben-kaufman ,
I merged the PR.
Cheers!

@ben-kaufman
Copy link
Contributor

Thanks, I just merged the first Portugese PR and I see there are conflicts. Would you need help to resolve it?

@KoreaComK
Copy link
Contributor Author

Hi @ben-kaufman , I think that I need help because i didn't find the conflicts that github are saying that has.

@KoreaComK
Copy link
Contributor Author

I tried to change a line to see if it solve the conflicts, but I doesn't.
image
It seems that I can't see the conflicts too.

@kdmukai
Copy link
Collaborator

kdmukai commented Jul 8, 2021

I fixed the conflict in the Portuguese .po file and merged the latest two commits in from master.

@KoreaComK
Copy link
Contributor Author

Thanks @kdmukai :)

@ben-kaufman ben-kaufman merged commit ab4049a into cryptoadvance:master Jul 8, 2021
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.

None yet

4 participants