move messages from code to bundle messages