Merge remote-tracking branch 'upstream/main' into fix-620-project-notes

# Conflicts:
#	crates/ui-egui/src/i18n/es.tsv
#	crates/ui-egui/src/i18n/ja.tsv
#	crates/ui-egui/src/i18n/zh-cn.tsv
This commit is contained in:
vangel76
2026-10-10 21:15:04 +02:00
128 changed files with 6040 additions and 679 deletions
+3 -1
View File
@@ -696,7 +696,9 @@ Video encoders implement `export::VideoEncoder`. Codec crates plug in with `regi
Timelines can be exchanged as EDL, FCP7 XML, FCPXML, OTIO, AAF or OMF. `file.import` detects these
formats and merges the result into the project as one undoable step (AAF / OMF embedded audio is
written next to the document first), and `file.exportInterchange`, `file.exportEdl`,
written next to the document first). `file.import {replace: true}` starts from an empty project
with the same name (`file.newProject`) so a headless import→export round-trip contains only the
imported timeline. `file.exportInterchange`, `file.exportEdl`,
`file.exportFcpxml`, `file.exportOtio`, `file.exportAaf` and `file.exportOmf` write them.
`file.exportInterchange {format}` takes `edl`, `xml` (the default), `fcpxml`, `otio`, `aaf` or `omf`;
any other value is a parameter error and nothing is written. For AAF and