Adding translations to the client
Merge remote-tracking branch 'upstream/master'