Fix variable names to give context for translators

fix other various i18n issues