mirror of
https://github.com/storytold/gridcraft.git
synced 2026-10-29 05:06:51 -06:00
Bryan MarkandClaude Opus 5.5
ed7681ae0c
Brings the branch up to upstream's main (132 commits). Two conflicts, and one thing the merge needed that was no conflict: - crates/ui-egui/src/i18n/fr.rs: upstream rewrote the French catalog's lines this change sits among. Upstream's lines are kept, and the ten new entries are put back where they were, with the plain apostrophe the catalog now uses. - docs/ui-parity.md: both changes are of the same day. Both rows of the history are kept, and the heading line names this change. - crates/ui-egui/src/i18n/sr.rs: upstream gained a Serbian catalog, and every string must be in every catalog. The ten new strings are given their Serbian (Latin script, as the catalog is). Weeks, months and years are shortened, as in the Russian catalog: their endings change with the number. Gate: all eight steps, 1415 tests. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>