mirror of
https://github.com/storytold/lightcraft.git
synced 2026-10-24 10:09:01 -06:00
francoisgnandClaude Opus 5.5
144d900c21
Conflicts: - apps/lightcraft/src/native_menu.rs: upstream's item swapping (macOS keys given up for real, Help menu not swapped, Settings / Quit tracked) with KEY-GRID's keymap-aware rows. `Item.label` stays the text the row shows (native_item_presentation), so `Item::native_label` reuses it instead of formatting it again; Settings / Quit store theirs through display_item_label, as upstream's native_label did. No early return after a rebuild (upstream). - crates/ui-egui/src/i18n.rs: upstream's tests (#2729: one test per check across languages, gaps reported, never a failure) plus the batch's two new ones (dropped-photos notice, Polish counts); production code as merged. - grid.rs, keyword_list.rs, masking.rs: the translation tests #2729 removed stay removed; the batch's new keyword and segmenter tests stay. - cmd/library.rs, ui-egui/src/lib.rs: both test modules, each with its #[cfg(test)]. - xtask/src/main.rs: #2302's test_selected and upstream's translation_gaps. - docs: tracker / gap rows take both sides' edits, headers list both sides' changes, history rows of both sides newest-first. What's New: one section per date, newest first (the batch had 10-22 above 10-23, and second 10-21 and 10-19 sections); no line lost. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>