Further translation work

Change-Id: Ied17901ac87824d85f0eb3c2cd6772c5e32e7e55