Localisation tweaks

Based on review while translating the application.

Change-Id: Id31e15a4d2f28348ed4b8ddc9d9e90a754aa81ff