Updated resource translation file
Pulled resource translation files from Transifex
Merge branch '1.2.x' into develop