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

Update chinese translations
Add theme toolbar button
Fix styling of "more" page button
Merge branch 'master' into fr-FR
fr-FR translation for Theme-related Button strings