Updating translations
Merge branch 'master' into replacing_charts2