Use localized labels, fix conflict [#79015346]