Cleanup some i18n and fix documentation

Change-Id: I11fdb902794c20a18afc478094bfc38599b85dea