Various i18n fixes

Response to Raimond's review on Idace81fc.

Change-Id: I882944e6b46b2253b877b261d946802014a70891