Merge branch 'statusmessage-translation'