Translation fixes and separation on groups with merge of user module translations