Modernize i18n file, clean up code

Change-Id: I8f2a99410292e54d863f754375a7045db7974a55