* Replace resolve dependency with attribute in components * Add changes that went missing in translation