updated translation resources
updated translation resources
Merge remote-tracking branch 'upstream/master'