Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Updated string translations
Updated file
Updated string translations
Merge pull request #894 from ngonchan/master

Updated string translations.