diff --git a/LanguageBaseEnglish.xml b/LanguageBaseEnglish.xml index 5e01d4183..e438c838a 100644 --- a/LanguageBaseEnglish.xml +++ b/LanguageBaseEnglish.xml @@ -2525,6 +2525,8 @@ can edit in same subtitle file (collaboration) Merge selected lines and unbreak without space (CJK) Merge selected lines, keep only first non-empty text Merge selected lines bilingual + Merge with prevous bilingual + Merge with next bilingual Split selected line bilingual Toggle translator mode Switch original and translation diff --git a/src/ui/Forms/Main.cs b/src/ui/Forms/Main.cs index 1fe8e44a0..a40791e83 100644 --- a/src/ui/Forms/Main.cs +++ b/src/ui/Forms/Main.cs @@ -11933,10 +11933,16 @@ namespace Nikse.SubtitleEdit.Forms next++; } - var arr = _subtitle.Paragraphs[index].Text.Trim().SplitToLines(); + var p = _subtitle.GetParagraphOrDefault(index); + if (p == null) + { + return; + } + + var arr = p.Text.Trim().SplitToLines(); if (arr.Count > 0) { - int mid = arr.Count / 2; + var mid = arr.Count / 2; for (var i = 0; i < arr.Count; i++) { var l = arr[i]; @@ -11951,7 +11957,7 @@ namespace Nikse.SubtitleEdit.Forms } } - durationMilliseconds += _subtitle.Paragraphs[index].Duration.TotalMilliseconds; + durationMilliseconds += p.Duration.TotalMilliseconds; } if (sb1.Length > 150 || sb2.Length > 150) diff --git a/src/ui/Logic/LanguageDeserializer.cs b/src/ui/Logic/LanguageDeserializer.cs index 03c1b183a..5c81a2355 100644 --- a/src/ui/Logic/LanguageDeserializer.cs +++ b/src/ui/Logic/LanguageDeserializer.cs @@ -6928,6 +6928,12 @@ namespace Nikse.SubtitleEdit.Logic case "Settings/MergeSelectedLinesBilingual": language.Settings.MergeSelectedLinesBilingual = reader.Value; break; + case "Settings/MergeWithPreviousBilingual": + language.Settings.MergeWithPreviousBilingual = reader.Value; + break; + case "Settings/MergeWithNextBilingual": + language.Settings.MergeWithNextBilingual = reader.Value; + break; case "Settings/SplitSelectedLineBilingual": language.Settings.SplitSelectedLineBilingual = reader.Value; break;