Add translation to some bits and bobs
Merge commit 'ad0f8c9'

Add translation to some bits and bobs