Some more i18n file tweaks.

Change-Id: I067c3b17b2af7a169a13e5e393eedf7f440f807b