Localisation updates

Change-Id: Ic386d95e9b5abbd29d4acebadc165144e88faefb
(cherry picked from commit d9b191dea117aa6354f8a60bd637a9358c826a68)