Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Add chinese translations for import button
and update upgrader messages
Merge pull request #719 from BramChen/master

Update chinese translations