update translation n show page
Merge remote-tracking branch 'upstream/master'
merge
fix en.yml
manual merge
more merges