Start to add i18n-support
Fixing merge failure