some i18n adjustments
updated version