fix i18n strings and code formatting

Change-Id: Ic09a222b4083dcc7a898dbb58e8412a6176ce391