Fix to the media listings in the media dropdown
Merge branch 'master' into translations
Fix some translation tokens. make translate should run build.js too