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

Update: Spanish translation #502

Merged
merged 13 commits into from
Jun 23, 2016
Merged

Update: Spanish translation #502

merged 13 commits into from
Jun 23, 2016

Conversation

skitaoka
Copy link
Member

  • add qm files generated from ts files.

gab3d and others added 13 commits March 27, 2016 19:25
Initial commit, copied from the Italian folder.
All strings in files reverted to suggested translations.
# 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. :-/ )
@skitaoka
Copy link
Member Author

Jenkins

@tomosu
Copy link
Contributor

tomosu commented Jun 23, 2016

LGTM

@tomosu tomosu merged commit 1394133 into opentoonz:master Jun 23, 2016
@skitaoka skitaoka deleted the fix/translation/spanish branch July 6, 2016 03:08
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