update translation
Merge branch 'master' into multisite