i18n escape html, navigator userLanguage, clean up code
Merge pull request #1025 from latzt/master

i18n improvements