Localisation updates

Change-Id: I85da0be734b9a9d362f91164f13bd2d73176bcb8
(cherry picked from commit 6710f8dd06d692c39ff566ca051e061d79b6814b)