Merge branch 'master' into feature/verify-integrity

# Conflicts:
#	src/ui/Forms/Main.Designer.cs

Dictionaries/en_US_se.xml

@@ -970,4 +970,5 @@
 	<word>councillor</word>
 	<word>luminol</word>
 	<word>scotoma</word>
+	<word>unironically</word>
 </words>

Dictionaries/en_names.xml

@@ -1932,4 +1932,8 @@
 	<name>Damián</name>
 	<name>Salamanca</name>
 	<name>Vázquez</name>
+	<name>Radisson</name>
+	<name>Maddie</name>
+	<name>Hallander</name>
+	<name>McGrath</name>	
 </names>

src/libse/Common/LanguageAutoDetect.cs

@@ -194,9 +194,9 @@ namespace Nikse.SubtitleEdit.Core.Common
 
         private static readonly string[] AutoDetectWordsHebrew =
         {
-            "אתה", "אולי", "הוא", "בסדר", "יודע", "טוב", "אֶת", "שֶׁל", "עַל", "הוּא", 
+            "אתה", "אולי", "הוא", "בסדר", "יודע", "טוב", "אֶת", "שֶׁל", "עַל", "הוּא",
             "אֲשֶׁר", "הִיא", "הַמְלֶט", "נָסִיךְ", "הֲלֹא", "עוֹד", "אֵין", "אֲנִי", "זֹאת", "וְלֹא",
-            "כָּךְ", "הִנֵּה", "מְאֹד", "אֲדוֹנִי",    
+            "כָּךְ", "הִנֵּה", "מְאֹד", "אֲדוֹנִי",
         };
 
         private static readonly string[] AutoDetectWordsVietnamese =
@@ -270,7 +270,8 @@ namespace Nikse.SubtitleEdit.Core.Common
         {
             "господине", "Нема", "господине", "работа", "вселената", "Може", "треба", "Треба", "слетување", "капсулата", "време", "Френдшип", "Прием", "Добро", "пресметки", "Благодарам", "нешто", "Благодарам", "орбитата", "инженер",
             "Харисон", "Фала", "тоалет", "орбита", "знаеме", "Супервизор", "жени", "Добра", "требаат", "што", "дeкa", "eшe", "кучe", "Руиз", "кучeто", "кучињa", "Бјути", "имa", "многу", "кучињaтa", "AДЗЖ", "Животни", "моЖe", "мaчe",
-            "мecто", "имaмe", "мaчињa", "пpвото", "пpaвaт", "нeшто", "колку"
+            "мecто", "имaмe", "мaчињa", "пpвото", "пpaвaт", "нeшто", "колку",
+            "што", "тоа", "дека", "Што", "Дали", "треба", "беше", "таму"
         };
 
         private static readonly string[] AutoDetectWordsFinnish =
@@ -530,13 +531,19 @@ namespace Nikse.SubtitleEdit.Core.Common
             {
                 var bulgarianCount = GetCount(text, AutoDetectWordsBulgarian);
                 var ukrainianCount = GetCount(text, AutoDetectWordsUkrainian);
+                var macedonianCount = GetCount(text, AutoDetectWordsMacedonian);
                 if (bulgarianCount > count)
                 {
-                    if (ukrainianCount > bulgarianCount)
+                    if (ukrainianCount > bulgarianCount && ukrainianCount > macedonianCount)
                     {
                         return "uk"; // Ukrainian
                     }
 
+                    if (macedonianCount > bulgarianCount && macedonianCount > ukrainianCount)
+                    {
+                        return "mk"; // Macedonian
+                    }
+
                     return "bg"; // Bulgarian
                 }
 
@@ -569,6 +576,12 @@ namespace Nikse.SubtitleEdit.Core.Common
             count = GetCount(text, AutoDetectWordsBulgarian);
             if (count > bestCount)
             {
+                var macedonianCount = GetCount(text, AutoDetectWordsMacedonian);
+                if (macedonianCount > count)
+                {
+                    return "mk";
+                }
+
                 return "bg"; // Bulgarian
             }
 

src/ui/Forms/Main.Designer.cs

@@ -997,10 +997,11 @@ namespace Nikse.SubtitleEdit.Forms
             // 
             this.toolStripButtonLayout.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
             this.toolStripButtonLayout.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F);
+            this.toolStripButtonLayout.Image = global::Nikse.SubtitleEdit.Properties.Resources.Layout;
             this.toolStripButtonLayout.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
             this.toolStripButtonLayout.ImageTransparentColor = System.Drawing.Color.Magenta;
             this.toolStripButtonLayout.Name = "toolStripButtonLayout";
-            this.toolStripButtonLayout.Size = new System.Drawing.Size(23, 37);
+            this.toolStripButtonLayout.Size = new System.Drawing.Size(36, 37);
             this.toolStripButtonLayout.Text = "Show/hide waveform";
             this.toolStripButtonLayout.Click += new System.EventHandler(this.ToolStripButtonLayoutChooseClick);
             // 

src/ui/Forms/Main.resx

@@ -730,9 +730,9 @@
   <data name="toolStripButtonLockCenter.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACJSURBVEhLYxjioPT6M4aKawVQHvEApAekFydIv/6bofx6
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACJSURBVEhLYxjioPT6M4aKawVQHvEApAekFydIu/6bofx6
         A5RHPADpAenFCbAZXHk1ACi2nqHi6n44BokhA5INrrpiwFBx/T9Q7DxYHILPg8VAcjBAssEgNsgQdACx
-        DFXdqMFgMGowlDdqMCUG0yxLgwCowEEugEAFEsWFELGAoME0K+gHP2BgAADj1Bh2gurMTQAAAABJRU5E
+        DFXdqMFgMGowlDdqMCUG0yxLgwCowEEugEAFEsWFELGAoME0K+gHP2BgAABpZBhW3VPvKwAAAABJRU5E
         rkJggg==
 </value>
   </data>

src/ui/Properties/Resources.Designer.cs

@@ -280,6 +280,16 @@ namespace Nikse.SubtitleEdit.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap Layout {
+            get {
+                object obj = ResourceManager.GetObject("Layout", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>

src/ui/Properties/Resources.resx

@@ -118,15 +118,9 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="L2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\L2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="L3" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\L3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="L1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\L1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="webvtt" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\webvtt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -142,6 +136,9 @@
   <data name="Settings" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Icons\Settings.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="L7" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\L7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="color-picker-small2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\color-picker-small2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -154,12 +151,15 @@
   <data name="Error" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="L8" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="L2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\L8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\L2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="bookmark22dark" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bookmark22dark.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="L11" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\L11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="ebu" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ebu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -196,8 +196,11 @@
   <data name="SEIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\SE.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="L7" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="L8" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\L7.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\L8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="L1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\L1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Help32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Help32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -205,7 +208,7 @@
   <data name="Information" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="L11" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Layout" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\L11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Layout.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

src/ui/SubtitleEdit.csproj

@@ -2606,6 +2606,7 @@
     <None Include="Resources\L12.png" />
     <None Include="Resources\L10.png" />
     <None Include="Resources\L11.png" />
+    <None Include="Resources\Layout.png" />
     <Content Include="Resources\TesseractDictionaries.xml">
       <SubType>Designer</SubType>
     </Content>