fix some localization issues
Merge branch 'master' into jstree