From a5a66918ce51482f2e3d7c4f0f92b1c516c3b217 Mon Sep 17 00:00:00 2001
From: May Kittens Devour Your Soul <yoshimitsu002@gmail.com>
Date: Mon, 11 Mar 2019 11:21:11 +0100
Subject: [PATCH 1/4] Update hrv_OCRFixReplaceList.xml

---
 Dictionaries/hrv_OCRFixReplaceList.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Dictionaries/hrv_OCRFixReplaceList.xml b/Dictionaries/hrv_OCRFixReplaceList.xml
index 652977022..e314a4b5e 100644
--- a/Dictionaries/hrv_OCRFixReplaceList.xml
+++ b/Dictionaries/hrv_OCRFixReplaceList.xml
@@ -404,6 +404,8 @@
     <Word from="Interesuju" to="Zanimaju" />
     <Word from="interesuju" to="zanimaju" />
     <Word from="isekao" to="izrezao" />
+    <Word from="islednik" to="detektiv" />
+    <Word from="Islednik" to="Detektiv" />
     <Word from="isljednici" to="detektivi" />
     <Word from="isljednicima" to="detektivima" />
     <Word from="isljednike" to="detektive" />
@@ -703,6 +705,7 @@
     <Word from="merdevine" to="ljestve" />
     <Word from="merdevinama" to="ljestvama" />
     <Word from="merljivo" to="mjerljivo" />
+    <Word from="mešajte" to="miješajte" />
     <Word from="mešane" to="miješane" />
     <Word from="mešavina" to="mješavina" />
     <Word from="mešavine" to="mješavine" />
@@ -1584,6 +1587,7 @@
     <Word from="tvrtci" to="tvrtki" />
     <Word from="ubede" to="uvjere" />
     <Word from="Ubeđivao" to="Uvjeravao" />
+    <Word from="ubeđivao" to="uvjeravao" />
     <Word from="ubeđivati" to="uvjeravati" />
     <Word from="ubijedio" to="uvjerio" />
     <Word from="ubjeđivati" to="uvjeravati" />
@@ -3103,8 +3107,8 @@
     <RegEx find="varać" replaceWith="varat ć" />
     <RegEx find="\bvarvar" replaceWith="barbar" />
     <RegEx find="\bVarvar" replaceWith="Barbar" />
-    <RegEx find="vaskrsn" replaceWith="uskrns" />
-    <RegEx find="Vaskrsn" replaceWith="Uskrns" />
+    <RegEx find="vaskrs[en]" replaceWith="uskrns" />
+    <RegEx find="Vaskrs[en]" replaceWith="Uskrns" />
     <RegEx find="vaspitan" replaceWith="obrazovan" />
     <RegEx find="Vaspitan" replaceWith="Obrazovan" />
     <RegEx find="vaspitn" replaceWith="obrazovn" />
@@ -3418,6 +3422,7 @@
     <RegEx find="s([čć])" replaceWith="š$1" />
     <RegEx find="seden" replaceWith="sjeden" />
     <RegEx find="selektuj" replaceWith="odaber" />
+    <RegEx find="sljen" replaceWith="slen" />
     <RegEx find="sjp" replaceWith="spj" />
     <RegEx find="smeva" replaceWith="smijava" />
     <RegEx find="stać(?!i)" replaceWith="stat ć" />

From 65c68fbafeef6596ec82025eef8e2e7fe1dc3908 Mon Sep 17 00:00:00 2001
From: May Kittens Devour Your Soul <yoshimitsu002@gmail.com>
Date: Mon, 11 Mar 2019 11:24:26 +0100
Subject: [PATCH 2/4] Update hrv_OCRFixReplaceList.xml

---
 Dictionaries/hrv_OCRFixReplaceList.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Dictionaries/hrv_OCRFixReplaceList.xml b/Dictionaries/hrv_OCRFixReplaceList.xml
index e314a4b5e..e4d800301 100644
--- a/Dictionaries/hrv_OCRFixReplaceList.xml
+++ b/Dictionaries/hrv_OCRFixReplaceList.xml
@@ -713,6 +713,7 @@
     <Word from="minut" to="minutu" />
     <Word from="mje" to="moje" />
     <Word from="mleo" to="mljeo" />
+    <Word from="moež" to="može" />
     <Word from="moč" to="moć" />
     <Word from="mođe" to="može" />
     <Word from="mofu" to="mogu" />
@@ -994,6 +995,7 @@
     <Word from="Plenom" to="Plijenom" />
     <Word from="pljenom" to="plijenom" />
     <Word from="Pljenom" to="Plijenom" />
+    <Word from="pocetku" to="početku" />
     <Word from="počeću" to="počet ću" />
     <Word from="poči" to="poći" />
     <Word from="podjelimo" to="podijelimo" />
@@ -3306,6 +3308,7 @@
     <RegEx find="(?&lt;!hva)lisa([ol])" replaceWith="lira$1" />
     <RegEx find="(?&lt;!hva)lisati" replaceWith="lirati" />
     <RegEx find="irać" replaceWith="irat ć" />
+    <RegEx find="izovan " replaceWith="iziran" />
     <RegEx find="jći" replaceWith="jući" />
     <RegEx find="jdin" replaceWith="jedin" />
     <RegEx find="kodnevnic" replaceWith="kodnevic" />

From 7f36fbc001d2c16e6ebd77e7f27f2048ac9ece16 Mon Sep 17 00:00:00 2001
From: May Kittens Devour Your Soul <yoshimitsu002@gmail.com>
Date: Mon, 11 Mar 2019 11:26:35 +0100
Subject: [PATCH 3/4] Update hrv_OCRFixReplaceList.xml

---
 Dictionaries/hrv_OCRFixReplaceList.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Dictionaries/hrv_OCRFixReplaceList.xml b/Dictionaries/hrv_OCRFixReplaceList.xml
index e4d800301..cd6e74365 100644
--- a/Dictionaries/hrv_OCRFixReplaceList.xml
+++ b/Dictionaries/hrv_OCRFixReplaceList.xml
@@ -713,7 +713,6 @@
     <Word from="minut" to="minutu" />
     <Word from="mje" to="moje" />
     <Word from="mleo" to="mljeo" />
-    <Word from="moež" to="može" />
     <Word from="moč" to="moć" />
     <Word from="mođe" to="može" />
     <Word from="mofu" to="mogu" />

From 9484ffbca1dfbd1e8ae9d7973e5a82df7b6545f7 Mon Sep 17 00:00:00 2001
From: Nikolaj Olsson <nio@bluegarden.com>
Date: Tue, 12 Mar 2019 06:53:07 +0100
Subject: [PATCH 4/4] Make "Extend current line to next subtitle or max" affect
 original - thx OmrSi :)

---
 src/Forms/Main.cs | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs
index 8c71f1104..000687d95 100644
--- a/src/Forms/Main.cs
+++ b/src/Forms/Main.cs
@@ -14600,19 +14600,46 @@ namespace Nikse.SubtitleEdit.Forms
             {
                 if (SubtitleListview1.SelectedItems.Count == 1)
                 {
+                    var historyAdded = false;
                     var idx = SubtitleListview1.SelectedItems[0].Index;
                     var p = _subtitle.Paragraphs[idx];
                     var next = _subtitle.GetParagraphOrDefault(idx + 1);
                     if (next == null || next.StartTime.TotalMilliseconds > p.EndTime.TotalMilliseconds + Configuration.Settings.General.SubtitleMaximumDisplayMilliseconds + Configuration.Settings.General.MinimumMillisecondsBetweenLines)
                     {
                         MakeHistoryForUndo(string.Format(_language.BeforeX, Configuration.Settings.Language.Settings.AdjustExtendCurrentSubtitle));
+                        historyAdded = true;
                         p.EndTime.TotalMilliseconds = p.StartTime.TotalMilliseconds + Configuration.Settings.General.SubtitleMaximumDisplayMilliseconds;
                     }
                     else if (next != null && next.StartTime.TotalMilliseconds > p.EndTime.TotalMilliseconds)
                     {
                         MakeHistoryForUndo(string.Format(_language.BeforeX, Configuration.Settings.Language.Settings.AdjustExtendCurrentSubtitle));
+                        historyAdded = true;
                         p.EndTime.TotalMilliseconds = next.StartTime.TotalMilliseconds - Configuration.Settings.General.MinimumMillisecondsBetweenLines;
                     }
+                    if (_subtitleAlternate != null && Configuration.Settings.General.AllowEditOfOriginalSubtitle)
+                    {
+                        var original = Utilities.GetOriginalParagraph(idx, p, _subtitleAlternate.Paragraphs);
+                        if (original != null)
+                        {
+                            var originalNext = _subtitleAlternate.GetParagraphOrDefault(_subtitleAlternate.GetIndex(original) + 1);
+                            if (originalNext == null || originalNext.StartTime.TotalMilliseconds > original.EndTime.TotalMilliseconds + Configuration.Settings.General.SubtitleMaximumDisplayMilliseconds + Configuration.Settings.General.MinimumMillisecondsBetweenLines)
+                            {
+                                if (!historyAdded)
+                                {
+                                    MakeHistoryForUndo(string.Format(_language.BeforeX, Configuration.Settings.Language.Settings.AdjustExtendCurrentSubtitle));
+                                }
+                                original.EndTime.TotalMilliseconds = original.StartTime.TotalMilliseconds + Configuration.Settings.General.SubtitleMaximumDisplayMilliseconds;
+                            }
+                            else if (originalNext != null && originalNext.StartTime.TotalMilliseconds > original.EndTime.TotalMilliseconds)
+                            {
+                                if (!historyAdded)
+                                {
+                                    MakeHistoryForUndo(string.Format(_language.BeforeX, Configuration.Settings.Language.Settings.AdjustExtendCurrentSubtitle));
+                                }
+                                original.EndTime.TotalMilliseconds = originalNext.StartTime.TotalMilliseconds - Configuration.Settings.General.MinimumMillisecondsBetweenLines;
+                            }
+                        }
+                    }
                     RefreshSelectedParagraph();
                     e.SuppressKeyPress = true;
                 }