#995 in one commit
Huge translation update
Merge pull request #1006 from turbedi/master

#995 + Huge translation update