The truly free, open-source, local-first, cross-platform CapCut replacement. Scriptable through a JSON-RPC API & MCP.
Rust ffmpegfree-video-editormodel-context-protocolnon-linear-editoroffline-firstopen-source-video-editorself-hostedvideo-editingvideo-editing-automationvideo-editing-softwarevideo-editing-toolsvideo-editorvoice-cloningyoutube-automationyoutube-shorts
feat(timeline): linkage - captions, titles, overlays and sounds move with the main track
Jareer1385c36bfa19
diff --git a/src/crates/concat-mcp/src/tools.rs b/src/crates/concat-mcp/src/tools.rsindex 2f462139..347a38ab 100644--- a/src/crates/concat-mcp/src/tools.rs+++ b/src/crates/concat-mcp/src/tools.rs@@ -290,7 +290,7 @@ pub fn catalogue() -> Vec<Tool> {command("clip_trim","Trim a clip",- "Moves one edge of a clip by `delta` seconds of timeline: `edge` \"start\" with a positive delta shortens it from the head (the picture does not slide), \"end\" with a positive delta lengthens it. A clip is never shorter than 1/60 s or longer than its media allows. `ripple: true` closes or opens the gap behind it on that lane.",+ "Moves one edge of a clip by `delta` seconds of timeline: `edge` \"start\" with a positive delta shortens it from the head (the picture does not slide), \"end\" with a positive delta lengthens it. A clip is never shorter than 1/60 s or longer than its media allows. `ripple: true` closes or opens the gap behind it on that lane, and on the main lane the other lanes follow while the timeline's linkage is on (`timeline_linkage`).","trimClip",),command(@@ -308,7 +308,7 @@ pub fn catalogue() -> Vec<Tool> {command("clips_remove","Delete clips",- "Deletes clips from the active timeline. `ripple: true` closes the gaps they leave on their lanes; false leaves the gaps.",+ "Deletes clips from the active timeline. `ripple: true` closes the gaps they leave on their lanes, and on the main lane the other lanes follow while the timeline's linkage is on (`timeline_linkage`); false leaves the gaps.","removeClips",).destroying(),@@ -345,6 +345,12 @@ pub fn catalogue() -> Vec<Tool> {"Sets what shows behind pictures that do not cover the frame, on a whole timeline (`timelineId` from `timeline_read`): `{\"kind\": \"none\"}` (black), `{\"kind\": \"blur\", \"amount\": 0-1}` (the clip itself, enlarged and blurred), `{\"kind\": \"color\", \"color\": \"#rrggbb\"}` or `{\"kind\": \"image\", \"mediaId\": ...}`. One clip's own background is `clip_update`'s `background`.","setTimelineBackground",),+ command(+ "timeline_linkage",+ "Link the lanes to the main one",+ "Turns linkage on or off for a timeline (`timelineId` from `timeline_read`, `on`). On - the default - a ripple on the main lane (the lowest one with a picture) moves the other lanes with it: clips after the edit follow, a clip running across it stays, and a title wholly over footage a ripple delete removed goes with it. Off, a ripple moves only its own lane.",+ "setTimelineLinkage",+ ),command("clip_transform","Place, scale or rotate a clip",@@ -1077,6 +1083,10 @@ mod tests {"timeline_background",json!({ "path": "/tmp/Cut", "timelineId": "tl1", "background": { "kind": "blur", "amount": 0.5 } }),),+ (+ "timeline_linkage",+ json!({ "path": "/tmp/Cut", "timelineId": "tl1", "on": false }),+ ),("effects_list", json!({ "kind": "transition" })),("template_list", json!({})),(diff --git a/src/crates/concat-project/src/commands/clips.rs b/src/crates/concat-project/src/commands/clips.rsindex fd522b4a..7cda44e0 100644--- a/src/crates/concat-project/src/commands/clips.rs+++ b/src/crates/concat-project/src/commands/clips.rs@@ -276,6 +276,7 @@ pub(super) fn apply(ripple,} => {let timeline = project.active_mut();+ let main = timeline.background_lane().map(str::to_owned);let Some(clip) = timeline.clip_mut(&clip_id) else {return Ok(Outcome::default());};@@ -365,6 +366,23 @@ pub(super) fn apply(}) {other.start = (other.start + by).max(0.0);}+ // In the lane's old time the edit is at the tail's old end+ // or the clip's start, whichever edge moved: what came off+ // went from there, what was restored went in there.+ let at = match edge {+ TrimEdge::End => old_end,+ TrimEdge::Start => anchor,+ };+ let ripple = if by < 0.0 {+ let from = match edge {+ TrimEdge::End => old_end + by,+ TrimEdge::Start => anchor,+ };+ Ripple::Removed(vec![(from, from - by)])+ } else {+ Ripple::Inserted { at, length: by }+ };+ follow_main(timeline, main.as_deref(), &track_id, ripple);}Ok(Outcome {created_id: None,@@ -597,6 +615,7 @@ pub(super) fn apply(};let timeline = project.active_mut();+ let main = timeline.background_lane().map(str::to_owned);let Some(index) = timeline.clips.iter().position(|clip| clip.id == clip_id) else {return Ok(Outcome::default());};@@ -631,6 +650,15 @@ pub(super) fn apply({clip.start += hold;}+ follow_main(+ timeline,+ main.as_deref(),+ &track_id,+ Ripple::Inserted {+ at: time,+ length: hold,+ },+ );// The still is the source clip turned into a picture: cloning it// first carries every look field - transform, effects, crop,@@ -753,6 +781,9 @@ pub(super) fn apply()}).collect();+ // The main lane before it loses anything: deleting its last+ // picture is still an edit of it.+ let main = timeline.background_lane().map(str::to_owned);let clip_count = timeline.clips.len();timeline.clips@@ -760,6 +791,14 @@ pub(super) fn apply(let applied = timeline.clips.len() != clip_count;if ripple && applied {close_gaps(timeline, &removed);+ if let Some(main) = main.as_deref() {+ let spans = removed+ .iter()+ .filter(|(track, _, _)| track == main)+ .map(|(_, start, end)| (*start, *end))+ .collect();+ follow_main(timeline, Some(main), main, Ripple::Removed(spans));+ }}Ok(Outcome {created_id: None,@@ -789,28 +828,94 @@ fn close_gaps(timeline: &mut Timeline, removed: &[(String, f64, f64)]) {.any(|(track, start, _)| *track == clip.track_id && *start < clip.start)};for clip in timeline.clips_where(behind_a_span) {- let mut spans: Vec<(f64, f64)> = removed+ let spans: Vec<(f64, f64)> = removed.iter()- .filter(|(track, start, _)| *track == clip.track_id && *start < clip.start)- .map(|(_, start, end)| (*start, end.min(clip.start)))+ .filter(|(track, _, _)| *track == clip.track_id)+ .map(|(_, start, end)| (*start, *end)).collect();- if spans.is_empty() {- continue;+ clip.start = (clip.start - removed_before(&spans, clip.start)).max(0.0);+ }+}++/// How much of `spans` lies before `at`, counting what they share once: a+/// span reaching past `at` counts only up to it.+fn removed_before(spans: &[(f64, f64)], at: f64) -> f64 {+ let mut before: Vec<(f64, f64)> = spans+ .iter()+ .filter(|(start, _)| *start < at)+ .map(|&(start, end)| (start, end.min(at)))+ .collect();+ if before.is_empty() {+ return 0.0;+ }+ before.sort_by(|a, b| a.0.total_cmp(&b.0));+ let mut gap = 0.0;+ let (mut from, mut to) = before[0];+ for (start, end) in before.into_iter().skip(1) {+ if start <= to {+ to = to.max(end);+ } else {+ gap += to - from;+ from = start;+ to = end;}- spans.sort_by(|a, b| a.0.total_cmp(&b.0));- let mut gap = 0.0;- let (mut from, mut to) = spans[0];- for (start, end) in spans.into_iter().skip(1) {- if start <= to {- to = to.max(end);- } else {- gap += to - from;- from = start;- to = end;+ }+ gap + (to - from)+}++/// What an edit did to the main lane's time, counted in the lane as it was+/// before: spans taken out of it, or a length put in at a time.+pub(crate) enum Ripple {+ Removed(Vec<(f64, f64)>),+ Inserted { at: f64, length: f64 },+}++/// Linkage: the rest of the timeline follows a ripple on its main lane, so+/// what was placed against the footage stays on the frames it was placed+/// against. A clip on another lane that starts at or after an insertion+/// moves along by its length, and one after a removal moves back by what+/// was taken out before it - landing where the cut is when it started+/// inside what went. A clip that runs across the edit stays: a music bed+/// is not cut up or dragged. Words wholly inside footage that went - a+/// caption, a title - go with it, as they would have been spoken over+/// nothing. `main` is the timeline's main lane as it stood before the+/// edit; a ripple on any other lane, or with linkage off, moves only its+/// own lane, as it always did.+pub(crate) fn follow_main(timeline: &mut Timeline, main: Option<&str>, lane: &str, ripple: Ripple) {+ if !timeline.linkage || main != Some(lane) {+ return;+ }+ match ripple {+ Ripple::Inserted { at, length } => {+ if length <= 0.0 {+ return;+ }+ for clip in timeline+ .clips_where(|clip| clip.track_id != lane && clip.start >= at - JOIN_EPSILON)+ {+ clip.start += length;+ }+ }+ Ripple::Removed(spans) => {+ let spans: Vec<(f64, f64)> = spans.into_iter().filter(|(s, e)| e > s).collect();+ if spans.is_empty() {+ return;+ }+ let spoken_over_nothing = |clip: &Clip| {+ clip.track_id != lane+ && clip.kind == ClipKind::Text+ && spans.iter().any(|&(start, end)| {+ clip.start >= start - JOIN_EPSILON+ && clip.start + clip.duration <= end + JOIN_EPSILON+ })+ };+ timeline.clips.retain(|clip| !spoken_over_nothing(clip));+ for clip in timeline.clips_where(|clip| {+ clip.track_id != lane && spans.iter().any(|&(start, _)| start < clip.start)+ }) {+ clip.start = (clip.start - removed_before(&spans, clip.start)).max(0.0);}}- gap += to - from;- clip.start = (clip.start - gap).max(0.0);}}@@ -855,9 +960,19 @@ fn ripple_room_for(timeline: &mut Timeline, track_id: &str, start: f64, media: &if !overlaps {return start;}+ let main = timeline.background_lane().map(str::to_owned);for clip in timeline.clips_where(|clip| clip.track_id == track_id && clip.start >= start) {clip.start += duration;}+ follow_main(+ timeline,+ main.as_deref(),+ track_id,+ Ripple::Inserted {+ at: start,+ length: duration,+ },+ );start}diff --git a/src/crates/concat-project/src/commands/mod.rs b/src/crates/concat-project/src/commands/mod.rsindex 54e82fbc..571ed508 100644--- a/src/crates/concat-project/src/commands/mod.rs+++ b/src/crates/concat-project/src/commands/mod.rs@@ -842,6 +842,15 @@ pub enum Command {/// The background.background: Background,},+ /// Turns a timeline's linkage on or off: whether its other lanes follow+ /// an edit that closes up or opens its main lane. See+ /// `Timeline::linkage`.+ SetTimelineLinkage {+ /// The timeline. An unknown id is a no-op.+ timeline_id: String,+ /// On: the other lanes follow the main one.+ on: bool,+ },/// Renames a timeline tab. Whitespace-only names are ignored so a tab/// can never end up blank; unknown ids are tolerated.RenameTimeline {@@ -1316,6 +1325,7 @@ pub fn apply(command @ (Command::AddTimeline| Command::SetTimelineVideo { .. }| Command::SetTimelineBackground { .. }+ | Command::SetTimelineLinkage { .. }| Command::RemoveTimeline { .. }| Command::RenameTimeline { .. }| Command::SelectTimeline { .. }diff --git a/src/crates/concat-project/src/commands/properties.rs b/src/crates/concat-project/src/commands/properties.rsindex ae9ca902..9a488e4e 100644--- a/src/crates/concat-project/src/commands/properties.rs+++ b/src/crates/concat-project/src/commands/properties.rs@@ -497,6 +497,7 @@ fn make_room(timeline: &mut Timeline, clip_id: &str, old_end: f64, ripple: bool)let moved = start + duration - old_end;let pushed = moved > 0.0 && !timeline.is_free(&track_id, start, duration, &[clip_id]);if (ripple && moved != 0.0) || pushed {+ let main = timeline.background_lane().map(str::to_owned);for other in timeline.clips_where(|other| {other.id != clip_id&& other.track_id == track_id@@ -504,5 +505,16 @@ fn make_room(timeline: &mut Timeline, clip_id: &str, old_end: f64, ripple: bool)}) {other.start = (other.start + moved).max(0.0);}+ // Linkage: sped up, the clip gave back the end of its old span;+ // slowed down, it put more in at its old end.+ let ripple = if moved < 0.0 {+ clips::Ripple::Removed(vec![(old_end + moved, old_end)])+ } else {+ clips::Ripple::Inserted {+ at: old_end,+ length: moved,+ }+ };+ clips::follow_main(timeline, main.as_deref(), &track_id, ripple);}}diff --git a/src/crates/concat-project/src/commands/timelines.rs b/src/crates/concat-project/src/commands/timelines.rsindex ed0e7ec4..9425c807 100644--- a/src/crates/concat-project/src/commands/timelines.rs+++ b/src/crates/concat-project/src/commands/timelines.rs@@ -39,6 +39,8 @@ pub(super) fn apply(// And with its background, for the same reason: a second cut of// a vertical edit wants the same bars filled the same way.let background = project.active().background.clone();+ // And with the linkage it was set to: it is how the cut edits.+ let linkage = project.active().linkage;project.timelines.push(Arc::new(Timeline {id: id.clone(),name,@@ -46,6 +48,7 @@ pub(super) fn apply(background,tracks,clips: Vec::new(),+ linkage,extra: Default::default(),}));project.active_timeline_id = id.clone();@@ -87,6 +90,18 @@ pub(super) fn apply(})}+ Command::SetTimelineLinkage { timeline_id, on } => {+ let applied = project+ .timelines+ .iter_mut()+ .find(|timeline| timeline.id == timeline_id)+ .is_some_and(|timeline| assign(&mut Arc::make_mut(timeline).linkage, on));+ Ok(Outcome {+ created_id: None,+ applied,+ })+ }+Command::RemoveTimeline { timeline_id } => {if project.timelines.len() <= 1 {return Err(CommandError::LastTimeline);diff --git a/src/crates/concat-project/src/lib.rs b/src/crates/concat-project/src/lib.rsindex fdb8ea8e..ca2795ab 100644--- a/src/crates/concat-project/src/lib.rs+++ b/src/crates/concat-project/src/lib.rs@@ -1033,8 +1033,76 @@ mod tests {// ── ripple delete: https://github.com/jub0t/Concat/issues/106 ──+ fn unlink(editor: &mut Editor) {+ let timeline_id = editor.project().active().id.clone();+ editor+ .apply(Command::SetTimelineLinkage {+ timeline_id,+ on: false,+ })+ .expect("unlinks");+ }++ fn text_at(editor: &mut Editor, start: f64, duration: f64) -> String {+ editor+ .apply(Command::AddTextClip {+ track_id: None,+ above: true,+ start,+ style: None,+ duration: Some(duration),+ offset_y: None,+ })+ .expect("adds")+ .created_id+ .expect("id")+ }++ /// Linkage: a ripple delete on the main lane pulls the other lanes+ /// with it. What started inside the footage that went lands where the+ /// cut is, what is after it moves back by as much, and words wholly+ /// over the footage that went go with it.+ #[test]+ fn ripple_delete_on_the_main_lane_pulls_the_linked_lanes() {+ let (mut editor, media_id, first) = fixture();+ let (video, sound) = {+ let tracks = &editor.project().active().tracks;+ (tracks[0].id.clone(), tracks[1].id.clone())+ };+ let rest = lane(&mut editor, &media_id, &video, &[10.0, 20.0]);+ let other = lane(&mut editor, &media_id, &sound, &[15.0, 25.0]);+ let over_the_gone = text_at(&mut editor, 12.0, 3.0);+ let over_the_kept = text_at(&mut editor, 22.0, 3.0);+ let across = text_at(&mut editor, 8.0, 4.0);+ editor+ .apply(Command::RemoveClips {+ clip_ids: vec![rest[0].clone()],+ ripple: true,+ })+ .expect("removes");+ assert_eq!(start_of(&editor, &rest[1]), 10.0, "the main lane closes up");+ assert_eq!(start_of(&editor, &other[0]), 10.0, "started in what went");+ assert_eq!(start_of(&editor, &other[1]), 15.0, "follows its footage");+ assert_eq!(+ start_of(&editor, &over_the_kept),+ 12.0,+ "follows its footage"+ );+ assert_eq!(+ start_of(&editor, &across),+ 8.0,+ "runs across the cut: stays"+ );+ assert!(+ editor.project().active().clip(&over_the_gone).is_none(),+ "words over footage that went go with it"+ );+ assert_eq!(start_of(&editor, &first), 0.0);+ }++ /// With linkage off a ripple delete closes its own lane and no other.#[test]- fn ripple_delete_closes_the_gap_on_its_own_track_only() {+ fn ripple_delete_closes_the_gap_on_its_own_track_only_unlinked() {let (mut editor, media_id, first) = fixture();let (video, sound) = {let tracks = &editor.project().active().tracks;@@ -1042,6 +1110,7 @@ mod tests {};let rest = lane(&mut editor, &media_id, &video, &[10.0, 20.0]);let other = lane(&mut editor, &media_id, &sound, &[15.0]);+ unlink(&mut editor);let outcome = editor.apply(Command::RemoveClips {@@ -1245,13 +1314,95 @@ mod tests {18.0,"and the one behind that");- assert_eq!(start_of(&editor, &other[0]), 12.0, "another lane stays");+ assert_eq!(start_of(&editor, &other[0]), 10.0, "a linked lane follows");editor.apply(trim(&first, TrimEdge::End, 3.0, true)).expect("lengthens");assert_eq!(start_of(&editor, &behind[0]), 11.0, "makes room");assert_eq!(start_of(&editor, &behind[1]), 21.0);+ assert_eq!(start_of(&editor, &other[0]), 13.0, "and follows back");++ unlink(&mut editor);+ editor+ .apply(trim(&first, TrimEdge::End, -2.0, true))+ .expect("shortens");+ assert_eq!(start_of(&editor, &behind[0]), 9.0);+ assert_eq!(+ start_of(&editor, &other[0]),+ 13.0,+ "unlinked, another lane stays"+ );+ }++ /// Only the main lane leads: a ripple on any other lane moves that lane+ /// alone, so deleting a caption never pulls the next ones off their+ /// words, and the picture never moves for a sound.+ #[test]+ fn a_ripple_on_another_lane_leads_nothing() {+ let (mut editor, media_id, first) = fixture();+ let sound = editor.project().active().tracks[1].id.clone();+ let sounds = lane(&mut editor, &media_id, &sound, &[0.0, 10.0]);+ let words = text_at(&mut editor, 12.0, 2.0);+ editor+ .apply(Command::RemoveClips {+ clip_ids: vec![sounds[0].clone()],+ ripple: true,+ })+ .expect("removes");+ assert_eq!(start_of(&editor, &sounds[1]), 0.0, "its own lane closes");+ assert_eq!(start_of(&editor, &first), 0.0);+ assert_eq!(start_of(&editor, &words), 12.0, "nothing else moves");+ }++ /// A freeze on the main lane opens it, and what is after the freeze on+ /// the other lanes moves along by the hold.+ #[test]+ fn a_freeze_on_the_main_lane_moves_the_linked_lanes_along() {+ let (mut editor, media_id, first) = fixture();+ let sound = editor.project().active().tracks[1].id.clone();+ let later = lane(&mut editor, &media_id, &sound, &[6.0]);+ let earlier = text_at(&mut editor, 1.0, 2.0);+ let still = NewMedia {+ path: "/freeze.jpg".into(),+ name: "freeze.jpg".into(),+ duration: None,+ kind: MediaKind::Image,+ width: Some(1920),+ height: Some(1080),+ frame_rate: None,+ frame_rate_fraction: None,+ video_codec: None,+ audio_codec: None,+ has_audio: false,+ audio_tracks: Vec::new(),+ origin: None,+ color_space: Default::default(),+ };+ editor+ .apply(Command::FreezeFrame {+ clip_id: first.clone(),+ time: 4.0,+ duration: Some(1.0),+ still: Some(still),+ })+ .expect("freezes");+ assert_eq!(start_of(&editor, &later[0]), 7.0, "after the hold: along");+ assert_eq!(start_of(&editor, &earlier), 1.0, "before it: stays");+ }++ /// The document leaves linkage out while it is on, as every timeline+ /// before it was written, and a timeline read without it is linked.+ #[test]+ fn linkage_is_on_unless_written_off() {+ let (mut editor, _, _) = fixture();+ let text = serde_json::to_string(editor.project().active()).expect("writes");+ assert!(!text.contains("linkage"));+ let read: crate::model::Timeline = serde_json::from_str(&text).expect("reads");+ assert!(read.linkage);+ unlink(&mut editor);+ let text = serde_json::to_string(editor.project().active()).expect("writes");+ assert!(text.contains("\"linkage\":false"));}#[test]diff --git a/src/crates/concat-project/src/model.rs b/src/crates/concat-project/src/model.rsindex 06569346..77052bf2 100644--- a/src/crates/concat-project/src/model.rs+++ b/src/crates/concat-project/src/model.rs@@ -220,6 +220,10 @@ fn is_false(value: &bool) -> bool {!value}+fn is_true(value: &bool) -> bool {+ *value+}+/// A lane. Deliberately untyped: any media goes on any track.#[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]#[serde(rename_all = "camelCase", default)]@@ -2581,6 +2585,14 @@ pub struct Timeline {/// [`Timeline::clip_mut`]). Reading through the `Arc` is transparent.#[serde(deserialize_with = "wire::list")]pub clips: Vec<Arc<Clip>>,+ /// Linkage: whether the other lanes follow an edit that closes up or+ /// opens the main lane ([`Timeline::background_lane`]), so a caption,+ /// a title, an overlay or a sound placed against the footage stays on+ /// the frames it was placed against. CapCut's Linkage, Final Cut's+ /// connected clips. On unless turned off, and left out of the document+ /// while on.+ #[serde(default = "yes", skip_serializing_if = "is_true")]+ pub linkage: bool,/// Fields this build does not know, kept so they round-trip.#[serde(flatten, default, skip_serializing_if = "Map::is_empty")]pub extra: Map<String, Value>,@@ -2595,6 +2607,7 @@ impl Default for Timeline {background: Background::None,tracks: Vec::new(),clips: Vec::new(),+ linkage: true,extra: Map::new(),}}@@ -2884,6 +2897,7 @@ impl Project {}).collect(),clips: Vec::new(),+ linkage: true,extra: Map::new(),})],active_timeline_id: "TL1".to_owned(),diff --git a/src/crates/concat/locales/ar.json b/src/crates/concat/locales/ar.jsonindex c78d3216..807fea08 100644--- a/src/crates/concat/locales/ar.json+++ b/src/crates/concat/locales/ar.json@@ -168,6 +168,7 @@"common.left": "اليسار","common.level": "المستوى","common.limited": "محدود",+ "common.linkage": "الربط","common.magneticTimeline": "مخطط زمني مغناطيسي","common.media": "الوسائط","common.medium": "متوسط",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "تجميد المقطع المحدّد أو عكسه مرآتيًا أو تدويره","tray.generateCaptions": "إنشاء تسميات توضيحية","tray.hideMeters": "إخفاء مقاييس المستوى",+ "tray.linkage": "الربط: تتحرك الترجمات والعناوين والطبقات والأصوات مع المسار الرئيسي","tray.magneticTimelineDeletingTrimming": "المخطط الزمني المغناطيسي: الحذف والقصّ يُغلقان الفجوة","tray.panTool": "أداة التحريك ({0})","tray.playerFollowsResizePlayhead": "المشغّل يتبع تغيير الحجم: يسير مؤشر التشغيل مع الحافة التي تقصّها",diff --git a/src/crates/concat/locales/az.json b/src/crates/concat/locales/az.jsonindex d9357d30..ba2846b2 100644--- a/src/crates/concat/locales/az.json+++ b/src/crates/concat/locales/az.json@@ -168,6 +168,7 @@"common.left": "Sol","common.level": "Səviyyə","common.limited": "Məhdud",+ "common.linkage": "Bağlantı","common.magneticTimeline": "Maqnitli zaman xətti","common.media": "Media","common.medium": "Orta",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "Seçilmiş klipi dondur, güzgülə və ya fırlat","tray.generateCaptions": "Subtitr yarat","tray.hideMeters": "Səviyyə göstəricilərini gizlət",+ "tray.linkage": "Bağlantı: altyazılar, başlıqlar, üst qatlar və səslər əsas trekə uyğun hərəkət edir","tray.magneticTimelineDeletingTrimming": "Maqnitli zaman xətti: silmə və qısaltma boşluğu bağlayır","tray.panTool": "Sürüşdürmə aləti ({0})","tray.playerFollowsResizePlayhead": "Pleyer ölçü dəyişikliyini izləyir: oynatma göstəricisi qısaltdığınız kənarla birgə hərəkət edir",diff --git a/src/crates/concat/locales/bn.json b/src/crates/concat/locales/bn.jsonindex f7a3ef50..f7164af9 100644--- a/src/crates/concat/locales/bn.json+++ b/src/crates/concat/locales/bn.json@@ -168,6 +168,7 @@"common.left": "বামে","common.level": "স্তর","common.limited": "সীমিত",+ "common.linkage": "লিংকেজ","common.magneticTimeline": "ম্যাগনেটিক টাইমলাইন","common.media": "মিডিয়া","common.medium": "মাঝারি",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "নির্বাচিত ক্লিপ ফ্রিজ, মিরর বা ঘোরান","tray.generateCaptions": "ক্যাপশন তৈরি করুন","tray.hideMeters": "লেভেল মিটার লুকান",+ "tray.linkage": "লিংকেজ: ক্যাপশন, শিরোনাম, ওভারলে ও শব্দ মূল ট্র্যাকের সঙ্গে সরে","tray.magneticTimelineDeletingTrimming": "ম্যাগনেটিক টাইমলাইন: মোছা ও ছাঁটায় ফাঁক বন্ধ হয়","tray.panTool": "প্যান টুল ({0})","tray.playerFollowsResizePlayhead": "প্লেয়ার রি-সাইজ অনুসরণ করে: প্লেহেড আপনি যে কিনারা ছাঁটেন তাতে চড়ে",diff --git a/src/crates/concat/locales/de.json b/src/crates/concat/locales/de.jsonindex dc1452cf..8339594f 100644--- a/src/crates/concat/locales/de.json+++ b/src/crates/concat/locales/de.json@@ -168,6 +168,7 @@"common.left": "Links","common.level": "Pegel","common.limited": "Begrenzt",+ "common.linkage": "Verknüpfung","common.magneticTimeline": "Magnetische Zeitleiste","common.media": "Medien","common.medium": "Mittel",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "Ausgewählten Clip einfrieren, spiegeln oder drehen","tray.generateCaptions": "Untertitel erzeugen","tray.hideMeters": "Pegelanzeige ausblenden",+ "tray.linkage": "Verknüpfung: Untertitel, Titel, Overlays und Töne bewegen sich mit der Hauptspur","tray.magneticTimelineDeletingTrimming": "Magnetische Zeitleiste: Löschen und Kürzen schließen die Lücke","tray.panTool": "Hand-Werkzeug ({0})","tray.playerFollowsResizePlayhead": "Wiedergabe folgt dem Kürzen: Der Abspielkopf wandert mit der Kante, die du kürzt",diff --git a/src/crates/concat/locales/en.json b/src/crates/concat/locales/en.jsonindex cd6d6ee7..a0e580bd 100644--- a/src/crates/concat/locales/en.json+++ b/src/crates/concat/locales/en.json@@ -168,6 +168,7 @@"common.left": "Left","common.level": "Level","common.limited": "Limited",+ "common.linkage": "Linkage","common.magneticTimeline": "Magnetic timeline","common.media": "Media","common.medium": "Medium",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "Freeze, mirror or rotate the selected clip","tray.generateCaptions": "Generate Captions","tray.hideMeters": "Hide the level meters",+ "tray.linkage": "Linkage: captions, titles, overlays and sounds move with the main track","tray.magneticTimelineDeletingTrimming": "Magnetic timeline: deleting and trimming close the gap","tray.panTool": "Pan tool ({0})","tray.playerFollowsResizePlayhead": "Player follows the resize: the playhead rides the edge you trim",diff --git a/src/crates/concat/locales/es.json b/src/crates/concat/locales/es.jsonindex 4bef171f..de23a134 100644--- a/src/crates/concat/locales/es.json+++ b/src/crates/concat/locales/es.json@@ -168,6 +168,7 @@"common.left": "Izquierda","common.level": "Nivel","common.limited": "Limitado",+ "common.linkage": "Vinculación","common.magneticTimeline": "Línea de tiempo magnética","common.media": "Medios","common.medium": "Mediano",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "Congelar, reflejar o rotar el clip seleccionado","tray.generateCaptions": "Generar subtítulos","tray.hideMeters": "Ocultar los medidores de nivel",+ "tray.linkage": "Vinculación: subtítulos, títulos, superposiciones y sonidos se mueven con la pista principal","tray.magneticTimelineDeletingTrimming": "Línea de tiempo magnética: eliminar y recortar cierran el hueco","tray.panTool": "Herramienta mano ({0})","tray.playerFollowsResizePlayhead": "El reproductor sigue el recorte: el cabezal de reproducción acompaña el borde que recortas",diff --git a/src/crates/concat/locales/fa.json b/src/crates/concat/locales/fa.jsonindex de60e443..012c2c64 100644--- a/src/crates/concat/locales/fa.json+++ b/src/crates/concat/locales/fa.json@@ -168,6 +168,7 @@"common.left": "چپ","common.level": "سطح","common.limited": "محدود",+ "common.linkage": "پیوند","common.magneticTimeline": "تایملاین مغناطیسی","common.media": "رسانه","common.medium": "متوسط",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "فریز، آینه یا چرخش کلیپ انتخابشده","tray.generateCaptions": "ساخت زیرنویسها","tray.hideMeters": "پنهان کردن نمایشگرهای سطح صدا",+ "tray.linkage": "پیوند: زیرنویسها، عنوانها، لایهها و صداها همراه ترک اصلی جابهجا میشوند","tray.magneticTimelineDeletingTrimming": "تایملاین مغناطیسی: حذف و برش فاصله را میبندند","tray.panTool": "ابزار Pan ({0})","tray.playerFollowsResizePlayhead": "پخشکننده برش را دنبال میکند: نشانگر پخش همراه لبهای که برش میدهید حرکت میکند",diff --git a/src/crates/concat/locales/fr.json b/src/crates/concat/locales/fr.jsonindex 2ce90c42..e841bdad 100644--- a/src/crates/concat/locales/fr.json+++ b/src/crates/concat/locales/fr.json@@ -168,6 +168,7 @@"common.left": "Gauche","common.level": "Niveau","common.limited": "Limitée",+ "common.linkage": "Liaison","common.magneticTimeline": "Timeline magnétique","common.media": "Médias","common.medium": "Moyen",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "Figer, refléter ou pivoter le clip sélectionné","tray.generateCaptions": "Générer les sous-titres","tray.hideMeters": "Masquer les vumètres",+ "tray.linkage": "Liaison : sous-titres, titres, incrustations et sons suivent la piste principale","tray.magneticTimelineDeletingTrimming": "Timeline magnétique : la suppression et le rognage referment l'espace","tray.panTool": "Outil Main ({0})","tray.playerFollowsResizePlayhead": "Le lecteur suit le rognage : la tête de lecture accompagne le bord que vous rognez",diff --git a/src/crates/concat/locales/he.json b/src/crates/concat/locales/he.jsonindex b8eab6a6..023dabbb 100644--- a/src/crates/concat/locales/he.json+++ b/src/crates/concat/locales/he.json@@ -168,6 +168,7 @@"common.left": "שמאל","common.level": "רמה","common.limited": "מוגבל",+ "common.linkage": "קישור","common.magneticTimeline": "ציר זמן מגנטי","common.media": "מדיה","common.medium": "בינוני",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "הקפאה, שיקוף או סיבוב של הקליפ שנבחר","tray.generateCaptions": "יצירת כתוביות","tray.hideMeters": "הסתרת מדי העוצמה",+ "tray.linkage": "קישור: כתוביות, כותרות, שכבות וצלילים זזים עם הרצועה הראשית","tray.magneticTimelineDeletingTrimming": "ציר זמן מגנטי: מחיקה וקיצוץ סוגרים את הרווח","tray.panTool": "כלי הזזה ({0})","tray.playerFollowsResizePlayhead": "הנגן עוקב אחר שינוי הגודל: סמן ההפעלה נע עם הקצה שמקצצים",diff --git a/src/crates/concat/locales/hi.json b/src/crates/concat/locales/hi.jsonindex 26fe9d20..394cffb9 100644--- a/src/crates/concat/locales/hi.json+++ b/src/crates/concat/locales/hi.json@@ -168,6 +168,7 @@"common.left": "बाएं","common.level": "स्तर","common.limited": "सीमित",+ "common.linkage": "लिंकेज","common.magneticTimeline": "मैग्नेटिक टाइमलाइन","common.media": "मीडिया","common.medium": "मध्यम",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "चुनी गई क्लिप को फ़्रीज़, मिरर करें या घुमाएं","tray.generateCaptions": "कैप्शन बनाएं","tray.hideMeters": "लेवल मीटर छिपाएँ",+ "tray.linkage": "लिंकेज: कैप्शन, शीर्षक, ओवरले और ध्वनियाँ मुख्य ट्रैक के साथ चलती हैं","tray.magneticTimelineDeletingTrimming": "मैग्नेटिक टाइमलाइन: मिटाने और ट्रिम करने पर खाली जगह भर जाती है","tray.panTool": "पैन टूल ({0})","tray.playerFollowsResizePlayhead": "प्लेयर आकार बदलने के साथ चलता है: प्लेहेड उस किनारे के साथ चलता है जिसे आप ट्रिम करते हैं",diff --git a/src/crates/concat/locales/hr.json b/src/crates/concat/locales/hr.jsonindex f405ab41..f3ef1573 100644--- a/src/crates/concat/locales/hr.json+++ b/src/crates/concat/locales/hr.json@@ -168,6 +168,7 @@"common.left": "Lijevo","common.level": "Razina","common.limited": "Ograničeno",+ "common.linkage": "Povezivanje","common.magneticTimeline": "Magnetska vremenska linija","common.media": "Mediji","common.medium": "Srednje",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "Zamrzni, zrcali ili zakreni odabrani klip","tray.generateCaptions": "Generiraj titlove","tray.hideMeters": "Sakrij mjerače razine",+ "tray.linkage": "Povezivanje: titlovi, naslovi, slojevi i zvukovi kreću se s glavnom stazom","tray.magneticTimelineDeletingTrimming": "Magnetska vremenska linija: brisanje i skraćivanje zatvaraju prazninu","tray.panTool": "Alat ruka ({0})","tray.playerFollowsResizePlayhead": "Reprodukcija prati skraćivanje: glava za reprodukciju prati rub koji skraćujete",diff --git a/src/crates/concat/locales/id.json b/src/crates/concat/locales/id.jsonindex 66ebef35..dd1b5960 100644--- a/src/crates/concat/locales/id.json+++ b/src/crates/concat/locales/id.json@@ -168,6 +168,7 @@"common.left": "Kiri","common.level": "Tingkat","common.limited": "Terbatas",+ "common.linkage": "Tautan","common.magneticTimeline": "Linimasa magnetis","common.media": "Media","common.medium": "Sedang",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "Bekukan, cerminkan, atau rotasi klip yang dipilih","tray.generateCaptions": "Buat Subtitel","tray.hideMeters": "Sembunyikan meter level",+ "tray.linkage": "Tautan: teks, judul, overlay, dan suara ikut bergeser bersama trek utama","tray.magneticTimelineDeletingTrimming": "Linimasa magnetis: menghapus dan memotong akan menutup celah","tray.panTool": "Alat geser ({0})","tray.playerFollowsResizePlayhead": "Pemutar mengikuti perubahan ukuran: penanda putar mengikuti tepi yang Anda potong",diff --git a/src/crates/concat/locales/it.json b/src/crates/concat/locales/it.jsonindex 5d627e60..ca0097ec 100644--- a/src/crates/concat/locales/it.json+++ b/src/crates/concat/locales/it.json@@ -168,6 +168,7 @@"common.left": "Sinistra","common.level": "Livello","common.limited": "Limitata",+ "common.linkage": "Collegamento","common.magneticTimeline": "Timeline magnetica","common.media": "Media","common.medium": "Media",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "Blocca, specchia o ruota la clip selezionata","tray.generateCaptions": "Genera sottotitoli","tray.hideMeters": "Nascondi gli indicatori di livello",+ "tray.linkage": "Collegamento: sottotitoli, titoli, sovrapposizioni e suoni si muovono con la traccia principale","tray.magneticTimelineDeletingTrimming": "Timeline magnetica: eliminare e accorciare chiudono lo spazio","tray.panTool": "Strumento mano ({0})","tray.playerFollowsResizePlayhead": "Il player segue l'accorciamento: la testina di riproduzione segue il bordo che accorci",diff --git a/src/crates/concat/locales/ja.json b/src/crates/concat/locales/ja.jsonindex 80fdb3e6..de210d3e 100644--- a/src/crates/concat/locales/ja.json+++ b/src/crates/concat/locales/ja.json@@ -168,6 +168,7 @@"common.left": "左","common.level": "レベル","common.limited": "リミテッド",+ "common.linkage": "リンク","common.magneticTimeline": "マグネティックタイムライン","common.media": "メディア","common.medium": "中",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "選択したクリップをフリーズ、ミラー、回転","tray.generateCaptions": "字幕を生成","tray.hideMeters": "レベルメーターを隠す",+ "tray.linkage": "リンク:字幕・テキスト・オーバーレイ・音声がメイントラックと一緒に動く","tray.magneticTimelineDeletingTrimming": "マグネティックタイムライン : 削除やトリミングで隙間が詰まります","tray.panTool": "パンツール ({0})","tray.playerFollowsResizePlayhead": "プレーヤーがトリミングに追従 : 再生ヘッドがトリミング中の端に合わせて動きます",diff --git a/src/crates/concat/locales/ko.json b/src/crates/concat/locales/ko.jsonindex b2b888c5..36946212 100644--- a/src/crates/concat/locales/ko.json+++ b/src/crates/concat/locales/ko.json@@ -168,6 +168,7 @@"common.left": "왼쪽","common.level": "레벨","common.limited": "제한",+ "common.linkage": "연결","common.magneticTimeline": "자석 타임라인","common.media": "미디어","common.medium": "중간",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "선택한 클립을 정지, 반전 또는 회전","tray.generateCaptions": "자막 생성","tray.hideMeters": "레벨 미터 숨기기",+ "tray.linkage": "연결: 자막, 제목, 오버레이, 소리가 메인 트랙과 함께 움직입니다","tray.magneticTimelineDeletingTrimming": "자석 타임라인: 삭제와 다듬기가 빈틈을 닫습니다","tray.panTool": "손 도구 ({0})","tray.playerFollowsResizePlayhead": "플레이어가 다듬기를 따라감: 재생 헤드가 다듬는 가장자리를 따라 움직입니다",diff --git a/src/crates/concat/locales/nl.json b/src/crates/concat/locales/nl.jsonindex d27a5a96..7b1e2d90 100644--- a/src/crates/concat/locales/nl.json+++ b/src/crates/concat/locales/nl.json@@ -168,6 +168,7 @@"common.left": "Links","common.level": "Niveau","common.limited": "Beperkt",+ "common.linkage": "Koppeling","common.magneticTimeline": "Magnetische tijdlijn","common.media": "Media","common.medium": "Middel",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "De geselecteerde clip bevriezen, spiegelen of draaien","tray.generateCaptions": "Ondertitels genereren","tray.hideMeters": "Niveaumeters verbergen",+ "tray.linkage": "Koppeling: ondertitels, titels, overlays en geluiden bewegen mee met het hoofdspoor","tray.magneticTimelineDeletingTrimming": "Magnetische tijdlijn: verwijderen en inkorten sluiten de opening","tray.panTool": "Handje ({0})","tray.playerFollowsResizePlayhead": "Speler volgt het inkorten: de afspeelkop rijdt mee met de rand die je inkort",diff --git a/src/crates/concat/locales/pl.json b/src/crates/concat/locales/pl.jsonindex b9d2d328..0f73fd6a 100644--- a/src/crates/concat/locales/pl.json+++ b/src/crates/concat/locales/pl.json@@ -168,6 +168,7 @@"common.left": "Lewo","common.level": "Poziom","common.limited": "Ograniczony",+ "common.linkage": "Powiązanie","common.magneticTimeline": "Magnetyczna oś czasu","common.media": "Multimedia","common.medium": "Średni",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "Stopklatka, odbicie lub obrót zaznaczonego klipu","tray.generateCaptions": "Generuj napisy","tray.hideMeters": "Ukryj wskaźniki poziomu",+ "tray.linkage": "Powiązanie: napisy, tytuły, nakładki i dźwięki przesuwają się z główną ścieżką","tray.magneticTimelineDeletingTrimming": "Magnetyczna oś czasu: usuwanie i przycinanie zamykają lukę","tray.panTool": "Narzędzie Rączka ({0})","tray.playerFollowsResizePlayhead": "Odtwarzacz podąża za przycinaniem: głowica jedzie z przycinaną krawędzią",diff --git a/src/crates/concat/locales/pt-BR.json b/src/crates/concat/locales/pt-BR.jsonindex ed8a23e4..6a0d1fd4 100644--- a/src/crates/concat/locales/pt-BR.json+++ b/src/crates/concat/locales/pt-BR.json@@ -168,6 +168,7 @@"common.left": "Esquerda","common.level": "Nível","common.limited": "Limitada",+ "common.linkage": "Vinculação","common.magneticTimeline": "Linha do tempo magnética","common.media": "Mídia","common.medium": "Médio",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "Congelar, espelhar ou girar o clipe selecionado","tray.generateCaptions": "Gerar legendas","tray.hideMeters": "Ocultar os medidores de nível",+ "tray.linkage": "Vinculação: legendas, títulos, sobreposições e sons acompanham a faixa principal","tray.magneticTimelineDeletingTrimming": "Linha do tempo magnética: excluir e aparar fecham a lacuna","tray.panTool": "Ferramenta mão ({0})","tray.playerFollowsResizePlayhead": "O player acompanha o corte: a agulha segue a borda que você arrasta",diff --git a/src/crates/concat/locales/ru.json b/src/crates/concat/locales/ru.jsonindex 1e8321d2..48fcfa49 100644--- a/src/crates/concat/locales/ru.json+++ b/src/crates/concat/locales/ru.json@@ -168,6 +168,7 @@"common.left": "Слева","common.level": "Уровень","common.limited": "Ограниченный",+ "common.linkage": "Связь","common.magneticTimeline": "Магнитный таймлайн","common.media": "Медиа","common.medium": "Средний",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "Стоп-кадр, отражение или поворот выбранного клипа","tray.generateCaptions": "Создать субтитры","tray.hideMeters": "Скрыть индикаторы уровня",+ "tray.linkage": "Связь: субтитры, титры, наложения и звуки двигаются вместе с основной дорожкой","tray.magneticTimelineDeletingTrimming": "Магнитный таймлайн: удаление и подрезка закрывают пробел","tray.panTool": "Инструмент «Рука» ({0})","tray.playerFollowsResizePlayhead": "Плеер следует за подрезкой: курсор движется вместе с краем, который вы подрезаете",diff --git a/src/crates/concat/locales/th.json b/src/crates/concat/locales/th.jsonindex fbfcdb99..b1dd8718 100644--- a/src/crates/concat/locales/th.json+++ b/src/crates/concat/locales/th.json@@ -168,6 +168,7 @@"common.left": "ซ้าย","common.level": "ระดับ","common.limited": "จำกัด",+ "common.linkage": "การเชื่อมโยง","common.magneticTimeline": "ไทม์ไลน์แม่เหล็ก","common.media": "สื่อ","common.medium": "กลาง",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "หยุดภาพ กลับด้าน หรือหมุนคลิปที่เลือก","tray.generateCaptions": "สร้างคำบรรยาย","tray.hideMeters": "ซ่อนมิเตอร์ระดับเสียง",+ "tray.linkage": "การเชื่อมโยง: คำบรรยาย ข้อความ ภาพซ้อน และเสียง เลื่อนตามแทร็กหลัก","tray.magneticTimelineDeletingTrimming": "ไทม์ไลน์แม่เหล็ก: การลบและการทริมจะปิดช่องว่าง","tray.panTool": "เครื่องมือเลื่อนมุมมอง ({0})","tray.playerFollowsResizePlayhead": "เครื่องเล่นตามการปรับขนาด: หัวเล่นจะเลื่อนตามขอบที่คุณทริม",diff --git a/src/crates/concat/locales/tr.json b/src/crates/concat/locales/tr.jsonindex fa5c19e2..af5d844f 100644--- a/src/crates/concat/locales/tr.json+++ b/src/crates/concat/locales/tr.json@@ -168,6 +168,7 @@"common.left": "Sol","common.level": "Seviye","common.limited": "Sınırlı",+ "common.linkage": "Bağlantı","common.magneticTimeline": "Manyetik zaman çizelgesi","common.media": "Medya","common.medium": "Orta",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "Seçili klibi dondur, aynala veya döndür","tray.generateCaptions": "Altyazı oluştur","tray.hideMeters": "Seviye göstergelerini gizle",+ "tray.linkage": "Bağlantı: altyazılar, başlıklar, katmanlar ve sesler ana parçayla birlikte kayar","tray.magneticTimelineDeletingTrimming": "Manyetik zaman çizelgesi: silme ve kırpma boşluğu kapatır","tray.panTool": "El aracı ({0})","tray.playerFollowsResizePlayhead": "Oynatıcı kırpmayı izler: oynatma kafası kırptığınız kenarla birlikte hareket eder",diff --git a/src/crates/concat/locales/uk.json b/src/crates/concat/locales/uk.jsonindex 22aee221..e1459e86 100644--- a/src/crates/concat/locales/uk.json+++ b/src/crates/concat/locales/uk.json@@ -168,6 +168,7 @@"common.left": "Ліворуч","common.level": "Рівень","common.limited": "Обмежений",+ "common.linkage": "Зв'язок","common.magneticTimeline": "Магнітна часова шкала","common.media": "Медіа","common.medium": "Середній",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "Стоп-кадр, віддзеркалення чи поворот вибраного кліпу","tray.generateCaptions": "Створити субтитри","tray.hideMeters": "Сховати індикатори рівня",+ "tray.linkage": "Зв'язок: субтитри, титри, накладання та звуки рухаються разом з основною доріжкою","tray.magneticTimelineDeletingTrimming": "Магнітна часова шкала: видалення й обрізання закривають проміжок","tray.panTool": "Інструмент «Рука» ({0})","tray.playerFollowsResizePlayhead": "Плеєр слідує за обрізанням: курсор рухається разом із краєм, який ви обрізаєте",diff --git a/src/crates/concat/locales/ur.json b/src/crates/concat/locales/ur.jsonindex fa768817..535d805f 100644--- a/src/crates/concat/locales/ur.json+++ b/src/crates/concat/locales/ur.json@@ -168,6 +168,7 @@"common.left": "بائیں","common.level": "لیول","common.limited": "محدود",+ "common.linkage": "ربط","common.magneticTimeline": "مقناطیسی ٹائم لائن","common.media": "میڈیا","common.medium": "درمیانہ",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "منتخب کلپ کو منجمد کریں، عکس بنائیں یا گھمائیں","tray.generateCaptions": "کیپشن بنائیں","tray.hideMeters": "لیول میٹر چھپائیں",+ "tray.linkage": "ربط: کیپشن، عنوان، اوورلے اور آوازیں مرکزی ٹریک کے ساتھ حرکت کرتی ہیں","tray.magneticTimelineDeletingTrimming": "مقناطیسی ٹائم لائن: حذف اور ٹرم خالی جگہ بند کرتے ہیں","tray.panTool": "پین ٹول ({0})","tray.playerFollowsResizePlayhead": "پلیئر سائز بدلنے کے ساتھ چلتا ہے: پلے ہیڈ اس کنارے کے ساتھ رہتا ہے جسے آپ ٹرم کریں",diff --git a/src/crates/concat/locales/vi.json b/src/crates/concat/locales/vi.jsonindex a88ae514..d9d6d07a 100644--- a/src/crates/concat/locales/vi.json+++ b/src/crates/concat/locales/vi.json@@ -168,6 +168,7 @@"common.left": "Trái","common.level": "Mức","common.limited": "Giới hạn",+ "common.linkage": "Liên kết","common.magneticTimeline": "Dòng thời gian từ tính","common.media": "Phương tiện","common.medium": "Trung bình",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "Đóng băng, lật gương hoặc xoay clip đã chọn","tray.generateCaptions": "Tạo phụ đề","tray.hideMeters": "Ẩn đồng hồ mức âm",+ "tray.linkage": "Liên kết: phụ đề, tiêu đề, lớp phủ và âm thanh di chuyển cùng track chính","tray.magneticTimelineDeletingTrimming": "Dòng thời gian từ tính: xóa và cắt sẽ đóng khoảng trống","tray.panTool": "Công cụ di chuyển khung nhìn ({0})","tray.playerFollowsResizePlayhead": "Đầu phát đi theo thao tác đổi kích thước: đầu phát bám theo mép đang cắt",diff --git a/src/crates/concat/locales/zh-Hans.json b/src/crates/concat/locales/zh-Hans.jsonindex 8988c5f1..59cf1d5a 100644--- a/src/crates/concat/locales/zh-Hans.json+++ b/src/crates/concat/locales/zh-Hans.json@@ -168,6 +168,7 @@"common.left": "左","common.level": "电平","common.limited": "有限",+ "common.linkage": "联动","common.magneticTimeline": "磁性时间线","common.media": "媒体","common.medium": "中",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "定格、镜像或旋转所选片段","tray.generateCaptions": "生成字幕","tray.hideMeters": "隐藏电平表",+ "tray.linkage": "联动:字幕、文字、画中画和音频随主轨道一起移动","tray.magneticTimelineDeletingTrimming": "磁性时间线:删除和修剪时自动合拢间隙","tray.panTool": "平移工具 ({0})","tray.playerFollowsResizePlayhead": "播放器跟随修剪:播放头随你修剪的边缘移动",diff --git a/src/crates/concat/locales/zh-TW.json b/src/crates/concat/locales/zh-TW.jsonindex a1ef1bb8..4bd34805 100644--- a/src/crates/concat/locales/zh-TW.json+++ b/src/crates/concat/locales/zh-TW.json@@ -168,6 +168,7 @@"common.left": "左","common.level": "電平","common.limited": "有限",+ "common.linkage": "連動","common.magneticTimeline": "磁性時間軸","common.media": "媒體","common.medium": "中",@@ -883,6 +884,7 @@"tray.freezeMirrorRotateSelected": "定格、鏡像或旋轉所選片段","tray.generateCaptions": "產生字幕","tray.hideMeters": "隱藏音量表",+ "tray.linkage": "連動:字幕、文字、子母畫面和音訊隨主軌道一起移動","tray.magneticTimelineDeletingTrimming": "磁性時間軸:刪除和修剪時自動合攏間隙","tray.panTool": "平移工具 ({0})","tray.playerFollowsResizePlayhead": "播放器跟隨修剪:播放磁頭隨你修剪的邊緣移動",diff --git a/src/crates/concat/src/lib.rs b/src/crates/concat/src/lib.rsindex 600b0f26..d8c507cd 100644--- a/src/crates/concat/src/lib.rs+++ b/src/crates/concat/src/lib.rs@@ -1060,6 +1060,9 @@ fn start(project: Option<std::path::PathBuf>, smoke: bool) -> Result<(), slint::editor.on_magnetic_changed(on_window!(|state, on: bool| {state.handle(Msg::Timeline(TimelineMsg::MagneticChanged(on)));}));+ editor.on_linkage_changed(on_window!(|state, on: bool| {+ state.handle(Msg::Timeline(TimelineMsg::LinkageChanged(on)));+ }));editor.on_trim_follow_changed(on_window!(|state, on: bool| {state.handle(Msg::Timeline(TimelineMsg::TrimFollowChanged(on)));}));@@ -1707,7 +1710,7 @@ fn start(project: Option<std::path::PathBuf>, smoke: bool) -> Result<(), slint::.on_release(|| Shell::with(|_, app| app.invoke_blur()));editor.on_shortcut(move |action: SharedString| match action.as_str() {"import" | "export" | "settings" | "zoom-in" | "zoom-out" | "start" | "end"- | "prev-edit" | "next-edit" | "snap" | "magnetic" | "pan" | "preview-axis" => {+ | "prev-edit" | "next-edit" | "snap" | "magnetic" | "linkage" | "pan" | "preview-axis" => {Shell::with(|_, app| app.invoke_app_menu_selected(action.clone()));}_ => Shell::with(|shell, app| {@@ -2327,6 +2330,10 @@ fn start(project: Option<std::path::PathBuf>, smoke: bool) -> Result<(), slint::state.handle(Msg::Timeline(TimelineMsg::PreviewAxisChanged(on)))}"magnetic" => state.handle(Msg::Timeline(TimelineMsg::MagneticToggled)),+ "linkage" => {+ let on = !state.timeline().linkage;+ state.handle(Msg::Timeline(TimelineMsg::LinkageChanged(on)))+ }"sort-added" => state.handle(Msg::Media(MediaMsg::SortChanged(0))),"sort-name" => state.handle(Msg::Media(MediaMsg::SortChanged(1))),"sort-kind" => state.handle(Msg::Media(MediaMsg::SortChanged(2))),diff --git a/src/crates/concat/src/panes/timeline.rs b/src/crates/concat/src/panes/timeline.rsindex 16dc4cfb..7cc0e37c 100644--- a/src/crates/concat/src/panes/timeline.rs+++ b/src/crates/concat/src/panes/timeline.rs@@ -17,6 +17,8 @@use std::collections::HashMap;+use concat_project::Command;+use crate::studio::Studio;use crate::ui::{TimelineTool, TrackSize};@@ -58,6 +60,8 @@ pub enum TimelineMsg {MagneticChanged(bool),/// The menu's Magnetic row: the other way round.MagneticToggled,+ /// Linkage on or off for the active timeline: an edit, undone as one.+ LinkageChanged(bool),/// The tray's preview axis button: the monitor follows the pointer./// A preference, remembered.TrimFollowChanged(bool),@@ -139,6 +143,10 @@ impl TimelinePane {studio.prefs.set_magnetic(on);studio.prefs.save(&studio.host.dirs);}+ TimelineMsg::LinkageChanged(on) => {+ let timeline_id = studio.timeline().id.clone();+ studio.apply(Command::SetTimelineLinkage { timeline_id, on });+ }TimelineMsg::MagneticToggled => {let on = !studio.prefs.magnetic();studio.prefs.set_magnetic(on);diff --git a/src/crates/concat/src/studio.rs b/src/crates/concat/src/studio.rsindex 92a5ddda..b6a8967c 100644--- a/src/crates/concat/src/studio.rs+++ b/src/crates/concat/src/studio.rs@@ -9785,6 +9785,7 @@ impl Studio {editor.set_tool(self.lanes.tool);editor.set_snap(self.lanes.snap);editor.set_magnetic(self.prefs.magnetic());+ editor.set_linkage(self.timeline().linkage);editor.set_trim_follow(self.prefs.trim_follow);editor.set_meters_shown(self.prefs.meters_shown());editor.set_preview_axis(self.prefs.preview_axis);@@ -12379,6 +12380,17 @@ impl Studio {checkable: true,checked: self.prefs.magnetic(),},+ MenuItemData {+ id: "linkage".into(),+ label: t("common.linkage").into(),+ kind: MenuRow::Action,+ glyph: Glyph::None,+ shortcut: "".into(),+ enabled: true,+ danger: false,+ checkable: true,+ checked: self.timeline().linkage,+ },],2 => vec![row(diff --git a/src/crates/concat/ui/editor.slint b/src/crates/concat/ui/editor.slintindex 80fa7d81..ea0ed0ba 100644--- a/src/crates/concat/ui/editor.slint+++ b/src/crates/concat/ui/editor.slint@@ -331,6 +331,9 @@ export global Editor {/// leave. A remembered preference, which Rust owns; the tray's button/// and the Settings switch both show it.in-out property <bool> magnetic;+ /// Linkage: the other lanes follow an edit that closes up or opens+ /// the main one. The active timeline's, which Rust owns.+ in-out property <bool> linkage: true;/// Hand tool: wheel and drag pan time instead of scrolling the stack.in-out property <bool> pan-mode: false;/// Trim follow: the playhead rides a clip edge while it is dragged. A@@ -382,6 +385,7 @@ export global Editor {callback tool-changed(tool: TimelineTool);callback snap-changed(snap: bool);callback magnetic-changed(on: bool);+ callback linkage-changed(on: bool);callback pan-changed(on: bool);callback trim-follow-changed(on: bool);callback meters-shown-changed(on: bool);diff --git a/src/crates/concat/ui/icons.slint b/src/crates/concat/ui/icons.slintindex 1881d4dd..f4874f36 100644--- a/src/crates/concat/ui/icons.slint+++ b/src/crates/concat/ui/icons.slint@@ -124,6 +124,7 @@ export enum Glyph {trash,magnet,fold,+ link,/// the preview axis: a hairline with the pointer beside itaxis,/// trim follow: the playhead between two arrows pulling an edge@@ -756,6 +757,14 @@ export component Icon inherits Rectangle {+ " M19 9l-3 3 3 3 M5 15l3-3-3-3";}+ // lucide/link: two links of a chain, for linkage - the lanes held to+ // the main one.+ if root.glyph == Glyph.link: Stroked {+ size: root.size; tint: root.tint; weight: root.weight;+ commands: "M10 13a5 5 0 0 0 7.54.54l3-3a5 5 0 0 0-7.07-7.07l-1.72 1.71"+ + " M14 11a5 5 0 0 0-7.54-.54l-3 3a5 5 0 0 0 7.07 7.07l1.71-1.71";+ }+// The preview axis: a hairline down the lanes and the pointer beside// it - the frame under the pointer, shown without moving the playhead.if root.glyph == Glyph.axis: Stroked {diff --git a/src/crates/concat/ui/timeline/tray.slint b/src/crates/concat/ui/timeline/tray.slintindex c7c84c2f..efc160c8 100644--- a/src/crates/concat/ui/timeline/tray.slint+++ b/src/crates/concat/ui/timeline/tray.slint@@ -156,6 +156,7 @@ export component TimelineTray inherits Rectangle {in property <TimelineTool> tool: TimelineTool.select;in property <bool> snap: true;in property <bool> magnetic: false;+ in property <bool> linkage: true;in property <bool> pan-mode: false;/// Trim follow: the playhead rides a clip edge while it is dragged.in property <bool> trim-follow: false;@@ -190,6 +191,7 @@ export component TimelineTray inherits Rectangle {callback tool-changed(tool: TimelineTool);callback snap-changed(snap: bool);callback magnetic-changed(on: bool);+ callback linkage-changed(on: bool);callback pan-changed(on: bool);callback trim-follow-changed(on: bool);callback preview-axis-changed(on: bool);@@ -390,6 +392,16 @@ export component TimelineTray inherits Rectangle {checked: root.magnetic;clicked => { root.magnetic-changed(!root.magnetic); }}+ // Linkage, beside the magnetic timeline it keeps in step: when the+ // main lane closes up or opens, the captions, titles, overlays and+ // sounds placed against it move with it.+ TrayButton {+ glyph: Glyph.link;+ label: I18n.t("tray.linkage");+ icon-size: 16px;+ checked: root.linkage;+ clicked => { root.linkage-changed(!root.linkage); }+ }Divider { }diff --git a/src/crates/concat/ui/workspace/seat.slint b/src/crates/concat/ui/workspace/seat.slintindex 7f140a53..c2fce72d 100644--- a/src/crates/concat/ui/workspace/seat.slint+++ b/src/crates/concat/ui/workspace/seat.slint@@ -383,6 +383,7 @@ export component Seat inherits Rectangle {tool: Editor.tool;snap: Editor.snap;magnetic: Editor.magnetic;+ linkage: Editor.linkage;pan-mode: Editor.pan-mode;trim-follow: Editor.trim-follow;meters-shown: Editor.meters-shown;@@ -415,6 +416,7 @@ export component Seat inherits Rectangle {tool-changed(tool) => { Editor.tool-changed(tool); }snap-changed(snap) => { Editor.snap-changed(snap); }magnetic-changed(on) => { Editor.magnetic-changed(on); }+ linkage-changed(on) => { Editor.linkage-changed(on); }pan-changed(on) => { Editor.pan-changed(on); }trim-follow-changed(on) => { Editor.trim-follow-changed(on); }meters-shown-changed(on) => { Editor.meters-shown-changed(on); }diff --git a/src/crates/concat/ui/workspace/timeline-pane.slint b/src/crates/concat/ui/workspace/timeline-pane.slintindex f5a708f3..2c8a1774 100644--- a/src/crates/concat/ui/workspace/timeline-pane.slint+++ b/src/crates/concat/ui/workspace/timeline-pane.slint@@ -39,6 +39,7 @@ export component TimelinePane inherits Rectangle {in property <TimelineTool> tool: TimelineTool.select;in property <bool> snap: true;in property <bool> magnetic: false;+ in property <bool> linkage: true;in property <bool> pan-mode: false;in property <bool> trim-follow: false;in property <bool> preview-axis: false;@@ -62,6 +63,7 @@ export component TimelinePane inherits Rectangle {callback tool-changed(tool: TimelineTool);callback snap-changed(snap: bool);callback magnetic-changed(on: bool);+ callback linkage-changed(on: bool);callback pan-changed(on: bool);callback trim-follow-changed(on: bool);callback preview-axis-changed(on: bool);@@ -319,6 +321,7 @@ export component TimelinePane inherits Rectangle {tool: root.tool;snap: root.snap;magnetic: root.magnetic;+ linkage: root.linkage;pan-mode: root.pan-mode;trim-follow: root.trim-follow;preview-axis: root.preview-axis;@@ -339,6 +342,7 @@ export component TimelinePane inherits Rectangle {tool-changed(tool) => { root.tool-changed(tool); }snap-changed(snap) => { root.snap-changed(snap); }magnetic-changed(on) => { root.magnetic-changed(on); }+ linkage-changed(on) => { root.linkage-changed(on); }pan-changed(on) => { root.pan-changed(on); }trim-follow-changed(on) => { root.trim-follow-changed(on); }preview-axis-changed(on) => { root.preview-axis-changed(on); }