ParagonDevelopmentTeam/pioneer — pull request #233 by shadmar (2013-11-28 21:03:16+00:00)
Title: Sync, but abit of a problem (maybe)

several non english core.json lang files was conflicted. I just checkout pioneer ones since the entire json files were in the diff, I guess we probably had CLRF endings or something from notepad editing or similar (not sure)

Anyway the jsons in question where these, and I just forced pioneer/master ones over ours:

# both modified: data/lang/core/ca.json
# both modified: data/lang/core/cs.json
# both modified: data/lang/core/de.json
# both modified: data/lang/core/es.json
# both modified: data/lang/core/fr.json
# both modified: data/lang/core/hr.json
# both modified: data/lang/core/hu.json
# both modified: data/lang/core/it.json
# both modified: data/lang/core/nl.json
# both modified: data/lang/core/pl.json
# both modified: data/lang/core/ro.json
# both modified: data/lang/core/ru.json