Merge pull request #1073 from xylographe/upkeep

Automated upkeep

Dictionaries/eng_OCRFixReplaceList.xml

@@ -2190,4 +2190,4 @@
   <RegularExpressions>
     <!-- <RegEx find="\bi\b" replaceWith="I" /> just an example - do not use this regex -->
   </RegularExpressions>
-</OCRFixReplaceList>
+</OCRFixReplaceList>

Dictionaries/hrv_OCRFixReplaceList.xml

@@ -314,7 +314,6 @@
     <Word from="suštinski" to="bitni" />
     <Word from="svideo" to="svidio" />
     <Word from="nači" to="naći" />
-    <Word from="naprimjer" to="na primjer" />
     <Word from="svestan" to="svjestan" />
     <Word from="šolja" to="šalica" />
     <Word from="šolju" to="šalicu" />
@@ -473,8 +472,8 @@
     <Word from="pomeraju" to="miču" />
     <Word from="pomeriš" to="pomakneš" />
     <Word from="pomerati" to="micati" />
-    <Word from="Porodica" to="Obitelj" />    
-    <Word from="Porodice" to="Obitelji" />  
+    <Word from="Porodica" to="Obitelj" />
+    <Word from="Porodice" to="Obitelji" />
     <Word from="porodica" to="obitelj" />
     <Word from="porodice" to="obitelji" />
     <Word from="porodici" to="obitelji" />
@@ -647,7 +646,7 @@
     <RegEx find="diskutuje" replaceWith="raspravlja" />
     <RegEx find="Diskutuje" replaceWith="Raspravlja" />
     <RegEx find="\b([dD])j?ete\b" replaceWith="$1ijete" />
-    <RegEx find="\b([dD])i?j?etet([au]|o[mv]|ov[aeiou]|ovo[mjg])\b" replaceWith="$1jetet$2"  />
+    <RegEx find="\b([dD])i?j?etet([au]|o[mv]|ov[aeiou]|ovo[mjg])\b" replaceWith="$1jetet$2" />
     <RegEx find="\b([dD])ec([aeiou]|om)\b" replaceWith="$1jec$2" />
     <RegEx find="\b([dD])e[čć]ic([aeiou]|om)\b" replaceWith="$1ječic$2" />
     <RegEx find="\b([dD])efinisan([aeiou]|om|og)?\b" replaceWith="$1efiniran$2" />
@@ -959,9 +958,8 @@
     <RegEx find="Pozorišt([aeu]|em|ima)?\b" replaceWith="Kazališt$1" />
     <RegEx find="([pP])rj?edlog(a|u|om)?\b" replaceWith="$1rijedlog$2" />
     <RegEx find="([pP])rj?edloz(i|ima)" replaceWith="$1rijedloz$2" />
-    <RegEx find="([pP])restupnik(a|u|om)\b" replaceWith="$1rijestupnik$2" />
     <RegEx find="([pP])rijtelj" replaceWith="$1rijatelj" />
-    <RegEx find="([pP])rj?estupnik([aeu]|om)?\b" replaceWith="$1rijestupnik$2" />
+    <RegEx find="([pP])rj?estupnik([aeu]|om)\b" replaceWith="$1rijestupnik$2" />
     <RegEx find="([pP])reter" replaceWith="$1retjer" />
     <RegEx find="([pP])roletn(a|o|om|oj|im)\b" replaceWith="$1roljetn$2" />
     <RegEx find="([pP])romen([aeiu]|om|ama)" replaceWith="$1romjen$2" />
@@ -992,7 +990,6 @@
     <RegEx find="([pP])rover" replaceWith="$1rovjer" />
     <RegEx find="([pP])rj?edlo([gz])([aeiu]|om|ima)" replaceWith="$1rijedlo$2$3" />
     <RegEx find="([pP])rj?eti(o|š|mo|te|l[aeio])" replaceWith="$1rijeti$2" />
-    <RegEx find="([pP])reter" replaceWith="$1retjer" />
     <RegEx find="prevazi" replaceWith="nadi" />
     <RegEx find="Prevazi" replaceWith="Nadi" />
     <RegEx find="([pP])rodavnic" replaceWith="$1rodavaonic" />
@@ -1174,7 +1171,7 @@
     <RegEx find="vaspitn" replaceWith="obrazovn" />
     <RegEx find="Vaspitn" replaceWith="Obrazovn" />
     <RegEx find="([vV])eoma" replaceWith="$1rlo" />
-   <RegEx find="\b([vV])er([aeiou]|an|ama|n[aeiou]|no[mgj]|om|nik|nik[aeu]|nikom|nic[aeiu]|nicom|nicama|nicima|sk[iaou]|sko[mgj]|skim|oval[aeio]|ti)\b" replaceWith="$1jer$2" />
+    <RegEx find="\b([vV])er([aeiou]|an|ama|n[aeiou]|no[mgj]|om|nik|nik[aeu]|nikom|nic[aeiu]|nicom|nicama|nicima|sk[iaou]|sko[mgj]|skim|oval[aeio]|ti)\b" replaceWith="$1jer$2" />
     <RegEx find="([vV])erova(o|l[aeio]|še|ti)" replaceWith="$1jerova$2" />
     <RegEx find="([vV])ero[vj]at" replaceWith="$1jerojat" />
     <RegEx find="([vV])eruj(e|u|em|eš|ete|emo|te)?" replaceWith="$1jeruj$2" />
@@ -1435,4 +1432,4 @@
     <!-- Skraćenice bez razmaka -->
     <RegEx find="d\. o\.o\." replaceWith="d.o.o." />
   </RegularExpressions>
-</OCRFixReplaceList>
+</OCRFixReplaceList>

src/Forms/Main.cs

@@ -3207,7 +3207,7 @@ namespace Nikse.SubtitleEdit.Forms
         public string NormalizeUnicode(string text)
         {
             const char defHyphen = '-'; // - Hyphen-minus (\u002D) (Basic Latin)
-            const char defColon = ':'; // : Colon (\u003A) (Basic Latin)
+            const char defColon = ':';  // : Colon (\u003A) (Basic Latin)
 
             // Hyphens
             text = text.Replace('\u2043', defHyphen); // ⁃ Hyphen bullet (\u2043)
@@ -3220,7 +3220,7 @@ namespace Nikse.SubtitleEdit.Forms
             // Colons:
             text = text.Replace('\u02F8', defColon); // ˸ Modifier Letter Raised Colon (\u02F8)
             text = text.Replace('\uFF1A', defColon); // ： Fullwidth Colon (\uFF1A)
-            text = text.Replace('\uF313', defColon); // ︓ Presentation Form for Vertical Colon (\uF313)
+            text = text.Replace('\uFE13', defColon); // ︓ Presentation Form for Vertical Colon (\uFE13)
 
             // Others
             text = text.Replace("…", "...");
@@ -3233,11 +3233,11 @@ namespace Nikse.SubtitleEdit.Forms
             text = text.Replace("\uFEFF", string.Empty); // Zero Width No-Break Space
 
             // Intellectual property
-            text = text.Replace("\u00A9", "(Copyright)"); // copyright	©
-            text = text.Replace("\u2117", "(Sound-recording Copyright)"); // sound-recording copyright	℗
-            text = text.Replace("\u00AE", "(Registered Trademark)"); // registered trademark	®
-            text = text.Replace("\u2120", "(Service Mark)"); // service mark	℠
-            text = text.Replace("\u2122", "(Trademark)"); // trademark	™
+            text = text.Replace("\u00A9", "(Copyright)");                 // © copyright
+            text = text.Replace("\u2117", "(Sound-recording Copyright)"); // ℗ sound-recording copyright
+            text = text.Replace("\u00AE", "(Registered Trademark)");      // ® registered trademark
+            text = text.Replace("\u2120", "(Service Mark)");              // ℠ service mark
+            text = text.Replace("\u2122", "(Trademark)");                 // ™ trademark
 
             return text;
         }

src/Forms/RemoveTextFromHearImpaired.cs

@@ -272,7 +272,7 @@ namespace Nikse.SubtitleEdit.Forms
             // only works when used from "Form Load"
             comboBoxCustomStart.Text = Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBetweenCustomBefore;
             comboBoxCustomEnd.Text = Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBetweenCustomAfter;
-            comboBoxRemoveIfTextContains.Text = Configuration.Settings.RemoveTextForHearingImpaired.RemoveIfContainsText; 
+            comboBoxRemoveIfTextContains.Text = Configuration.Settings.RemoveTextForHearingImpaired.RemoveIfContainsText;
         }
 
     }

src/Logic/Forms/RemoveTextForHISettings.cs

@@ -30,7 +30,7 @@ namespace Nikse.SubtitleEdit.Logic.Forms
             ColonSeparateLine = Configuration.Settings.RemoveTextForHearingImpaired.RemoveTextBeforeColonOnlyOnSeparateLine;
             RemoveWhereContains = Configuration.Settings.RemoveTextForHearingImpaired.RemoveIfContains;
             RemoveIfTextContains = new List<string>();
-            foreach (string item in Configuration.Settings.RemoveTextForHearingImpaired.RemoveIfContainsText.Split(new char[] { ','},StringSplitOptions.RemoveEmptyEntries))
+            foreach (string item in Configuration.Settings.RemoveTextForHearingImpaired.RemoveIfContainsText.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
             {
                 RemoveIfTextContains.Add(item.Trim());
             }