Brandon Thomas
780872b158
Merge PR #1604 (rebased)
...
# Conflicts:
# docs/parity-checklist.md
2026-10-15 02:32:16 -04:00
Brandon Thomas
809259a37d
Merge PR #1829 (rebased)
...
# Conflicts:
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-15 02:32:15 -04:00
Brandon Thomas and Claude Opus 5.5
bc39923608
Merge PR #1604
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 02:28:24 -04:00
Brandon Thomas and Claude Opus 5.5
d9ed118c1d
Merge PR #1474
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 02:13:45 -04:00
Michael Anderson
888a54f52a
Merge remote-tracking branch 'upstream/main' into fix/1532-dns-deadline
...
# Conflicts:
# docs/whats-new.md
2026-10-15 01:05:38 -05:00
Michael Anderson
d9ac1229e3
Merge remote-tracking branch 'upstream/main' into fix/local-browse-stamps
...
# Conflicts:
# docs/whats-new.md
2026-10-15 01:02:42 -05:00
Brandon Thomas and Claude Opus 5.5
a39e85da72
Merge PR #1829
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 02:00:02 -04:00
Brandon Thomas and Claude Opus 5.5
a94fc6bc84
Batch 38: What's New lists the Nikon profile and lens-corrected colour notes once
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 01:59:50 -04:00
Brandon Thomas
0270d30eda
Merge PR #1592 (updated head)
2026-10-15 01:59:36 -04:00
Brandon Thomas
956420ea5f
Merge PR #1586 (updated head)
2026-10-15 01:59:36 -04:00
Brandon Thomas and Claude Opus 5.5
e44e7157fc
Batch 38: rustfmt and parity summary after the merges
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 01:58:56 -04:00
Michael Anderson
296e2ce73c
Merge remote-tracking branch 'origin/fix/colour-fit-lens-geometry' into feat/nikon-z6ii-camera-profile
...
# Conflicts:
# crates/engine/src/camera_preview.rs
# crates/engine/src/tests_xmp.rs
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-15 00:55:18 -05:00
Michael Anderson
aed214da7e
Merge remote-tracking branch 'upstream/main' into fix/1532-dns-deadline
...
# Conflicts:
# docs/whats-new.md
2026-10-15 00:50:50 -05:00
Patrik Lermon and Claude Opus 5.5
9ce2804160
Swedish interface translation (sv)
...
Adds Swedish (Svenska) as an interface language: 2707 strings, written from the English source.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 07:50:47 +02:00
Michael Anderson
07294185d8
Merge remote-tracking branch 'upstream/main' into fix/local-browse-stamps
...
# Conflicts:
# docs/whats-new.md
2026-10-15 00:49:23 -05:00
Brandon Thomas
11351ef141
Merge PR #1834 (rebased)
...
# Conflicts:
# crates/ui-egui/locales/cs-formats.json
# crates/ui-egui/locales/pl-formats.json
# crates/ui-egui/src/lib.rs
2026-10-15 01:48:46 -04:00
Brandon Thomas and Claude Opus 5.5
202fcbb525
Merge PR #1823
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 01:48:43 -04:00
Michael Anderson
9ad2c1766b
Merge remote-tracking branch 'upstream/main' into fix/colour-fit-lens-geometry
...
# Conflicts:
# crates/engine/src/camera_preview.rs
# crates/engine/src/files.rs
# docs/whats-new.md
2026-10-15 00:48:09 -05:00
Brandon Thomas
d5b2cd1474
Merge PR #1595 (rebased)
...
# Conflicts:
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-15 01:48:05 -04:00
Brandon Thomas
97959610be
Merge PR #1592 (rebased)
...
# Conflicts:
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-15 01:47:46 -04:00
Brandon Thomas
99eba2e069
Merge PR #1586 (rebased)
...
# Conflicts:
# crates/engine/src/camera_preview.rs
# crates/engine/src/files.rs
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-15 01:45:53 -04:00
Brandon Thomas
0fb809c671
Merge PR #1614 (rebased)
...
# Conflicts:
# crates/merge/src/hdr.rs
# docs/parity-checklist.md
# docs/whats-new.md
2026-10-15 01:44:24 -04:00
Brandon Thomas
e4519aa710
Merge PR #1487 (rebased)
...
# Conflicts:
# docs/parity-checklist.md
2026-10-15 01:43:02 -04:00
Brandon Thomas and Claude Opus 5.5
26e43cd691
Merge PR #1595
...
Stacked on rb/1592: LOOK_VERSION 8 -> 9; the PR's corpus-profile helper is the base's corpus_uses_the_bundled_profile.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 01:42:11 -04:00
Brandon Thomas and Claude Opus 5.5
480e96c030
Merge PR #1592
...
Stacked on rb/1586: LOOK_VERSION 7 -> 8; README lists the base's ILCA-99M2 profile too.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 01:42:11 -04:00
Brandon Thomas and Claude Opus 5.5
2756414f46
Merge PR #1586
...
Resolved against rb-base-36: LOOK_VERSION 6 -> 7; starting_colour_tags passes no lens (merge frames arrive without it).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 01:42:11 -04:00
Brandon Thomas and Claude Opus 5.5
3c0300fcbb
Merge PR #1614
...
Resolved against rb-base-36: docs combine the 1 px clip neighbourhood and frame order with the base's moving-highlight rule and 2048 px deghost.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 01:42:11 -04:00
Brandon Thomas and Claude Opus 5.5
b5733c7649
Merge PR #1487
...
Resolved against rb-base-36: Scanned keeps the base's rewrite flag next to magic and tag; Exif keeps the Panasonic lens fallback; locale catalogs merged (one duplicate key dropped).
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 01:42:11 -04:00
Brandon Thomas and Claude Opus 5.5
a981538d05
Batch 37: the #1506 What's New entry once
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 01:36:59 -04:00
Brandon Thomas
81849a499e
Merge PR #1773 (updated head)
2026-10-15 01:36:27 -04:00
Brandon Thomas and Claude Opus 5.5
2a4b53f86c
Batch 37: parity summary refreshed
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 01:34:43 -04:00
Brandon Thomas and Claude Opus 5.5
dec7fd4eb2
Merge PR #1834
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 01:26:47 -04:00
Brandon Thomas
cf0002b484
Merge PR #1471 (rebased)
...
# Conflicts:
# docs/parity-checklist.md
2026-10-15 01:10:17 -04:00
Brandon Thomas and Claude Opus 5.5
edfd4bc80a
Batch 37: conflict markers left in three tracker headers by the #1327 merge resolved
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 01:07:22 -04:00
Brandon Thomas
7f7401713a
Merge PR #1471
...
# Conflicts:
# crates/engine/src/camera_preview.rs
# crates/engine/src/merge.rs
# crates/merge/src/frame.rs
# crates/merge/src/hdr.rs
# docs/parity-checklist.md
2026-10-15 00:56:52 -04:00
Brandon Thomas
fbb9583d41
Merge PR #1810 (rebased)
...
# Conflicts:
# docs/whats-new.md
2026-10-15 00:56:51 -04:00
Tomasz Lewandowski and Claude Opus 5.5
458012c464
i18n(pl): finish the format messages, counts right for every number, test and notes
...
Follow-up to #1100 , from #1623 :
- The 40 messages of pl-formats.json still in English are translated (mask
effect presets, slideshow templates and export, Lightroom catalog import,
keywording, people, panorama merge, the crash message), and two where only
the arrow had been changed.
- Polish has three plural forms (1 zdjęcie, 2 zdjęcia, 5 zdjęć). 25 messages
put the number before a genitive plural, which reads wrong for 2–4, 22–24…
("Usuń 2 zdjęć"); they now put it after the noun ("Usuń zdjęcia (2)",
"Zdjęcia: 22"), right for every number. `{n} {noun}` reads `{noun}: {n}` and
its noun pairs share one form. `{} failed` names a task, not a count.
- Dates read day.month.year (Niedziela, 20.09.2026; 09.2026), not "20 9 2026".
- Test polish_switches_formats_dates_and_reads_every_count: menu and control
channel, persistence, pl-* tags, dates and time, counts 0–111, user names
kept verbatim, Polish glyphs in the UI faces.
- docs/localization-pl.md (Polish notes), and the Polish row and links in
localization.md, localization-parity.md and parity-checklist.md.
The language buttons already wrap on main, so that part of #1623 is not needed.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
Claude-Session: https://claude.ai/code/session_01DukHNvUY45rjRnvtz91x33
2026-10-15 06:56:20 +02:00
Brandon Thomas and Claude Opus 5.5
4468917a1b
Merge PR #1810
...
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com >
2026-10-15 00:54:13 -04:00
Brandon Thomas
9ca113defa
Merge PR #1135 (rebased)
...
# Conflicts:
# xtask/src/main.rs
2026-10-15 00:53:45 -04:00
Brandon Thomas
76881c977e
Merge PR #1327 (rebased)
...
# Conflicts:
# ROADMAP.md
# docs/gaps.md
# docs/parity-checklist.md
# docs/target-app-parity.md
2026-10-15 00:53:22 -04:00
Brandon Thomas
02000d98a4
Merge PR #1198 (rebased)
...
# Conflicts:
# crates/ui-egui/src/panels/keyword_list.rs
2026-10-15 00:52:53 -04:00
Brandon Thomas
8591cdfa6b
Merge PR #1469 (rebased)
...
# Conflicts:
# crates/engine/src/lib.rs
# docs/parity-checklist.md
2026-10-15 00:52:33 -04:00
Brandon Thomas
0af2d36442
Merge PR #1320 (rebased)
2026-10-15 00:52:32 -04:00
Brandon Thomas
b3012745d5
Merge PR #1215 (rebased)
...
# Conflicts:
# docs/gaps.md
# docs/parity-checklist.md
2026-10-15 00:52:31 -04:00
Brandon Thomas
f7204aa8dd
Merge PR #1176 (rebased)
2026-10-15 00:52:31 -04:00
Brandon Thomas
8b73a2ec2f
Merge PR #1138 (rebased)
...
# Conflicts:
# docs/gaps.md
2026-10-15 00:52:30 -04:00
Brandon Thomas
05aa012f37
Merge PR #1802 (rebased)
...
# Conflicts:
# docs/whats-new.md
2026-10-15 00:52:30 -04:00
Brandon Thomas
a690478e52
Merge PR #1773 (rebased)
...
# Conflicts:
# docs/whats-new.md
2026-10-15 00:52:29 -04:00
Brandon Thomas
7c5f36bd8c
Merge PR #1761 (rebased)
...
# Conflicts:
# docs/whats-new.md
2026-10-15 00:52:29 -04:00
Brandon Thomas
12eab11cf5
Merge PR #1469
...
# Conflicts:
# crates/engine/src/cmd/preset_files.rs
# crates/engine/src/tests_import.rs
# docs/parity-checklist.md
# docs/xmp-interop.md
2026-10-15 00:50:08 -04:00