i18n and lint

Test Plan: make lint

Auditors: peter