fixed translation blocks
update translation files from transifex [skip ci]
Merge branch 'master' into 1245_and_1260_updates