From 757fbbd623ce00d5de10194bcb8a8139af923771 Mon Sep 17 00:00:00 2001
From: May Kittens Devour Your Soul <yoshimitsu002@gmail.com>
Date: Tue, 21 Nov 2023 11:56:02 +0100
Subject: [PATCH 1/4] Update hrv_OCRFixReplaceList.xml

---
 Dictionaries/hrv_OCRFixReplaceList.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Dictionaries/hrv_OCRFixReplaceList.xml b/Dictionaries/hrv_OCRFixReplaceList.xml
index 3aca62d87..05998c6c0 100644
--- a/Dictionaries/hrv_OCRFixReplaceList.xml
+++ b/Dictionaries/hrv_OCRFixReplaceList.xml
@@ -1741,9 +1741,6 @@
     <Word from="prineo" to="prinio" />
     <Word from="Prineo" to="Prinio" />
     <Word from="pripovetke" to="pripovjetke" />
-    <Word from="pripoveda" to="pripovijeda" />
-    <Word from="pripovedala" to="pripovijedala" />
-    <Word from="pripovedanje" to="pripovijedanje" />
     <Word from="privilegovan" to="privilegiran" />
     <Word from="privilegovani" to="privilegirani" />
     <Word from="prjevoz" to="prijevoz" />
@@ -3878,7 +3875,15 @@
     <LinePart from="Želi da zna" to="Želi znati" />
     <LinePart from="želi da zna" to="želi znati" />
   </PartialLines>
-  <BeginLines />
+  <BeginLines>
+    <Beginning from="-] " to="- I " />
+    <Beginning from="- ] " to="- I " />
+    <Beginning from="] " to="I " />
+    <Beginning from="-| " to="- I " />
+    <Beginning from="- | " to="- I " />
+    <Beginning from="l " to="I " />
+    <Beginning from="- l " to="- I " />
+  </BeginLines>
   <EndLines />
   <RegularExpressions>
     <!-- deklinacije imenica i konjugacije glagola -->
@@ -4451,6 +4456,7 @@
     <RegEx find="\b([pP])rimet([aln])" replaceWith="$1rimjet$2" />
     <RegEx find="([pP])rimj?et([ie])" replaceWith="$1rimijet$2" />
     <RegEx find="\b([pP])rimj?eni([lošmt])" replaceWith="$1rimijeni$2" />
+    <RegEx find="([pP])ripovj?eda" replaceWith="$1ripovijeda" />
     <RegEx find="([pP])(ri|od)sj?e[čć]a" replaceWith="$1$2sjeća" />
     <RegEx find="\b([pP])rocen(?!t)" replaceWith="$1rocjen" />
     <RegEx find="([pP])rose([kcč])" replaceWith="$1rosje$2" />

From bc47ac041a46912d7037f0d67aebea4223d49c57 Mon Sep 17 00:00:00 2001
From: niksedk <nikse.dk@gmail.com>
Date: Thu, 23 Nov 2023 16:56:46 +0100
Subject: [PATCH 2/4] Work on #7656

---
 src/ui/Forms/AudioToText/WhisperDownload.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/ui/Forms/AudioToText/WhisperDownload.cs b/src/ui/Forms/AudioToText/WhisperDownload.cs
index 8d9aeb2cb..31ed8a247 100644
--- a/src/ui/Forms/AudioToText/WhisperDownload.cs
+++ b/src/ui/Forms/AudioToText/WhisperDownload.cs
@@ -51,7 +51,12 @@ namespace Nikse.SubtitleEdit.Forms.AudioToText
 
         private static readonly string[] Sha512HashesCppCuBlas =
         {
-            "de5b6fe7487f4cdc5e883ef6825dd0ecfe3ce4f9c914b0e02ba19b89c138e47e76584ae221a75eb7aed1a96893d4764401e065e196e0455a2e72050209252780", // 1.5.0
+            "f5bbad24cb99333cb6d9ec95e6797dda9e36f834fc0d4cee84d839637a06b5564df09b49f5ca6c16b2cf681429155b1ceee808d411024da658fba52d503cebdf", // 1.5.0 second upload
+        };
+
+        private static readonly string[] OldSha512HashesCppCuBlas =
+        {
+            "de5b6fe7487f4cdc5e883ef6825dd0ecfe3ce4f9c914b0e02ba19b89c138e47e76584ae221a75eb7aed1a96893d4764401e065e196e0455a2e72050209252780", // 1.5.0 first upload
         };
 
         private const string DownloadUrlConstMe = "https://github.com/Const-me/Whisper/releases/download/1.12.0/cli.zip";

From 3dbc6d553e2edeb4384aac1c5b84c666ee737454 Mon Sep 17 00:00:00 2001
From: niksedk <nikse.dk@gmail.com>
Date: Thu, 23 Nov 2023 21:37:15 +0100
Subject: [PATCH 3/4] Fix for CLI MergeShortLines - thx BenJamesAndo :) Work on
 #7655

---
 src/ui/Logic/CommandLineConvert/CommandLineConverter.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ui/Logic/CommandLineConvert/CommandLineConverter.cs b/src/ui/Logic/CommandLineConvert/CommandLineConverter.cs
index 592986d89..fc1e863da 100644
--- a/src/ui/Logic/CommandLineConvert/CommandLineConverter.cs
+++ b/src/ui/Logic/CommandLineConvert/CommandLineConverter.cs
@@ -2290,7 +2290,7 @@ namespace Nikse.SubtitleEdit.Logic.CommandLineConvert
 
                             break;
                         case BatchAction.MergeShortLines:
-                            var mergedShortLinesSub = MergeShortLinesUtils.MergeShortLinesInSubtitle(sub, Configuration.Settings.Tools.MergeShortLinesMaxGap, Configuration.Settings.General.SubtitleLineMaximumLength, Configuration.Settings.Tools.MergeShortLinesOnlyContinuous);
+                            var mergedShortLinesSub = MergeShortLinesUtils.MergeShortLinesInSubtitle(sub, Configuration.Settings.Tools.MergeShortLinesMaxGap, Configuration.Settings.Tools.MergeShortLinesMaxChars, Configuration.Settings.Tools.MergeShortLinesOnlyContinuous);
                             if (mergedShortLinesSub.Paragraphs.Count != sub.Paragraphs.Count)
                             {
                                 sub.Paragraphs.Clear();

From 387c50aba8f7de34d3d0c3f1bf0787ae612c8e52 Mon Sep 17 00:00:00 2001
From: niksedk <nikse.dk@gmail.com>
Date: Thu, 23 Nov 2023 21:45:31 +0100
Subject: [PATCH 4/4] Add ".opus" as audio file extension - thx vivadavid :)
 Work on #7659

---
 src/libse/Common/Utilities.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libse/Common/Utilities.cs b/src/libse/Common/Utilities.cs
index a6c1cda3a..de20d188b 100644
--- a/src/libse/Common/Utilities.cs
+++ b/src/libse/Common/Utilities.cs
@@ -30,7 +30,7 @@ namespace Nikse.SubtitleEdit.Core.Common
         private static readonly Regex RegexNumberSpacePeriod = new Regex(@"(\d) (\.)", RegexOptions.Compiled);
 
         public static string[] VideoFileExtensions { get; } = { ".avi", ".mkv", ".wmv", ".mpg", ".mpeg", ".divx", ".mp4", ".asf", ".flv", ".mov", ".m4v", ".vob", ".ogv", ".webm", ".ts", ".tts", ".m2ts", ".mts", ".avs", ".mxf" };
-        public static string[] AudioFileExtensions { get; } = { ".mp3", ".wav", ".wma", ".ogg", ".mpa", ".m4a", ".ape", ".aiff", ".flac", ".aac", ".ac3", ".eac3", ".mka" };
+        public static string[] AudioFileExtensions { get; } = { ".mp3", ".wav", ".wma", ".ogg", ".mpa", ".m4a", ".ape", ".aiff", ".flac", ".aac", ".ac3", ".eac3", ".mka", ".opus" };
 
         public static bool IsInteger(string s)
         {