Localisation updates

Change-Id: If4682209a627ba75942913b07414ee02d04cb33c
(cherry picked from commit 3d1e8754e2ad601c8e50f3179f5a42cfaaf26ba7)