i18n fixes and improvements (fixes #210)