Added partial internationalization support
Added partial internationalization support