Files
Chronos/tests/Chronos.Core.Tests
Alby96andClaude Opus 5.5 6e00c3c996 merge: bring phase 4b's final code (v0.1.0-rc.7) into phase 5a
Phase 5a was cut from an earlier phase 4b commit (e3cbe30b). This merges the
final 4b head 11d2c67e (squashed into main as efa87f68): fix rounds 2-3 of
the mass conversion and the replaced-photo trash, the residuals, the 4b
strings in the 36 other languages, and 4b's docs, so 5a builds on the code
that was released.

Conflicts:
- JobRepository: 5a's ListPendingAsync (the workspace copies of a sequence)
  and 4b's ListHoldsAsync (what running and paused jobs hold, without the
  parameters) are both kept.
- ARCHITECTURE: 4b's rows and paragraph kept whole, 5a's additions
  (projects, workspaces, the Edit picker, the WorkspaceCopy job) laid onto
  them; both paragraphs kept.

The resx files merged cleanly: the 36 other cultures hold 4b's
translations, and 5a's new keys stay untranslated there. JobKind values are
unchanged (Backup 16, Cleanup 17, EmptyTrash 18, Convert 19,
WorkspaceCopy 20).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 15:44:47 +01:00
..