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

Spanish UI translation - 100% done. #382

Merged
merged 11 commits into from
Jun 23, 2016
Merged

Spanish UI translation - 100% done. #382

merged 11 commits into from
Jun 23, 2016

Conversation

gab3d
Copy link
Contributor

@gab3d gab3d commented Jun 1, 2016

Hi,
I have (finnally) completed the first version of the Spanish UI translation.
I hope to improve it further in the future via user feedback.
Thanks!

@ghost
Copy link

ghost commented Jun 1, 2016

That's awesome! Gracias.

@gab3d
Copy link
Contributor Author

gab3d commented Jun 13, 2016

Hi,
Sorry to ask, but I don´t know if this commit is being taken into account.
Since it says it has "conflicts" I don´t know if I must do something before commiting?
Any info about it would be welcome.
Thanks!! :)

# Conflicts:
#	toonz/sources/translations/spanish/colorfx.ts
#	toonz/sources/translations/spanish/tnzcore.ts
#	toonz/sources/translations/spanish/tnztools.ts
#	toonz/sources/translations/spanish/toonz.ts
#	toonz/sources/translations/spanish/toonzlib.ts
#	toonz/sources/translations/spanish/toonzqt.ts
(Hopefully this time it will not make conflicts. :-/ )
@tomosu tomosu merged commit 8264171 into opentoonz:master Jun 23, 2016
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.

None yet

3 participants