Added i18n support

Change-Id: I586b0e604951b158ef1f6f0adbc31a61489f0047