Fix i18n autotranslate errors
Final feedback