translations updates
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
working on #8
working on #8
working on #8
working on #8
working on #8 and #812
Merge pull request #813 from neo22s/master

work on #8 and #812