precautionary measure.. check if "show_names" is set before using
add i18n and make it consequent throughout
Merge branch 'master' into trunk