Spelling tweaks.

2024-11-26 05:02:36 +01:00 · 2014-09-05 02:12:47 +03:00 · 2014-09-05 02:12:47 +03:00 · 854a8c61b5
commit 854a8c61b5
parent bc4230a3d3
146 changed files with 261 additions and 261 deletions
--- a/LanguageMaster.xml
+++ b/LanguageMaster.xml
@ -6,7 +6,7 @@
    <TranslatedBy>Translated by Nikse</TranslatedBy>
    <CultureName>en-US</CultureName>
    <HelpFile />
-    <OK>&amp;OK</OK>
+    <Ok>&amp;OK</Ok>
    <Cancel>C&amp;ancel</Cancel>
    <Apply>Apply</Apply>
    <None>None</None>
--- a/src/Controls/AudioVisualizer.cs
+++ b/src/Controls/AudioVisualizer.cs
@ -360,10 +360,10 @@ namespace Nikse.SubtitleEdit.Controls
            }
        }

-        public void SetPosition(double startPositionSeconds, Subtitle subtitle, double currentVideoPositionSeconds, int subtitleIndex, ListView.SelectedIndexCollection selectedIndices)
+        public void SetPosition(double startPositionSeconds, Subtitle subtitle, double currentVideoPositionSeconds, int subtitleIndex, ListView.SelectedIndexCollection selectedIndexes)
        {
            StartPositionSeconds = startPositionSeconds;
-            _selectedIndices = selectedIndices;
+            _selectedIndices = selectedIndexes;
            _subtitle = subtitle;
            _currentVideoPositionSeconds = currentVideoPositionSeconds;
            _selectedParagraph = _subtitle.GetParagraphOrDefault(subtitleIndex);
--- a/src/Forms/About.cs
+++ b/src/Forms/About.cs
@ -19,7 +19,7 @@ namespace Nikse.SubtitleEdit.Forms
        public void Initialize()
        {
            Text = _language.Title + " - " + (IntPtr.Size * 8) + "-bit";
-            okButton.Text = _languageGeneral.OK;
+            okButton.Text = _languageGeneral.Ok;
            string[] versionInfo = Utilities.AssemblyVersion.Split('.');
            labelProduct.Text = String.Format("{0} {1}.{2}.{3}, build", _languageGeneral.Title, versionInfo[0], versionInfo[1], versionInfo[2]);
            linkLabelGitBuildHash.Left = labelProduct.Left + labelProduct.Width - 5;
--- a/src/Forms/AddToNames.cs
+++ b/src/Forms/AddToNames.cs
@ -18,7 +18,7 @@ namespace Nikse.SubtitleEdit.Forms
            labelDescription.Text = Configuration.Settings.Language.AddToNames.Description;
            labelLanguage.Text = Configuration.Settings.Language.SpellCheck.Language;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            FixLargeFonts();
        }

--- a/src/Forms/AddToOcrReplaceList.cs
+++ b/src/Forms/AddToOcrReplaceList.cs
@ -19,7 +19,7 @@ namespace Nikse.SubtitleEdit.Forms
            Text = Configuration.Settings.Language.AddToOcrReplaceList.Title;
            labelDescription.Text = Configuration.Settings.Language.AddToOcrReplaceList.Description;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            FixLargeFonts();
        }

@ -60,8 +60,8 @@ namespace Nikse.SubtitleEdit.Forms
            {
                var xml = new XmlDocument();
                xml.Load(replaceListXmlFileName);
-                ocrFixWords = Logic.OCR.OcrFixEngine.LoadReplaceList(xml, "WholeWords");
-                ocrFixPartialLines = Logic.OCR.OcrFixEngine.LoadReplaceList(xml, "PartialLines");
+                ocrFixWords = Logic.Ocr.OcrFixEngine.LoadReplaceList(xml, "WholeWords");
+                ocrFixPartialLines = Logic.Ocr.OcrFixEngine.LoadReplaceList(xml, "PartialLines");
            }
            Dictionary<string, string> dictionary = ocrFixWords;
            string elementName = "Word";
--- a/src/Forms/AddToUserDic.cs
+++ b/src/Forms/AddToUserDic.cs
@ -15,7 +15,7 @@ namespace Nikse.SubtitleEdit.Forms
            Text = Configuration.Settings.Language.AddToUserDictionary.Title;
            labelDescription.Text = Configuration.Settings.Language.AddToUserDictionary.Description;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            FixLargeFonts();
        }

--- a/src/Forms/AddWaveForm.cs
+++ b/src/Forms/AddWaveForm.cs
@ -273,7 +273,7 @@ namespace Nikse.SubtitleEdit.Forms
                { // Choose for number of audio tracks in mp4 files
                    try
                    {
-                        var mp4 = new Nikse.SubtitleEdit.Logic.Mp4.Mp4Parser(labelVideoFileName.Text);
+                        var mp4 = new Nikse.SubtitleEdit.Logic.Mp4.MP4Parser(labelVideoFileName.Text);
                        var tracks = mp4.GetAudioTracks();
                        int i=0;
                        foreach (var track in tracks)
--- a/src/Forms/AdjustDisplayDuration.cs
+++ b/src/Forms/AdjustDisplayDuration.cs
@ -71,7 +71,7 @@ namespace Nikse.SubtitleEdit.Forms
            labelNote.Text = language.Note;
            comboBoxSeconds.Items[0] = language.PleaseChoose;
            comboBoxPercent.Items[0] = language.PleaseChoose;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            FixLargeFonts();
        }
--- a/src/Forms/ApplyDurationLimits.cs
+++ b/src/Forms/ApplyDurationLimits.cs
@ -23,7 +23,7 @@ namespace Nikse.SubtitleEdit.Forms
            labelNote.Text = Configuration.Settings.Language.AdjustDisplayDuration.Note;
            numericUpDownDurationMin.Value = Configuration.Settings.General.SubtitleMinimumDisplayMilliseconds;
            numericUpDownDurationMax.Value = Configuration.Settings.General.SubtitleMaximumDisplayMilliseconds;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            subtitleListView1.InitializeLanguage(Configuration.Settings.Language.General, Configuration.Settings);
            listViewFixes.Columns[0].Text = Configuration.Settings.Language.General.Apply;
--- a/src/Forms/AutoBreakUnbreakLines.cs
+++ b/src/Forms/AutoBreakUnbreakLines.cs
@ -37,7 +37,7 @@ namespace Nikse.SubtitleEdit.Forms
            listViewFixes.Columns[1].Text = Configuration.Settings.Language.General.LineNumber;
            listViewFixes.Columns[2].Text = Configuration.Settings.Language.General.Before;
            listViewFixes.Columns[3].Text = Configuration.Settings.Language.General.After;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            FixLargeFonts();
        }
--- a/src/Forms/BatchConvert.cs
+++ b/src/Forms/BatchConvert.cs
@ -92,7 +92,7 @@ namespace Nikse.SubtitleEdit.Forms
            linkLabelOpenOutputFolder.Text = Configuration.Settings.Language.Main.Menu.File.Open;
            buttonSearchFolder.Text = l.ScanFolder;
            buttonConvert.Text = l.Convert;
-            buttonCancel.Text = Configuration.Settings.Language.General.OK;
+            buttonCancel.Text = Configuration.Settings.Language.General.Ok;
            checkBoxScanFolderRecursive.Text = l.Recursive;
            checkBoxScanFolderRecursive.Left = buttonSearchFolder.Left - checkBoxScanFolderRecursive.Width - 5;

@ -744,7 +744,7 @@ namespace Nikse.SubtitleEdit.Forms

                                                if (isSsa)
                                                {
-                                                    foreach (Paragraph p in Main.LoadMatroskaSSa(x, fileName, format, mkvSub).Paragraphs)
+                                                    foreach (Paragraph p in Main.LoadMatroskaSSA(x, fileName, format, mkvSub).Paragraphs)
                                                    {
                                                        sub.Paragraphs.Add(p);
                                                    }
--- a/src/Forms/ChangeCasing.cs
+++ b/src/Forms/ChangeCasing.cs
@ -26,7 +26,7 @@ namespace Nikse.SubtitleEdit.Forms
            checkBoxOnlyAllUpper.Text = language.OnlyChangeAllUppercaseLines;
            radioButtonUppercase.Text = language.AllUppercase;
            radioButtonLowercase.Text = language.AllLowercase;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            FixLargeFonts();

--- a/src/Forms/ChangeCasingNames.cs
+++ b/src/Forms/ChangeCasingNames.cs
@ -31,7 +31,7 @@ namespace Nikse.SubtitleEdit.Forms
            buttonSelectAll.Text = Configuration.Settings.Language.FixCommonErrors.SelectAll;
            buttonInverseSelection.Text = Configuration.Settings.Language.FixCommonErrors.InverseSelection;

-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            FixLargeFonts();
        }
--- a/src/Forms/ChangeFrameRate.cs
+++ b/src/Forms/ChangeFrameRate.cs
@ -26,7 +26,7 @@ namespace Nikse.SubtitleEdit.Forms
            labelInfo.Text = language.ConvertFrameRateOfSubtitle;
            labelFromFrameRate.Text = language.FromFrameRate;
            labelToFrameRate.Text = language.ToFrameRate;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            FixLargeFonts();
        }
--- a/src/Forms/ChangeSpeedInPercent.cs
+++ b/src/Forms/ChangeSpeedInPercent.cs
@ -21,7 +21,7 @@ namespace Nikse.SubtitleEdit.Forms
            radioButtonSpeedCustom.Text = Configuration.Settings.Language.ChangeSpeedInPercent.Custom;
            radioButtonSpeedFromDropFrame.Text = Configuration.Settings.Language.ChangeSpeedInPercent.FromDropFrame;
            radioButtonToDropFrame.Text = Configuration.Settings.Language.ChangeSpeedInPercent.ToDropFrame;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;

            if (string.IsNullOrEmpty(Configuration.Settings.Language.ChangeSpeedInPercent.ToDropFrame))
--- a/src/Forms/CheckForUpdates.cs
+++ b/src/Forms/CheckForUpdates.cs
@ -27,7 +27,7 @@ namespace Nikse.SubtitleEdit.Forms
            buttonDownloadAndInstall.Text = Configuration.Settings.Language.CheckForUpdates.InstallUpdate;
            buttonDownloadAndInstall.Visible = false;
            textBoxChangeLog.Visible = false;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonOK.Visible = false;
            buttonDontCheckUpdates.Text = Configuration.Settings.Language.CheckForUpdates.NoUpdates;
            buttonDontCheckUpdates.Visible = false;
--- a/src/Forms/ChooseEncoding.cs
+++ b/src/Forms/ChooseEncoding.cs
@ -57,7 +57,7 @@ namespace Nikse.SubtitleEdit.Forms
            listView1.Columns[0].Text = language.CodePage;
            listView1.Columns[1].Text = Configuration.Settings.Language.General.Name;
            listView1.Columns[2].Text = language.DisplayName;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            FixLargeFonts();
        }
--- a/src/Forms/ChooseLanguage.cs
+++ b/src/Forms/ChooseLanguage.cs
@ -99,7 +99,7 @@ namespace Nikse.SubtitleEdit.Forms

            Text = Configuration.Settings.Language.ChooseLanguage.Title;
            labelLanguage.Text = Configuration.Settings.Language.ChooseLanguage.Language;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            FixLargeFonts();
        }
--- a/src/Forms/ChooseResolution.cs
+++ b/src/Forms/ChooseResolution.cs
@ -12,7 +12,7 @@ namespace Nikse.SubtitleEdit.Forms
        public ChooseResolution()
        {
            InitializeComponent();
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            Text = Configuration.Settings.Language.ExportPngXml.VideoResolution;
            labelVideoResolution.Text = Configuration.Settings.Language.ExportPngXml.VideoResolution;
--- a/src/Forms/ChooseStyle.cs
+++ b/src/Forms/ChooseStyle.cs
@ -28,7 +28,7 @@ namespace Nikse.SubtitleEdit.Forms
            listViewStyles.Columns[3].Text = l.UseCount;
            listViewStyles.Columns[4].Text = l.Primary;
            listViewStyles.Columns[5].Text = l.Outline;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;

            InitializeListView();
--- a/src/Forms/ColorChooser.cs
+++ b/src/Forms/ColorChooser.cs
@ -83,7 +83,7 @@ namespace Nikse.SubtitleEdit.Forms
                labelBlue.Text = Configuration.Settings.Language.ColorChooser.Blue;
                labelAlpha1.Text = Configuration.Settings.Language.ColorChooser.Alpha;
            }
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
        }

--- a/src/Forms/ColumnPaste.cs
+++ b/src/Forms/ColumnPaste.cs
@ -35,7 +35,7 @@ namespace Nikse.SubtitleEdit.Forms
                radioButtonTextOnly.Text = Configuration.Settings.Language.ColumnPaste.TextOnly;
                radioButtonOriginalText.Text = Configuration.Settings.Language.ColumnPaste.OriginalTextOnly;
            }
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
        }

--- a/src/Forms/Compare.cs
+++ b/src/Forms/Compare.cs
@ -33,7 +33,7 @@ namespace Nikse.SubtitleEdit.Forms
                checkBoxOnlyListDifferencesInText.Text = Configuration.Settings.Language.CompareSubtitles.OnlyLookForDifferencesInText;
            else
                checkBoxOnlyListDifferencesInText.Visible = false;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            subtitleListView1.InitializeLanguage(Configuration.Settings.Language.General, Configuration.Settings);
            subtitleListView2.InitializeLanguage(Configuration.Settings.Language.General, Configuration.Settings);
            Utilities.InitializeSubtitleFont(subtitleListView1);
--- a/src/Forms/DoNotBreakAfterListEdit.cs
+++ b/src/Forms/DoNotBreakAfterListEdit.cs
@ -23,7 +23,7 @@ namespace Nikse.SubtitleEdit
            buttonAddNoBreakAfter.Text = Configuration.Settings.Language.DvdSubRip.Add;
            radioButtonText.Text = Configuration.Settings.Language.General.Text;
            radioButtonRegEx.Text = Configuration.Settings.Language.MultipleReplace.RegularExpression;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;

            radioButtonRegEx.Left = radioButtonText.Left + radioButtonText.Width + 10;
--- a/src/Forms/DurationsBridgeGaps.cs
+++ b/src/Forms/DurationsBridgeGaps.cs
@ -20,7 +20,7 @@ namespace Nikse.SubtitleEdit.Forms
            FixLargeFonts();

            Text = Configuration.Settings.Language.DurationsBridgeGaps.Title;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            SubtitleListview1.InitializeLanguage(Configuration.Settings.Language.General, Configuration.Settings);
            Utilities.InitializeSubtitleFont(SubtitleListview1);
--- a/src/Forms/DvdSubRipChooseLanguage.cs
+++ b/src/Forms/DvdSubRipChooseLanguage.cs
@ -37,7 +37,7 @@ namespace Nikse.SubtitleEdit.Forms
            InitializeComponent();
            Text = Configuration.Settings.Language.DvdSubRipChooseLanguage.Title;
            labelChooseLanguage.Text = Configuration.Settings.Language.DvdSubRipChooseLanguage.ChooseLanguageStreamId;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            buttonSaveAs.Text = Configuration.Settings.Language.Main.Menu.File.SaveAs;
            FixLargeFonts();
--- a/src/Forms/EbuSaveOptions.cs
+++ b/src/Forms/EbuSaveOptions.cs
@ -56,7 +56,7 @@ namespace Nikse.SubtitleEdit.Forms
            labelErrors.Text = language.Errors;

            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
        }

        internal void Initialize(Ebu.EbuGeneralSubtitleInformation header, byte justificationCode, string fileName, Subtitle subtitle)
@ -84,7 +84,7 @@ namespace Nikse.SubtitleEdit.Forms
            comboBoxJustificationCode.SelectedIndex = justificationCode;

            this.Text = Configuration.Settings.Language.EbuSaveOptions.Title;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
        }

--- a/src/Forms/EffectKaraoke.cs
+++ b/src/Forms/EffectKaraoke.cs
@ -22,7 +22,7 @@ namespace Nikse.SubtitleEdit.Forms
            labelTM.Text = Configuration.Settings.Language.EffectKaraoke.TotalMilliseconds;
            labelEndDelay.Text = Configuration.Settings.Language.EffectKaraoke.EndDelayInMilliseconds;
            buttonPreview.Text = Configuration.Settings.Language.General.Preview;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            FixLargeFonts();
        }
--- a/src/Forms/EffectTypewriter.cs
+++ b/src/Forms/EffectTypewriter.cs
@ -20,7 +20,7 @@ namespace Nikse.SubtitleEdit.Forms
            labelTM.Text = Configuration.Settings.Language.EffectKaraoke.TotalMilliseconds;
            labelEndDelay.Text = Configuration.Settings.Language.EffectKaraoke.EndDelayInMilliseconds;
            buttonPreview.Text = Configuration.Settings.Language.General.Preview;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            FixLargeFonts();
        }
--- a/src/Forms/ExportCustomText.cs
+++ b/src/Forms/ExportCustomText.cs
@ -97,7 +97,7 @@ namespace Nikse.SubtitleEdit.Forms
            var form = new ExportCustomTextFormat("NewÆÆ{number}\r\n{start} --> {end}\r\n{text}\r\n\r\nÆhh:mm:ss,zzzÆ[Do not modify]Æ");
            if (form.ShowDialog(this) == DialogResult.OK)
            {
-                _templates.Add(form.FormatOK);
+                _templates.Add(form.FormatOk);
                ShowTemplates(_templates);
                listViewTemplates.Items[listViewTemplates.Items.Count - 1].Selected = true;
            }
@ -127,7 +127,7 @@ namespace Nikse.SubtitleEdit.Forms
                var form = new ExportCustomTextFormat(_templates[idx]);
                if (form.ShowDialog(this) == DialogResult.OK)
                {
-                    _templates[idx] = form.FormatOK;
+                    _templates[idx] = form.FormatOk;
                    ShowTemplates(_templates);
                    if (idx < listViewTemplates.Items.Count)
                        listViewTemplates.Items[idx].Selected = true;
--- a/src/Forms/ExportCustomTextFormat.cs
+++ b/src/Forms/ExportCustomTextFormat.cs
@ -8,7 +8,7 @@ namespace Nikse.SubtitleEdit.Forms
    public partial class ExportCustomTextFormat : Form
    {

-        public string FormatOK { get; set; }
+        public string FormatOk { get; set; }
        public const string EnglishDoNoModify = "[Do not modify]";

        public ExportCustomTextFormat(string format)
@ -44,7 +44,7 @@ namespace Nikse.SubtitleEdit.Forms
            labelHeader.Text = l.Header;
            labelTextLine.Text = l.TextLine;
            labelFooter.Text = l.Footer;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            groupBoxPreview.Text = Configuration.Settings.Language.General.Preview;
        }
@ -198,7 +198,7 @@ namespace Nikse.SubtitleEdit.Forms

        private void buttonOK_Click(object sender, EventArgs e)
        {
-            FormatOK = textBoxName.Text+ "Æ" + textBoxHeader.Text + "Æ" + textBoxParagraph.Text + "Æ" +   comboBoxTimeCode.Text + "Æ" +  comboBoxNewLine.Text.Replace(Configuration.Settings.Language.ExportCustomTextFormat.DoNotModify, EnglishDoNoModify) + "Æ" + textBoxFooter.Text;
+            FormatOk = textBoxName.Text+ "Æ" + textBoxHeader.Text + "Æ" + textBoxParagraph.Text + "Æ" +   comboBoxTimeCode.Text + "Æ" +  comboBoxNewLine.Text.Replace(Configuration.Settings.Language.ExportCustomTextFormat.DoNotModify, EnglishDoNoModify) + "Æ" + textBoxFooter.Text;
            DialogResult = DialogResult.OK;
        }

--- a/src/Forms/ExportPngXml.cs
+++ b/src/Forms/ExportPngXml.cs
@ -2484,7 +2484,7 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +

            labelImageFormat.Text = Configuration.Settings.Language.ExportPngXml.ImageFormat;
            buttonExport.Text = Configuration.Settings.Language.ExportPngXml.ExportAllLines;
-            buttonCancel.Text = Configuration.Settings.Language.General.OK;
+            buttonCancel.Text = Configuration.Settings.Language.General.Ok;
            labelLanguage.Text = Configuration.Settings.Language.ChooseLanguage.Language;
            labelFrameRate.Text = Configuration.Settings.Language.General.FrameRate;
            labelHorizontalAlign.Text = Configuration.Settings.Language.ExportPngXml.Align;
--- a/src/Forms/ExtractDateTimeInfo.cs
+++ b/src/Forms/ExtractDateTimeInfo.cs
@ -72,7 +72,7 @@ namespace Nikse.SubtitleEdit.Forms
                string ext = Path.GetExtension(VideoFileName).ToLower();
                if (ext == ".mp4" || ext == ".m4v" || ext == ".3gp")
                {
-                    Logic.Mp4.Mp4Parser mp4Parser = new Logic.Mp4.Mp4Parser(VideoFileName);
+                    Logic.Mp4.MP4Parser mp4Parser = new Logic.Mp4.MP4Parser(VideoFileName);
                    start = mp4Parser.CreationDate;
                    durationInSeconds = mp4Parser.Duration.TotalSeconds;
                }
--- a/src/Forms/FindSubtitleLine.cs
+++ b/src/Forms/FindSubtitleLine.cs
@ -26,7 +26,7 @@ namespace Nikse.SubtitleEdit.Forms
            Text = Configuration.Settings.Language.FindSubtitleLine.Title;
            buttonFind.Text = Configuration.Settings.Language.FindSubtitleLine.Find;
            buttonFindNext.Text = Configuration.Settings.Language.FindSubtitleLine.FindNext;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            subtitleListView1.InitializeLanguage(Configuration.Settings.Language.General, Configuration.Settings);
            FixLargeFonts();
--- a/src/Forms/FixCommonErrors.cs
+++ b/src/Forms/FixCommonErrors.cs
@ -7,7 +7,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using Nikse.SubtitleEdit.Logic;
-using Nikse.SubtitleEdit.Logic.OCR;
+using Nikse.SubtitleEdit.Logic.Ocr;
 using Nikse.SubtitleEdit.Logic.SubtitleFormats;
 using Nikse.SubtitleEdit.Logic.Forms;

@ -187,7 +187,7 @@ namespace Nikse.SubtitleEdit.Forms
            groupBoxStep1.Text = string.Empty;
            buttonBack.Visible = false;
            buttonNextFinish.Visible = false;
-            buttonCancel.Text = Configuration.Settings.Language.General.OK;
+            buttonCancel.Text = Configuration.Settings.Language.General.Ok;
        }

        public string Language
@ -4458,7 +4458,7 @@ namespace Nikse.SubtitleEdit.Forms
            RunSelectedActions();

            buttonBack.Enabled = true;
-            buttonNextFinish.Text = _languageGeneral.OK;
+            buttonNextFinish.Text = _languageGeneral.Ok;
            buttonNextFinish.Enabled = _hasFixesBeenMade;
            groupBoxStep1.Visible = false;
            groupBox2.Visible = true;
--- a/src/Forms/GetDictionaries.cs
+++ b/src/Forms/GetDictionaries.cs
@ -26,7 +26,7 @@ namespace Nikse.SubtitleEdit.Forms
            linkLabelOpenDictionaryFolder.Text = Configuration.Settings.Language.GetDictionaries.OpenDictionariesFolder;
            labelChooseLanguageAndClickDownload.Text = Configuration.Settings.Language.GetDictionaries.ChooseLanguageAndClickDownload;
            buttonDownload.Text = Configuration.Settings.Language.GetDictionaries.Download;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            labelPleaseWait.Text = string.Empty;

            LoadDictionaryList("Nikse.SubtitleEdit.Resources.OpenOfficeDictionaries.xml.gz");
--- a/src/Forms/GetTesseractDictionaries.cs
+++ b/src/Forms/GetTesseractDictionaries.cs
@ -29,7 +29,7 @@ namespace Nikse.SubtitleEdit.Forms
                buttonDownload.Text = Configuration.Settings.Language.GetTesseractDictionaries.Download;
            }
            labelPleaseWait.Text = string.Empty;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            LoadDictionaryList("Nikse.SubtitleEdit.Resources.TesseractDictionaries.xml.gz");
            FixLargeFonts();
        }
--- a/src/Forms/GoToLine.cs
+++ b/src/Forms/GoToLine.cs
@ -16,7 +16,7 @@ namespace Nikse.SubtitleEdit.Forms
            InitializeComponent();

            Text = Configuration.Settings.Language.GoToLine.Title;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            FixLargeFonts();
        }
--- a/src/Forms/GoogleTranslate.cs
+++ b/src/Forms/GoogleTranslate.cs
@ -68,7 +68,7 @@ namespace Nikse.SubtitleEdit.Forms
            buttonTranslate.Text = Configuration.Settings.Language.GoogleTranslate.Translate;
            labelPleaseWait.Text = Configuration.Settings.Language.GoogleTranslate.PleaseWait;
            linkLabelPoweredByGoogleTranslate.Text = Configuration.Settings.Language.GoogleTranslate.PoweredByGoogleTranslate;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;

            subtitleListViewFrom.InitializeLanguage(Configuration.Settings.Language.General, Configuration.Settings);
--- a/src/Forms/ImportImages.cs
+++ b/src/Forms/ImportImages.cs
@ -22,7 +22,7 @@ namespace Nikse.SubtitleEdit.Forms
            columnHeaderStartTime.Text = Configuration.Settings.Language.General.StartTime;
            columnHeaderEndTime.Text = Configuration.Settings.Language.General.EndTime;
            columnHeaderDuration.Text = Configuration.Settings.Language.General.Duration;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
        }

--- a/src/Forms/ImportSceneChanges.cs
+++ b/src/Forms/ImportSceneChanges.cs
@ -27,7 +27,7 @@ namespace Nikse.SubtitleEdit.Forms
            radioButtonSeconds.Text = Configuration.Settings.Language.ImportSceneChanges.Seconds;
            radioButtonMilliseconds.Text = Configuration.Settings.Language.ImportSceneChanges.Milliseconds;
            groupBoxTimeCodes.Text = Configuration.Settings.Language.ImportSceneChanges.TimeCodes;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            FixLargeFonts();
        }
--- a/src/Forms/ImportText.cs
+++ b/src/Forms/ImportText.cs
@ -67,7 +67,7 @@ namespace Nikse.SubtitleEdit.Forms
            buttonRefresh.Text = Configuration.Settings.Language.ImportText.Refresh;
            groupBoxTimeCodes.Text = Configuration.Settings.Language.ImportText.TimeCodes;
            groupBoxImportResult.Text = Configuration.Settings.Language.General.Preview;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            SubtitleListview1.InitializeLanguage(Configuration.Settings.Language.General, Configuration.Settings);
            Utilities.InitializeSubtitleFont(SubtitleListview1);
--- a/src/Forms/ImportUnknownFormat.cs
+++ b/src/Forms/ImportUnknownFormat.cs
@ -18,7 +18,7 @@ namespace Nikse.SubtitleEdit.Forms
            _refreshTimer.Interval = 400;
            _refreshTimer.Tick += RefreshTimerTick;

-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            SubtitleListview1.InitializeLanguage(Configuration.Settings.Language.General, Configuration.Settings);
            Utilities.InitializeSubtitleFont(SubtitleListview1);
--- a/src/Forms/Interjections.cs
+++ b/src/Forms/Interjections.cs
@ -48,7 +48,7 @@ namespace Nikse.SubtitleEdit.Forms
            buttonAdd.Text = Configuration.Settings.Language.MultipleReplace.Add;

            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;

            FixLargeFonts();
        }
--- a/src/Forms/Main.cs
+++ b/src/Forms/Main.cs
@ -1499,7 +1499,7 @@ namespace Nikse.SubtitleEdit.Forms
                CenterFormOnCurrentScreen();
            }

-            if (Environment.OSVersion.Version.Major < 6 && Configuration.Settings.General.SubtitleFontName == Utilities.WinXp2kUnicodeFontName) // 6 == Vista/Win2008Server/Win7
+            if (Environment.OSVersion.Version.Major < 6 && Configuration.Settings.General.SubtitleFontName == Utilities.WinXP2KUnicodeFontName) // 6 == Vista/Win2008Server/Win7
            {
                //const string unicodeFontName = Utilities.WinXp2kUnicodeFontName;
                //Configuration.Settings.General.SubtitleFontName = unicodeFontName;
@ -5284,7 +5284,7 @@ namespace Nikse.SubtitleEdit.Forms
                                    var visualSync = new VisualSync();
                                    visualSync.Initialize(toolStripButtonVisualSync.Image as Bitmap, subtitleToAppend, _fileName, _language.AppendViaVisualSyncTitle, CurrentFrameRate);
                                    visualSync.ShowDialog(this);
-                                    if (visualSync.OKPressed)
+                                    if (visualSync.OkPressed)
                                    {
                                        if (MessageBox.Show(_language.AppendSynchronizedSubtitlePrompt, _language.SubtitleAppendPromptTitle, MessageBoxButtons.YesNo) == DialogResult.Yes)
                                        {
@ -9099,7 +9099,7 @@ namespace Nikse.SubtitleEdit.Forms

                if (isSsa)
                {
-                    foreach (Paragraph p in LoadMatroskaSSa(matroskaSubtitleInfo, fileName, format, sub).Paragraphs)
+                    foreach (Paragraph p in LoadMatroskaSSA(matroskaSubtitleInfo, fileName, format, sub).Paragraphs)
                    {
                        subtitle.Paragraphs.Add(p);
                    }
@ -9177,7 +9177,7 @@ namespace Nikse.SubtitleEdit.Forms

                if (isSsa)
                {
-                    foreach (Paragraph p in LoadMatroskaSSa(matroskaSubtitleInfo, fileName, format, sub).Paragraphs)
+                    foreach (Paragraph p in LoadMatroskaSSA(matroskaSubtitleInfo, fileName, format, sub).Paragraphs)
                    {
                        _subtitle.Paragraphs.Add(p);
                    }
@ -9258,7 +9258,7 @@ namespace Nikse.SubtitleEdit.Forms
            }
        }

-        public static Subtitle LoadMatroskaSSa(MatroskaSubtitleInfo matroskaSubtitleInfo, string fileName, SubtitleFormat format, List<SubtitleSequence> sub)
+        public static Subtitle LoadMatroskaSSA(MatroskaSubtitleInfo matroskaSubtitleInfo, string fileName, SubtitleFormat format, List<SubtitleSequence> sub)
        {
            var subtitle = new Subtitle();
            subtitle.Header = matroskaSubtitleInfo.CodecPrivate;
@ -9654,7 +9654,7 @@ namespace Nikse.SubtitleEdit.Forms
                ShowStatus(_language.ParsingTransportStream);
            Refresh();
            var tsParser = new Nikse.SubtitleEdit.Logic.TransportStream.TransportStreamParser();
-            tsParser.ParseTsFile(fileName);
+            tsParser.ParseTSFile(fileName);
            ShowStatus(string.Empty);

            if (tsParser.SubtitlePacketIds.Count == 0)
@ -9720,7 +9720,7 @@ namespace Nikse.SubtitleEdit.Forms
        "{\\c&HFFFFFF&}",   // white
        };

-        public static byte bytereverse(byte n)
+        public static byte ByteReverse(byte n)
        {
            n = (byte)(((n >> 1) & 0x55) | ((n << 1) & 0xaa));
            n = (byte)(((n >> 2) & 0x33) | ((n << 2) & 0xcc));
@ -9738,7 +9738,7 @@ namespace Nikse.SubtitleEdit.Forms
            {
                //var char_value = _buffer[c];

-                var char_value = 0x7F & bytereverse(_buffer[c]);
+                var char_value = 0x7F & ByteReverse(_buffer[c]);

            if (char_value >> 3 == 0)  //0x0..7
            {
@ -9853,7 +9853,7 @@ namespace Nikse.SubtitleEdit.Forms

        private bool ImportSubtitleFromMp4(string fileName)
        {
-            var mp4Parser = new Logic.Mp4.Mp4Parser(fileName);
+            var mp4Parser = new Logic.Mp4.MP4Parser(fileName);
            var mp4SubtitleTracks = mp4Parser.GetSubtitleTracks();
            if (mp4SubtitleTracks.Count == 0)
            {
@ -12433,8 +12433,8 @@ namespace Nikse.SubtitleEdit.Forms
                    foreach (string s in Configuration.Settings.Tools.UnicodeSymbolsToInsert.Split(";".ToCharArray(), StringSplitOptions.RemoveEmptyEntries))
                    {
                        toolStripMenuItemInsertUnicodeCharacter.DropDownItems.Add(s, null, InsertUnicodeGlyph);
-                        if (Environment.OSVersion.Version.Major < 6 && Configuration.Settings.General.SubtitleFontName == Utilities.WinXp2kUnicodeFontName) // 6 == Vista/Win2008Server/Win7
-                            toolStripMenuItemInsertUnicodeCharacter.DropDownItems[toolStripMenuItemInsertUnicodeCharacter.DropDownItems.Count - 1].Font = new Font(Utilities.WinXp2kUnicodeFontName, toolStripMenuItemInsertUnicodeSymbol.Font.Size);
+                        if (Environment.OSVersion.Version.Major < 6 && Configuration.Settings.General.SubtitleFontName == Utilities.WinXP2KUnicodeFontName) // 6 == Vista/Win2008Server/Win7
+                            toolStripMenuItemInsertUnicodeCharacter.DropDownItems[toolStripMenuItemInsertUnicodeCharacter.DropDownItems.Count - 1].Font = new Font(Utilities.WinXP2KUnicodeFontName, toolStripMenuItemInsertUnicodeSymbol.Font.Size);
                    }
                }
                toolStripMenuItemInsertUnicodeCharacter.Visible = toolStripMenuItemInsertUnicodeCharacter.DropDownItems.Count > 0;
@ -12680,7 +12680,7 @@ namespace Nikse.SubtitleEdit.Forms
                if ((Path.GetExtension(fileName).ToLower() == ".mp4" || Path.GetExtension(fileName).ToLower() == ".m4v" || Path.GetExtension(fileName).ToLower() == ".3gp")
                    && fi.Length > 10000)
                {
-                    var mp4Parser = new Logic.Mp4.Mp4Parser(fileName);
+                    var mp4Parser = new Logic.Mp4.MP4Parser(fileName);
                    var mp4SubtitleTracks = mp4Parser.GetSubtitleTracks();
                    if (mp4SubtitleTracks.Count == 0)
                    {
@ -17458,8 +17458,8 @@ namespace Nikse.SubtitleEdit.Forms
                    foreach (string s in Configuration.Settings.Tools.UnicodeSymbolsToInsert.Split(";".ToCharArray(), StringSplitOptions.RemoveEmptyEntries))
                    {
                        toolStripMenuItemInsertUnicodeSymbol.DropDownItems.Add(s, null, InsertUnicodeGlyph);
-                        if (Environment.OSVersion.Version.Major < 6 && Configuration.Settings.General.SubtitleFontName == Utilities.WinXp2kUnicodeFontName) // 6 == Vista/Win2008Server/Win7
-                            toolStripMenuItemInsertUnicodeSymbol.DropDownItems[toolStripMenuItemInsertUnicodeSymbol.DropDownItems.Count - 1].Font = new Font(Utilities.WinXp2kUnicodeFontName, toolStripMenuItemInsertUnicodeSymbol.Font.Size);
+                        if (Environment.OSVersion.Version.Major < 6 && Configuration.Settings.General.SubtitleFontName == Utilities.WinXP2KUnicodeFontName) // 6 == Vista/Win2008Server/Win7
+                            toolStripMenuItemInsertUnicodeSymbol.DropDownItems[toolStripMenuItemInsertUnicodeSymbol.DropDownItems.Count - 1].Font = new Font(Utilities.WinXP2KUnicodeFontName, toolStripMenuItemInsertUnicodeSymbol.Font.Size);
                    }
                }
                toolStripMenuItemInsertUnicodeSymbol.Visible = toolStripMenuItemInsertUnicodeSymbol.DropDownItems.Count > 0;
--- a/src/Forms/MatroskaSubtitleChooser.cs
+++ b/src/Forms/MatroskaSubtitleChooser.cs
@ -15,7 +15,7 @@ namespace Nikse.SubtitleEdit.Forms

            Text = Configuration.Settings.Language.MatroskaSubtitleChooser.Title;
            labelChoose.Text = Configuration.Settings.Language.MatroskaSubtitleChooser.PleaseChoose;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            FixLargeFonts();
        }
--- a/src/Forms/MeasurementConverter.cs
+++ b/src/Forms/MeasurementConverter.cs
@ -17,7 +17,7 @@ namespace Nikse.SubtitleEdit.Forms
            labelConvertFrom.Text = l.ConvertFrom;
            labelConvertTo.Text = l.ConvertTo;
            linkLabel1.Text = l.CopyToClipboard;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;

            _defaultBackColor = textBoxInput.BackColor;
            textBoxInput.Text = "1";
--- a/src/Forms/MergeDoubleLines.cs
+++ b/src/Forms/MergeDoubleLines.cs
@ -58,7 +58,7 @@ namespace Nikse.SubtitleEdit.Forms
            listViewFixes.Columns[1].Text = Configuration.Settings.Language.General.LineNumber;
            listViewFixes.Columns[2].Text = Configuration.Settings.Language.MergedShortLines.MergedText;

-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            SubtitleListview1.InitializeLanguage(Configuration.Settings.Language.General, Configuration.Settings);
            Utilities.InitializeSubtitleFont(SubtitleListview1);
--- a/src/Forms/MergeShortLines.cs
+++ b/src/Forms/MergeShortLines.cs
@ -57,7 +57,7 @@ namespace Nikse.SubtitleEdit.Forms
            listViewFixes.Columns[1].Text = Configuration.Settings.Language.General.LineNumber;
            listViewFixes.Columns[2].Text = Configuration.Settings.Language.MergedShortLines.MergedText;

-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            SubtitleListview1.InitializeLanguage(Configuration.Settings.Language.General, Configuration.Settings);
            Utilities.InitializeSubtitleFont(SubtitleListview1);
--- a/src/Forms/MergeTextWithSameTimeCodes.cs
+++ b/src/Forms/MergeTextWithSameTimeCodes.cs
@ -54,7 +54,7 @@ namespace Nikse.SubtitleEdit.Forms
            listViewFixes.Columns[1].Text = Configuration.Settings.Language.General.LineNumber;
            listViewFixes.Columns[2].Text = Configuration.Settings.Language.MergeTextWithSameTimeCodes.MergedText;

-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            SubtitleListview1.InitializeLanguage(Configuration.Settings.Language.General, Configuration.Settings);
            Utilities.InitializeSubtitleFont(SubtitleListview1);
--- a/src/Forms/ModifySelection.cs
+++ b/src/Forms/ModifySelection.cs
@ -30,7 +30,7 @@ namespace Nikse.SubtitleEdit.Forms
            labelInfo.Text = string.Empty;
            comboBoxRule.SelectedIndex = 0;
            Text = Configuration.Settings.Language.ModifySelection.Title;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            buttonApply.Text = Configuration.Settings.Language.General.Apply;
            groupBoxRule.Text = Configuration.Settings.Language.ModifySelection.Rule;
--- a/src/Forms/MultipleReplace.cs
+++ b/src/Forms/MultipleReplace.cs
@ -50,7 +50,7 @@ namespace Nikse.SubtitleEdit.Forms
            buttonRemoveAll.Text = Configuration.Settings.Language.MultipleReplace.RemoveAll;
            buttonImport.Text = Configuration.Settings.Language.MultipleReplace.Import;
            buttonExport.Text = Configuration.Settings.Language.MultipleReplace.Export;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            buttonReplacesSelectAll.Text = Configuration.Settings.Language.FixCommonErrors.SelectAll;
            buttonReplacesInverseSelection.Text = Configuration.Settings.Language.FixCommonErrors.InverseSelection;
--- a/src/Forms/NetworkLogAndInfo.cs
+++ b/src/Forms/NetworkLogAndInfo.cs
@ -14,7 +14,7 @@ namespace Nikse.SubtitleEdit.Forms
            labelUserName.Text = Configuration.Settings.Language.General.UserName;
            labelWebServiceUrl.Text = Configuration.Settings.Language.General.WebServiceUrl;
            labelLog.Text = Configuration.Settings.Language.NetworkLogAndInfo.Log;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
        }

        internal void Initialize(Logic.Networking.NikseWebServiceSession _networkSession)
--- a/src/Forms/PluginsGet.cs
+++ b/src/Forms/PluginsGet.cs
@ -39,7 +39,7 @@ namespace Nikse.SubtitleEdit.Forms

            buttonDownload.Text = _language.Download;
            buttonRemove.Text = _language.Remove;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            linkLabelOpenPluginFolder.Text = _language.OpenPluginsFolder;
            labelDescription1.Text = _language.GetPluginsInfo1;
            labelClickDownload.Text = _language.GetPluginsInfo2;
--- a/src/Forms/RemoveTextFromHearImpaired.cs
+++ b/src/Forms/RemoveTextFromHearImpaired.cs
@ -57,7 +57,7 @@ namespace Nikse.SubtitleEdit.Forms
            listViewFixes.Columns[1].Text = Configuration.Settings.Language.General.LineNumber;
            listViewFixes.Columns[2].Text = Configuration.Settings.Language.General.Before;
            listViewFixes.Columns[3].Text = Configuration.Settings.Language.General.After;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            FixLargeFonts();
        }
@ -112,7 +112,7 @@ namespace Nikse.SubtitleEdit.Forms
        {
            if (Environment.OSVersion.Version.Major < 6) // 6 == Vista/Win2008Server/Win7
            {
-                string unicodeFontName = Utilities.WinXp2kUnicodeFontName;
+                string unicodeFontName = Utilities.WinXP2KUnicodeFontName;
                float fontSize = comboBoxCustomStart.Font.Size;
                comboBoxCustomStart.Font = new System.Drawing.Font(unicodeFontName, fontSize);
                comboBoxCustomEnd.Font = new System.Drawing.Font(unicodeFontName, fontSize);
--- a/src/Forms/RestoreAutoBackup.cs
+++ b/src/Forms/RestoreAutoBackup.cs
@ -27,7 +27,7 @@ namespace Nikse.SubtitleEdit.Forms
            listViewBackups.Columns[3].Text = Configuration.Settings.Language.General.Size;
            labelInfo.Text = l.Information;

-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;

            FixLargeFonts();
--- a/src/Forms/SeekSilence.cs
+++ b/src/Forms/SeekSilence.cs
@ -23,7 +23,7 @@ namespace Nikse.SubtitleEdit.Forms
            labelVolumeBelow.Text = Configuration.Settings.Language.SeekSilence.MaxVolume;
            numericUpDownSeconds.Value = (decimal)Configuration.Settings.VideoControls.WaveformSeeksSilenceDurationSeconds;
            numericUpDownVolume.Value = Configuration.Settings.VideoControls.WaveformSeeksSilenceMaxVolume;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            FixLargeFonts();
        }
--- a/src/Forms/SetMinimumDisplayTimeBetweenParagraphs.cs
+++ b/src/Forms/SetMinimumDisplayTimeBetweenParagraphs.cs
@ -21,7 +21,7 @@ namespace Nikse.SubtitleEdit.Forms
            Text = Configuration.Settings.Language.SetMinimumDisplayTimeBetweenParagraphs.Title;
            labelMaxMillisecondsBetweenLines.Text = Configuration.Settings.Language.SetMinimumDisplayTimeBetweenParagraphs.MinimumMillisecondsBetweenParagraphs;
            checkBoxShowOnlyChangedLines.Text = Configuration.Settings.Language.SetMinimumDisplayTimeBetweenParagraphs.ShowOnlyModifiedLines;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            SubtitleListview1.InitializeLanguage(Configuration.Settings.Language.General, Configuration.Settings);
            SubtitleListview1.InitializeTimeStampColumWidths(this);
--- a/src/Forms/SetVideoOffset.cs
+++ b/src/Forms/SetVideoOffset.cs
@ -30,7 +30,7 @@ namespace Nikse.SubtitleEdit.Forms
            Text = Configuration.Settings.Language.SetVideoOffset.Title;
            labelDescription.Text = Configuration.Settings.Language.SetVideoOffset.Description;
            checkBoxFromCurrentPosition.Text = Configuration.Settings.Language.SetVideoOffset.RelativeToCurrentVideoPosition;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            FixLargeFonts();
        }
--- a/src/Forms/Settings.cs
+++ b/src/Forms/Settings.cs
@ -543,7 +543,7 @@ namespace Nikse.SubtitleEdit.Forms
            if (!Utilities.IsRunningOnMono() && Environment.OSVersion.Version.Major < 6) // 6 == Vista/Win2008Server/Win7
            {
                float fontSize = comboBoxToolsMusicSymbol.Font.Size;
-                string unicodeFontName = Utilities.WinXp2kUnicodeFontName;
+                string unicodeFontName = Utilities.WinXP2KUnicodeFontName;
                listBoxNamesEtc.Font = new System.Drawing.Font(unicodeFontName, fontSize);
                listBoxUserWordLists.Font = new System.Drawing.Font(unicodeFontName, fontSize);
                listBoxOcrFixList.Font = new System.Drawing.Font(unicodeFontName, fontSize);
@ -595,7 +595,7 @@ namespace Nikse.SubtitleEdit.Forms
            checkBoxTreatINQuoteAsING.Checked = toolsSettings.SpellCheckEnglishAllowInQuoteAsIng;
            checkBoxUseDoNotBreakAfterList.Checked = toolsSettings.UseNoLineBreakAfter;

-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;

            ListWordListLanguages();
@ -932,14 +932,14 @@ namespace Nikse.SubtitleEdit.Forms
            }
        }

-        public void Initialize(Icon icon, Image newFile, Image openFile, Image saveFile, Image SaveFileAs, Image find, Image replace, Image fixCommonErrors,
+        public void Initialize(Icon icon, Image newFile, Image openFile, Image saveFile, Image saveFileAs, Image find, Image replace, Image fixCommonErrors,
                               Image visualSync, Image spellCheck, Image settings, Image help)
        {
            this.Icon = (Icon)icon.Clone();
            pictureBoxNew.Image = (Image)newFile.Clone();
            pictureBoxOpen.Image = (Image)openFile.Clone();
            pictureBoxSave.Image = (Image)saveFile.Clone();
-            pictureBoxSaveAs.Image = (Image)SaveFileAs.Clone();
+            pictureBoxSaveAs.Image = (Image)saveFileAs.Clone();
            pictureBoxFind.Image = (Image)find.Clone();
            pictureBoxReplace.Image = (Image)replace.Clone();
            pictureBoxTBFixCommonErrors.Image = (Image)fixCommonErrors.Clone();
@ -1753,8 +1753,8 @@ namespace Nikse.SubtitleEdit.Forms
            {
                var doc = new XmlDocument();
                doc.Load(replaceListXmlFileName);
-                _ocrFixWords = Logic.OCR.OcrFixEngine.LoadReplaceList(doc, "WholeWords");
-                _ocrFixPartialLines = Logic.OCR.OcrFixEngine.LoadReplaceList(doc, "PartialLines");
+                _ocrFixWords = Logic.Ocr.OcrFixEngine.LoadReplaceList(doc, "WholeWords");
+                _ocrFixPartialLines = Logic.Ocr.OcrFixEngine.LoadReplaceList(doc, "PartialLines");

                if (reloadListBox)
                {
--- a/src/Forms/SplitLongLines.cs
+++ b/src/Forms/SplitLongLines.cs
@ -57,7 +57,7 @@ namespace Nikse.SubtitleEdit.Forms
            listViewFixes.Columns[1].Text = Configuration.Settings.Language.General.LineNumber;
            listViewFixes.Columns[2].Text = Configuration.Settings.Language.General.Text;

-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            SubtitleListview1.InitializeLanguage(Configuration.Settings.Language.General, Configuration.Settings);
            Utilities.InitializeSubtitleFont(SubtitleListview1);
--- a/src/Forms/StartNumberingFrom.cs
+++ b/src/Forms/StartNumberingFrom.cs
@ -13,7 +13,7 @@ namespace Nikse.SubtitleEdit.Forms

            Text = Configuration.Settings.Language.StartNumberingFrom.Title;
            label1.Text = Configuration.Settings.Language.StartNumberingFrom.StartFromNumber;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            FixLargeFonts();
        }
--- a/src/Forms/Statistics.cs
+++ b/src/Forms/Statistics.cs
@ -30,7 +30,7 @@ namespace Nikse.SubtitleEdit.Forms
            groupBoxMostUsed.Text = _l.MostUsed;
            labelMostUsedWords.Text = _l.MostUsedWords;
            labelMostUsedLines.Text = _l.MostUsedLines;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            FixLargeFonts();

            CalculateGeneralStatistics();
--- a/src/Forms/StatusLog.cs
+++ b/src/Forms/StatusLog.cs
@ -9,7 +9,7 @@ namespace Nikse.SubtitleEdit.Forms
        {
            InitializeComponent();
            Text = Configuration.Settings.Language.Main.StatusLog;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            textBoxStatusLog.Text = logText;
        }

--- a/src/Forms/SubStationAlphaProperties.cs
+++ b/src/Forms/SubStationAlphaProperties.cs
@ -132,7 +132,7 @@ namespace Nikse.SubtitleEdit.Forms
            labelWrapStyle.Text = l.WrapStyle;
            checkBoxScaleBorderAndShadow.Text = l.ScaleBorderAndShadow;

-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;

            FixLargeFonts();
--- a/src/Forms/SubStationAlphaStyles.cs
+++ b/src/Forms/SubStationAlphaStyles.cs
@ -97,7 +97,7 @@ namespace Nikse.SubtitleEdit.Forms
                checkBoxFontUnderline.Visible = false;
            }

-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;

            InitializeListView();
--- a/src/Forms/SyncPointsSync.cs
+++ b/src/Forms/SyncPointsSync.cs
@ -45,7 +45,7 @@ namespace Nikse.SubtitleEdit.Forms

            buttonSetSyncPoint.Text = Configuration.Settings.Language.PointSync.SetSyncPoint;
            buttonRemoveSyncPoint.Text = Configuration.Settings.Language.PointSync.RemoveSyncPoint;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonApplySync.Text = Configuration.Settings.Language.PointSync.ApplySync;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            labelNoOfSyncPoints.Text = string.Format(Configuration.Settings.Language.PointSync.SyncPointsX, 0);
--- a/src/Forms/TransportStreamSubtitleChooser.cs
+++ b/src/Forms/TransportStreamSubtitleChooser.cs
@ -17,7 +17,7 @@ namespace Nikse.SubtitleEdit.Forms
        {
            InitializeComponent();
            labelChoose.Text = Configuration.Settings.Language.MatroskaSubtitleChooser.PleaseChoose;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            FixLargeFonts();
        }
--- a/src/Forms/UnknownSubtitle.cs
+++ b/src/Forms/UnknownSubtitle.cs
@ -13,7 +13,7 @@ namespace Nikse.SubtitleEdit.Forms
            Text = Configuration.Settings.Language.UnknownSubtitle.Title;
            labelTitle.Text = Configuration.Settings.Language.UnknownSubtitle.Title;
            richTextBoxMessage.Text = Configuration.Settings.Language.UnknownSubtitle.Message;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            FixLargeFonts();
        }

--- a/src/Forms/VisualSync.cs
+++ b/src/Forms/VisualSync.cs
@ -28,7 +28,7 @@ namespace Nikse.SubtitleEdit.Forms
        public string VideoFileName { get; set; }
        public int AudioTrackNumber { get; set; }

-        public bool OKPressed { get; set; }
+        public bool OkPressed { get; set; }

        public bool FrameRateChanged
        {
@ -79,7 +79,7 @@ namespace Nikse.SubtitleEdit.Forms
            buttonFindTextStart.Text = _language.FindText;
            buttonFindTextEnd.Text = _language.FindText;
            buttonSync.Text = _language.Synchronize;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            labelTip.Text = _language.Tip;
            FixLargeFonts();
@ -733,7 +733,7 @@ namespace Nikse.SubtitleEdit.Forms

        private void buttonOK_Click(object sender, EventArgs e)
        {
-            OKPressed = true;
+            OkPressed = true;
        }

        private void timerProgressBarRefresh_Tick(object sender, EventArgs e)
--- a/src/Forms/VobSubEditCharacters.cs
+++ b/src/Forms/VobSubEditCharacters.cs
@ -5,7 +5,7 @@ using System.IO;
 using System.Windows.Forms;
 using System.Xml;
 using Nikse.SubtitleEdit.Logic;
-using Nikse.SubtitleEdit.Logic.OCR.Binary;
+using Nikse.SubtitleEdit.Logic.Ocr.Binary;

 namespace Nikse.SubtitleEdit.Forms
 {
@ -65,7 +65,7 @@ namespace Nikse.SubtitleEdit.Forms
            buttonUpdate.Text = Configuration.Settings.Language.VobSubEditCharacters.Update;
            buttonDelete.Text = Configuration.Settings.Language.VobSubEditCharacters.Delete;
            labelDoubleSize.Text = Configuration.Settings.Language.VobSubEditCharacters.ImageDoubleSize;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            FixLargeFonts();
        }
--- a/src/Forms/VobSubNOcrCharacterInspect.cs
+++ b/src/Forms/VobSubNOcrCharacterInspect.cs
@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
 using Nikse.SubtitleEdit.Logic;
-using Nikse.SubtitleEdit.Logic.OCR;
+using Nikse.SubtitleEdit.Logic.Ocr;
 using System.IO;

 namespace Nikse.SubtitleEdit.Forms
--- a/src/Forms/VobSubNOcrEdit.cs
+++ b/src/Forms/VobSubNOcrEdit.cs
@ -1,5 +1,5 @@
 using Nikse.SubtitleEdit.Logic;
-using Nikse.SubtitleEdit.Logic.OCR;
+using Nikse.SubtitleEdit.Logic.Ocr;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
--- a/src/Forms/VobSubNOcrTrain.cs
+++ b/src/Forms/VobSubNOcrTrain.cs
@ -1,5 +1,5 @@
 using Nikse.SubtitleEdit.Logic;
-using Nikse.SubtitleEdit.Logic.OCR;
+using Nikse.SubtitleEdit.Logic.Ocr;
 using Nikse.SubtitleEdit.Logic.SubtitleFormats;
 using System;
 using System.Collections.Generic;
@ -38,7 +38,7 @@ namespace Nikse.SubtitleEdit.Forms

        }

-        internal void Initialize(Logic.OCR.NOcrDb _nOcrDb)
+        internal void Initialize(Logic.Ocr.NOcrDb _nOcrDb)
        {
            if (_nOcrDb != null)
            {
--- a/src/Forms/VobSubOcr.cs
+++ b/src/Forms/VobSubOcr.cs
@ -1,6 +1,6 @@
 using Nikse.SubtitleEdit.Logic;
-using Nikse.SubtitleEdit.Logic.OCR;
-using Nikse.SubtitleEdit.Logic.OCR.Binary;
+using Nikse.SubtitleEdit.Logic.Ocr;
+using Nikse.SubtitleEdit.Logic.Ocr.Binary;
 using Nikse.SubtitleEdit.Logic.SubtitleFormats;
 using Nikse.SubtitleEdit.Logic.VobSub;
 using System;
@ -320,7 +320,7 @@ namespace Nikse.SubtitleEdit.Forms
            labelStatus.Text = language.LoadingVobSubImages;
            groupBoxSubtitleImage.Text = language.SubtitleImage;
            labelSubtitleText.Text = language.SubtitleText;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            subtitleListView1.InitializeLanguage(Configuration.Settings.Language.General, Configuration.Settings);
            subtitleListView1.Columns[0].Width = 45;
--- a/src/Forms/VobSubOcrCharacter.cs
+++ b/src/Forms/VobSubOcrCharacter.cs
@ -27,7 +27,7 @@ namespace Nikse.SubtitleEdit.Forms
            labelItalicOn.Text = language.Italic.Replace("&", string.Empty);
            labelItalicOn.Visible = false;
            buttonAbort.Text = language.Abort;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = language.Skip;
            nordicToolStripMenuItem.Text = language.Nordic;
            spanishToolStripMenuItem.Text = language.Spanish;
--- a/src/Forms/VobSubOcrCharacterInspect.cs
+++ b/src/Forms/VobSubOcrCharacterInspect.cs
@ -6,7 +6,7 @@ using System.IO;
 using System.Windows.Forms;
 using System.Xml;
 using Nikse.SubtitleEdit.Logic;
-using Nikse.SubtitleEdit.Logic.OCR.Binary;
+using Nikse.SubtitleEdit.Logic.Ocr.Binary;

 namespace Nikse.SubtitleEdit.Forms
 {
@ -38,7 +38,7 @@ namespace Nikse.SubtitleEdit.Forms
            buttonDelete.Text = Configuration.Settings.Language.VobSubEditCharacters.Delete;
            buttonAddBetterMatch.Text = Configuration.Settings.Language.VobSubOcrCharacterInspect.AddBetterMatch;
            labelDoubleSize.Text = Configuration.Settings.Language.VobSubEditCharacters.ImageDoubleSize;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            FixLargeFonts();
        }
--- a/src/Forms/VobSubOcrNOcrCharacter.cs
+++ b/src/Forms/VobSubOcrNOcrCharacter.cs
@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
 using Nikse.SubtitleEdit.Logic;
-using Nikse.SubtitleEdit.Logic.OCR;
+using Nikse.SubtitleEdit.Logic.Ocr;

 namespace Nikse.SubtitleEdit.Forms
 {
--- a/src/Forms/VobSubOcrNewFolder.cs
+++ b/src/Forms/VobSubOcrNewFolder.cs
@ -18,7 +18,7 @@ namespace Nikse.SubtitleEdit.Forms

            Text = Configuration.Settings.Language.VobSubOcrNewFolder.Title;
            label1.Text = Configuration.Settings.Language.VobSubOcrNewFolder.Message;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            FixLargeFonts();
        }
--- a/src/Forms/WaveFormGenerateTimeCodes.cs
+++ b/src/Forms/WaveFormGenerateTimeCodes.cs
@ -45,7 +45,7 @@ namespace Nikse.SubtitleEdit.Forms
            numericUpDownDefaultMilliseconds.Left = labelSplit1.Left + labelSplit1.Width + 3;
            labelSplit2.Left = numericUpDownDefaultMilliseconds.Left + numericUpDownDefaultMilliseconds.Width + 3;

-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
        }

--- a/src/Forms/WebVttNewVoice.cs
+++ b/src/Forms/WebVttNewVoice.cs
@ -16,7 +16,7 @@ namespace Nikse.SubtitleEdit.Forms
                Text = Configuration.Settings.Language.WebVttNewVoice.Title;
            if (!string.IsNullOrEmpty(Configuration.Settings.Language.WebVttNewVoice.VoiceName)) //TODO: Remove in 3.4
                labelVoiceName.Text = Configuration.Settings.Language.WebVttNewVoice.VoiceName;
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            FixLargeFonts();
        }
--- a/src/Forms/YouTubeAnnotationsImport.cs
+++ b/src/Forms/YouTubeAnnotationsImport.cs
@ -12,7 +12,7 @@ namespace Nikse.SubtitleEdit.Forms
            InitializeComponent();

            Text = "YouTube Annotations";
-            buttonOK.Text = Configuration.Settings.Language.General.OK;
+            buttonOK.Text = Configuration.Settings.Language.General.Ok;
            buttonCancel.Text = Configuration.Settings.Language.General.Cancel;
            //listViewFixes.Columns[0].Text = Configuration.Settings.Language.General.Apply;
            listViewFixes.Columns[1].Text = string.Empty; // style //TODO: Add better text + help text
--- a/src/Languages/ar-EG.xml
+++ b/src/Languages/ar-EG.xml
@ -11,7 +11,7 @@ https://www.facebook.com/zakaria2000
 http://www.alghaamdi.com/vb/index.php</TranslatedBy>
    <CultureName>ar-EG</CultureName>
    <HelpFile />
-    <OK>&amp;حسناً</OK>
+    <Ok>&amp;حسناً</Ok>
    <Cancel>إلغاء</Cancel>
    <Apply>تطبيق</Apply>
    <None>لاشىء</None>
--- a/src/Languages/bg-BG.xml
+++ b/src/Languages/bg-BG.xml
@ -6,7 +6,7 @@
    <TranslatedBy>Превод на български: Ivo Ivanov и JJD</TranslatedBy>
    <CultureName>bg-BG</CultureName>
    <HelpFile />
-    <OK>&amp;OK</OK>
+    <Ok>&amp;OK</Ok>
    <Cancel>Отказ</Cancel>
    <Apply>Прилагане</Apply>
    <None>Нищо</None>
--- a/src/Languages/ca-ES.xml
+++ b/src/Languages/ca-ES.xml
@ -6,7 +6,7 @@
    <TranslatedBy>Traduït per Juansa</TranslatedBy>
    <CultureName>ca-ES</CultureName>
    <HelpFile />
-    <OK>D'ac&amp;ord</OK>
+    <Ok>D'ac&amp;ord</Ok>
    <Cancel>C&amp;ancel·la</Cancel>
    <Apply>Aplica</Apply>
    <None>Cap</None>
--- a/src/Languages/cs-CZ.xml
+++ b/src/Languages/cs-CZ.xml
@ -6,7 +6,7 @@
    <TranslatedBy>Překlad do češtiny: Trottel</TranslatedBy>
    <CultureName>cs-CZ</CultureName>
    <HelpFile />
-    <OK>&amp;OK</OK>
+    <Ok>&amp;OK</Ok>
    <Cancel>&amp;Storno</Cancel>
    <Apply>Použít</Apply>
    <None>Žádná</None>
--- a/src/Languages/da-DK.xml
+++ b/src/Languages/da-DK.xml
@ -7,7 +7,7 @@
    <CultureName>da-DK</CultureName>
    <HelpFile>
    </HelpFile>
-    <OK>&amp;OK</OK>
+    <Ok>&amp;OK</Ok>
    <Cancel>&amp;Fortryd</Cancel>
    <Apply>Anvend</Apply>
    <None>Ingen</None>
--- a/src/Languages/de-DE.xml
+++ b/src/Languages/de-DE.xml
@ -6,7 +6,7 @@
    <TranslatedBy>Übersetzt von Christoph Kitsche. Überarbeitet von Nobody.</TranslatedBy>
    <CultureName>de-DE</CultureName>
    <HelpFile></HelpFile>
-    <OK>&amp;OK</OK>
+    <Ok>&amp;OK</Ok>
    <Cancel>&amp;Abbrechen</Cancel>
    <Apply>Auswahl</Apply>
    <None>Aus</None>
--- a/src/Languages/el-GR.xml
+++ b/src/Languages/el-GR.xml
@ -7,7 +7,7 @@
 Σχόλια για τη μετάφραση στο: mailto:akis_manolopoulos@hotmail.com</TranslatedBy>
    <CultureName>el-GR</CultureName>
    <HelpFile />
-    <OK>&amp;Εντάξει</OK>
+    <Ok>&amp;Εντάξει</Ok>
    <Cancel>Α&amp;κύρωση</Cancel>
    <Apply>Εφαρμογή</Apply>
    <None>Κανένα</None>
--- a/src/Languages/es-AR.xml
+++ b/src/Languages/es-AR.xml
@ -6,7 +6,7 @@
    <TranslatedBy>Traducido por Marcelo1ar, correcciones por walterh78</TranslatedBy>
    <CultureName>es-AR</CultureName>
    <HelpFile>http://www.nikse.dk/SubtitleEdit/HelpEs</HelpFile>
-    <OK>&amp;OK</OK>
+    <Ok>&amp;OK</Ok>
    <Cancel>C&amp;ancelar</Cancel>
    <Apply>Aplicar</Apply>
    <None>Cancelar</None>
--- a/src/Languages/es-ES.xml
+++ b/src/Languages/es-ES.xml
@ -6,7 +6,7 @@
    <TranslatedBy>Traducido por m2s</TranslatedBy>
    <CultureName>es-ES</CultureName>
    <HelpFile />
-    <OK>&amp;OK</OK>
+    <Ok>&amp;OK</Ok>
    <Cancel>C&amp;ancelar</Cancel>
    <Apply>Aplicar</Apply>
    <None>Cancelar</None>
--- a/src/Languages/es-MX.xml
+++ b/src/Languages/es-MX.xml
@ -6,7 +6,7 @@
    <TranslatedBy>Traducido por Francisco Naranjo (paconaranjo)</TranslatedBy>
    <CultureName>es-MX</CultureName>
    <HelpFile>http://www.nikse.dk/SubtitleEdit/HelpEs</HelpFile>
-    <OK>&amp;Aceptar</OK>
+    <Ok>&amp;Aceptar</Ok>
    <Cancel>C&amp;ancelar</Cancel>
    <Apply>Aplicar</Apply>
    <None>Cancelar</None>
--- a/src/Languages/eu-ES.xml
+++ b/src/Languages/eu-ES.xml
@ -6,7 +6,7 @@
    <TranslatedBy>Itzultzailea: Xabier Aramendi</TranslatedBy>
    <CultureName>eu-ES</CultureName>
    <HelpFile>http://www.nikse.dk/SubtitleEdit/HelpEU</HelpFile>
-    <OK>&amp;Ongi</OK>
+    <Ok>&amp;Ongi</Ok>
    <Cancel>E&amp;zeztatu</Cancel>
    <Apply>Ezarri</Apply>
    <None>Ezer ez</None>
--- a/src/Languages/fa-IR.xml
+++ b/src/Languages/fa-IR.xml
@ -6,7 +6,7 @@
    <TranslatedBy>ترجمه توسط:برنامه نويس جوان</TranslatedBy>
    <CultureName>Fa-IR</CultureName>
    <HelpFile>فایل راهنما</HelpFile>
-    <OK>تائید</OK>
+    <Ok>تائید</Ok>
    <Cancel>لغو</Cancel>
    <Apply>اعمال</Apply>
    <None>هیچ کدام</None>
--- a/src/Languages/fi-FI.xml
+++ b/src/Languages/fi-FI.xml
@ -6,7 +6,7 @@
    <TranslatedBy>Suomentanut vm, päivittänyt Teijo S. [27-06-2014]</TranslatedBy>
    <CultureName>fi-FI</CultureName>
    <HelpFile />
-    <OK>&amp;OK</OK>
+    <Ok>&amp;OK</Ok>
    <Cancel>Peruuta</Cancel>
    <Apply>Käytä</Apply>
    <None>Ei mitään</None>
--- a/src/Languages/fr-FR.xml
+++ b/src/Languages/fr-FR.xml
@ -6,7 +6,7 @@
    <TranslatedBy>Traduction française par JM GBT</TranslatedBy>
    <CultureName>fr-FR</CultureName>
    <HelpFile />
-    <OK>&amp;OK</OK>
+    <Ok>&amp;OK</Ok>
    <Cancel>A&amp;nnuler</Cancel>
    <Apply>Activer</Apply>
    <None>Aucune</None>
--- a/src/Languages/hr-HR.xml
+++ b/src/Languages/hr-HR.xml
@ -6,7 +6,7 @@
    <TranslatedBy>Prijevod: Jozo Marić</TranslatedBy>
    <CultureName>hr-HR</CultureName>
    <HelpFile></HelpFile>
-    <OK>&amp;U redu</OK>
+    <Ok>&amp;U redu</Ok>
    <Cancel>&amp;Otkaži</Cancel>
    <Apply>Primjeni</Apply>
    <None>Ništa</None>
--- a/src/Languages/hu-HU.xml
+++ b/src/Languages/hu-HU.xml
@ -6,7 +6,7 @@
    <TranslatedBy>Fordító: ZityiSoft Team (http://szoftverforditasok.hu)</TranslatedBy>
    <CultureName>hu-HU</CultureName>
    <HelpFile/>
-    <OK>OK</OK>
+    <Ok>OK</Ok>
    <Cancel>Mégse</Cancel>
    <Apply>Alkalmaz</Apply>
    <None>Nincs</None>
--- a/src/Languages/it-IT.xml
+++ b/src/Languages/it-IT.xml
@ -6,7 +6,7 @@
    <TranslatedBy>Traduzione Italiana SilverDrake (giurdi@katamail.com)</TranslatedBy>
    <CultureName>it-IT</CultureName>
    <HelpFile />
-    <OK>&amp;OK</OK>
+    <Ok>&amp;OK</Ok>
    <Cancel>&amp;Annulla</Cancel>
    <Apply>Applica</Apply>
    <None>Nessuno</None>
--- a/src/Languages/ja-JP.xml
+++ b/src/Languages/ja-JP.xml
@ -6,7 +6,7 @@
    <TranslatedBy>Nardog</TranslatedBy>
    <CultureName>ja-JP</CultureName>
    <HelpFile />
-    <OK>OK(&amp;O)</OK>
+    <Ok>OK(&amp;O)</Ok>
    <Cancel>キャンセル(&amp;A)</Cancel>
    <Apply>適用</Apply>
    <None>なし</None>
--- a/Show More
+++ b/Show More