Fixed folder mismatch for translation values
Merge branch 'master' into 1.2