update translations
Merge branch 'master' into ffs