Gabriel Gazzán 72b5b10529 Merge branch 'master' of https://github.com/opentoonz/opentoonz ... # 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		2016-06-22 22:26:15 -03:00
..
chinese	Update Chinese translation again (#461)	2016-06-17 18:45:49 +09:00
french	Support German translation (#363)	2016-05-27 14:27:54 +09:00
german	Support German translation (#363)	2016-05-27 14:27:54 +09:00
italian	Support German translation (#363)	2016-05-27 14:27:54 +09:00
japanese	New option to retain original styles when loading color model's palette (#407)	2016-06-07 18:43:49 +09:00
spanish	Merge branch 'master' of https://github.com/opentoonz/opentoonz	2016-06-22 22:26:15 -03:00