Improve translations

Change-Id: Ib5bcbea8c23ceee89cd41399100975d8fd0ff0cf