Claude 3d808d9238 Merge remote-tracking branch 'origin/main' into claude/happy-mccarthy-kdhg2s ...

main's string changes collided with this branch by construction: it added seven
keys and a Crowdin sync to exactly the res/values files the migration emptied.

The Android res tree keeps this branch's migrated subset. Everything main added
there that carries meaning moved to the catalog instead: the seven new keys, and
five new ru translations for keys this branch had already moved (the catalog's
ru file did not have them, so taking our side alone would have dropped them).
The one line not carried over is an orphaned Crowdin comment for video-credit
keys that exist in neither tree; the next sync will re-emit it wherever it
belongs. marmot_groups_title was already in the catalog, so only main's copy
was taken.

main also refactored both unread badges onto a shared ChatUnreadBadge; that
version is kept, with the catalog swap applied on top.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01AXvKXakvup4inNFfAhhr4L

2026-09-22 21:23:06 +00:00

..

plans

docs: record wave 1's outcome, including the tier that had to stay on Android res

2026-09-22 20:07:00 +00:00

src

Merge remote-tracking branch 'origin/main' into claude/happy-mccarthy-kdhg2s

2026-09-22 21:23:06 +00:00

.gitignore

Starting a new module for app benchmarks

2024-02-05 18:18:33 -05:00

ARCHITECTURE.md

docs(commons): the cache's sorted store is what blocks commonMain

2026-09-21 02:36:59 +00:00

build.gradle.kts

fix(commons): declare okio so the Apple targets compile after the Compose split

2026-09-13 00:36:31 +00:00

consumer-rules.pro

Starting a new module for app benchmarks

2024-02-05 18:18:33 -05:00