bflatastic
bb66ae9a87
tests: fix main after tonight's merges crossed
...
- The French script error line now has the catalog's no-break spaces before its colons.
- es.tsv drops the old file.info control character row a merge brought back.
2026-11-19 01:47:51 +07:00
BFlat
be2e4afa67
Merge pull request #8600 from storytold/fix/catalog-duplicate-rows
...
i18n: fix main's catalog test (duplicate Gujarati Panel row)
2026-11-19 01:40:00 +07:00
bflatastic
b41254d05b
i18n: drop the Gujarati Panel row two merges both added
...
Two PRs merged tonight each added the same row, so bundled_catalogs_are_consistent fails on main
(gu: duplicate "" "Panel"). Both rows have the same translation.
2026-11-19 01:39:31 +07:00
BFlat
18a5b41f31
Merge pull request #8599 from storytold/train/combo6
...
Land 21 dotCooCoo PRs, with main merged in
2026-11-19 01:29:14 +07:00
bflatastic
6f218a8ea5
combo: #8229
2026-11-19 01:26:14 +07:00
bflatastic
4bce0e413d
combo: #8561
2026-11-19 01:26:14 +07:00
bflatastic
1e3e559820
combo: #8559
2026-11-19 01:26:13 +07:00
bflatastic
65673958c2
combo: #8553
...
# Conflicts:
# docs/target-app-parity.md
2026-11-19 01:26:13 +07:00
bflatastic
7e76af1916
combo: #8545
2026-11-19 01:26:10 +07:00
bflatastic
5c6d82aa58
combo: #8517
2026-11-19 01:26:09 +07:00
bflatastic
35321b5f39
combo: #8502
2026-11-19 01:26:09 +07:00
bflatastic
e3a5a29afa
combo: #8495
2026-11-19 01:26:08 +07:00
bflatastic
d40178b95b
combo: #8489
2026-11-19 01:26:08 +07:00
bflatastic
a56bad4c0d
combo: #8452
2026-11-19 01:26:07 +07:00
bflatastic
71a0a0ee92
combo: #8420
2026-11-19 01:26:07 +07:00
bflatastic
6575c2dadf
combo: #8295
...
# Conflicts:
# crates/ui-egui/src/i18n/bg.tsv
# crates/ui-egui/src/i18n/bs.tsv
# crates/ui-egui/src/i18n/ca.tsv
# crates/ui-egui/src/i18n/da.tsv
# crates/ui-egui/src/i18n/el.tsv
# crates/ui-egui/src/i18n/es.tsv
# crates/ui-egui/src/i18n/fi.tsv
# crates/ui-egui/src/i18n/gu.tsv
# crates/ui-egui/src/i18n/id.tsv
# crates/ui-egui/src/i18n/ka.tsv
# crates/ui-egui/src/i18n/ru.tsv
# crates/ui-egui/src/i18n/sv.tsv
# crates/ui-egui/src/i18n/vi.tsv
# crates/ui-egui/src/i18n/zh-hans.tsv
# crates/ui-egui/src/i18n/zh-hant.tsv
2026-11-19 01:26:07 +07:00
bflatastic
213543aa35
combo: #8146
2026-11-19 01:26:04 +07:00
bflatastic
a8c951f7f7
combo: #8082
2026-11-19 01:26:03 +07:00
bflatastic
e398e5f155
combo: #8061
2026-11-19 01:26:02 +07:00
bflatastic
885ca23738
combo: #8057
2026-11-19 01:26:01 +07:00
bflatastic
950ff08613
combo: #8030
2026-11-19 01:26:00 +07:00
bflatastic
27c4f8d780
combo: #8014
2026-11-19 01:26:00 +07:00
bflatastic
8cb2ab2a27
combo: #7971
2026-11-19 01:25:59 +07:00
bflatastic
e27ae0bf96
combo: #7867
2026-11-19 01:25:58 +07:00
bflatastic
2039068a1f
combo: #7316
2026-11-19 01:25:57 +07:00
bflatastic
cfab560ff9
Merge main into #8229
2026-11-19 01:21:55 +07:00
bflatastic
40c878de7f
Merge main into #8561
2026-11-19 01:21:20 +07:00
bflatastic
9fe3884d67
Merge main into #8559
2026-11-19 01:21:18 +07:00
bflatastic
8e677d0e18
Merge main into #8553
2026-11-19 01:21:16 +07:00
bflatastic
f7148be816
Merge main into #8545
2026-11-19 01:21:13 +07:00
bflatastic
f79889da55
Merge main into #8517
2026-11-19 01:21:06 +07:00
bflatastic
8a7c259b23
Merge main into #8502
2026-11-19 01:21:00 +07:00
bflatastic
414fb5d308
Merge main into #8495
2026-11-19 01:20:58 +07:00
bflatastic
a366c1e6d3
Merge main into #8489
2026-11-19 01:20:49 +07:00
bflatastic
bc2e803205
Merge main into #8452
2026-11-19 01:20:43 +07:00
bflatastic
4adedf04cc
Merge main into #8420
2026-11-19 01:20:40 +07:00
bflatastic
a69c00e0de
Merge main into #8295
...
# Conflicts:
# crates/ui-egui/src/i18n/ca.tsv
# crates/ui-egui/src/i18n/da.tsv
# crates/ui-egui/src/i18n/el.tsv
# crates/ui-egui/src/i18n/es.tsv
# crates/ui-egui/src/i18n/fi.tsv
# crates/ui-egui/src/i18n/vi.tsv
2026-11-19 01:20:33 +07:00
bflatastic
2d2018238e
Merge main into #8146
2026-11-19 01:20:23 +07:00
bflatastic
1dc806b1ef
Merge main into #8082
2026-11-19 01:20:16 +07:00
bflatastic
ea3fc0a6f3
Merge main into #8061
2026-11-19 01:20:13 +07:00
bflatastic
38caaf4c54
Merge main into #8057
2026-11-19 01:20:10 +07:00
bflatastic
0d98a30223
Merge main into #8030
2026-11-19 01:20:07 +07:00
bflatastic
c0ca4268ab
Merge main into #8014
2026-11-19 01:20:04 +07:00
bflatastic
649879b0ce
Merge main into #7971
...
# Conflicts:
# crates/ui-egui/src/i18n/ca.tsv
# crates/ui-egui/src/i18n/da.tsv
# crates/ui-egui/src/i18n/el.tsv
# crates/ui-egui/src/i18n/es.tsv
# crates/ui-egui/src/i18n/fi.tsv
# crates/ui-egui/src/i18n/vi.tsv
2026-11-19 01:19:54 +07:00
bflatastic
86eb9aa115
Merge main into #7867
2026-11-19 01:19:48 +07:00
bflatastic
7685056634
Merge main into #7316
2026-11-19 01:19:33 +07:00
BFlat
4cae5249e8
Merge pull request #8513 from devius/ka-update
...
i18n(ka): update the Georgian catalog (36 strings)
2026-11-19 01:18:14 +07:00
BFlat
73de9db207
Merge pull request #8507 from storytold/fix/7242-confined-package-report-path
...
Fix #7242 : confined package report test uses native path components
2026-11-19 01:18:03 +07:00
BFlat
981b2b1db3
Merge pull request #8586 from storytold/fix/type-overlay-font-race
...
tests: Type tool layout counts no longer race tests that add fonts
2026-11-19 01:17:56 +07:00
BFlat
f561919072
Merge pull request #8598 from storytold/train/combo4
...
Land 14 green community PRs, with main merged in
2026-11-19 01:15:16 +07:00