Localisation updates

Change-Id: I3e9409caca72e8d63032e872019bb6b3001bc360
(cherry picked from commit ad6d2be9d8de40b3ddd046b665d273178a0968c6)