Use localisation where user visible strings are used

Change-Id: I224e3faaf7d6fcf0e3db807646028633a532a78b
Merge "Use localisation where user visible strings are used"