Conflicts: - crates/ui-egui/src/i18n.rs: language registration lines kept from both sides (Language::ALL has 16 entries). - docs/localization-parity.md: both revision rows kept.