Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-27 22:42:38 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/SubtitleEdit/subtitleedit

Browse Source
This commit is contained in:
Nikolaj Olsson 2020-01-21 16:01:20 +01:00
commit 8680355d03
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
installer/Subtitle_Edit_installer.iss
View File

@ -463,9 +463,12 @@ Root: HKLM; Subkey: "{#keyApps}\SubtitleEdit.exe\SupportedTypes"; ValueType: str
; Add .ass (Advanced SubStation Alpha) to the SE-supported file types ; Add .ass (Advanced SubStation Alpha) to the SE-supported file types
Root: HKLM; Subkey: "{#keyApps}\SubtitleEdit.exe\SupportedTypes"; ValueType: string; ValueName: ".ass"; ValueData: ""; Check: HklmKeyExists('{#keyApps}') Root: HKLM; Subkey: "{#keyApps}\SubtitleEdit.exe\SupportedTypes"; ValueType: string; ValueName: ".ass"; ValueData: ""; Check: HklmKeyExists('{#keyApps}')
; Add video files to the SE-supported file types ; Add video files to the SE-supported file types
Root: HKLM; Subkey: "{#keyApps}\SubtitleEdit.exe\SupportedTypes"; ValueType: string; ValueName: ".mkv"; ValueData: ""; Check: HklmKeyExists('{#keyApps}') Root: HKLM; Subkey: "{#keyApps}\SubtitleEdit.exe\SupportedTypes"; ValueType: string; ValueName: ".m2ts"; ValueData: ""; Check: HklmKeyExists('{#keyApps}')
Root: HKLM; Subkey: "{#keyApps}\SubtitleEdit.exe\SupportedTypes"; ValueType: string; ValueName: ".mp4"; ValueData: ""; Check: HklmKeyExists('{#keyApps}') Root: HKLM; Subkey: "{#keyApps}\SubtitleEdit.exe\SupportedTypes"; ValueType: string; ValueName: ".mp4"; ValueData: ""; Check: HklmKeyExists('{#keyApps}')
Root: HKLM; Subkey: "{#keyApps}\SubtitleEdit.exe\SupportedTypes"; ValueType: string; ValueName: ".avi"; ValueData: ""; Check: HklmKeyExists('{#keyApps}') Root: HKLM; Subkey: "{#keyApps}\SubtitleEdit.exe\SupportedTypes"; ValueType: string; ValueName: ".mkv"; ValueData: ""; Check: HklmKeyExists('{#keyApps}')
Root: HKLM; Subkey: "{#keyApps}\SubtitleEdit.exe\SupportedTypes"; ValueType: string; ValueName: ".mks"; ValueData: ""; Check: HklmKeyExists('{#keyApps}')
Root: HKLM; Subkey: "{#keyApps}\SubtitleEdit.exe\SupportedTypes"; ValueType: string; ValueName: ".avi"; ValueData: ""; Check: HklmKeyExists('{#keyApps}')
Root: HKLM; Subkey: "{#keyApps}\SubtitleEdit.exe\SupportedTypes"; ValueType: string; ValueName: ".ts"; ValueData: ""; Check: HklmKeyExists('{#keyApps}')
[Code] [Code]

16
libse/Dictionaries/OcrFixReplaceList.cs
View File

@ -22,7 +22,7 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
private readonly Dictionary<string, string> _beginLineReplaceList; private readonly Dictionary<string, string> _beginLineReplaceList;
private readonly Dictionary<string, string> _endLineReplaceList; private readonly Dictionary<string, string> _endLineReplaceList;
private readonly Dictionary<string, string> _wholeLineReplaceList; private readonly Dictionary<string, string> _wholeLineReplaceList;
private readonly Dictionary<string, string> _partialWordReplaceListAlways; private readonly Dictionary<string, string> _partialWordAlwaysReplaceList;
private readonly Dictionary<string, string> _partialWordReplaceList; private readonly Dictionary<string, string> _partialWordReplaceList;
private readonly Dictionary<string, string> _regExList; private readonly Dictionary<string, string> _regExList;
private readonly string _replaceListXmlFileName; private readonly string _replaceListXmlFileName;
@ -38,7 +38,7 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
_beginLineReplaceList = new Dictionary<string, string>(); _beginLineReplaceList = new Dictionary<string, string>();
_endLineReplaceList = new Dictionary<string, string>(); _endLineReplaceList = new Dictionary<string, string>();
_wholeLineReplaceList = new Dictionary<string, string>(); _wholeLineReplaceList = new Dictionary<string, string>();
_partialWordReplaceListAlways = new Dictionary<string, string>(); _partialWordAlwaysReplaceList = new Dictionary<string, string>();
_partialWordReplaceList = new Dictionary<string, string>(); _partialWordReplaceList = new Dictionary<string, string>();
_regExList = new Dictionary<string, string>(); _regExList = new Dictionary<string, string>();
@ -46,10 +46,10 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
var userDoc = LoadXmlReplaceListUserDocument(); var userDoc = LoadXmlReplaceListUserDocument();
WordReplaceList = LoadReplaceList(doc, "WholeWords"); WordReplaceList = LoadReplaceList(doc, "WholeWords");
_partialWordReplaceListAlways = LoadReplaceList(doc, "PartialWordsAlways"); _partialWordAlwaysReplaceList = LoadReplaceList(doc, "PartialWordsAlways");
_partialWordReplaceList = LoadReplaceList(doc, "PartialWords"); _partialWordReplaceList = LoadReplaceList(doc, "PartialWords");
PartialLineWordBoundaryReplaceList = LoadReplaceList(doc, "PartialLines"); PartialLineWordBoundaryReplaceList = LoadReplaceList(doc, "PartialLines");
_partialLineAlwaysReplaceList = LoadReplaceList(doc, "PartialAlwaysLines"); _partialLineAlwaysReplaceList = LoadReplaceList(doc, "PartialLinesAlways");
_beginLineReplaceList = LoadReplaceList(doc, "BeginLines"); _beginLineReplaceList = LoadReplaceList(doc, "BeginLines");
_endLineReplaceList = LoadReplaceList(doc, "EndLines"); _endLineReplaceList = LoadReplaceList(doc, "EndLines");
_wholeLineReplaceList = LoadReplaceList(doc, "WholeLines"); _wholeLineReplaceList = LoadReplaceList(doc, "WholeLines");
@ -427,9 +427,9 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
} }
//always replace list //always replace list
foreach (string letter in _partialWordReplaceListAlways.Keys) foreach (string letter in _partialWordAlwaysReplaceList.Keys)
{ {
word = word.Replace(letter, _partialWordReplaceListAlways[letter]); word = word.Replace(letter, _partialWordAlwaysReplaceList[letter]);
} }
string pre = string.Empty; string pre = string.Empty;
@ -711,9 +711,9 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
var word = input; var word = input;
//always replace list //always replace list
foreach (string letter in _partialWordReplaceListAlways.Keys) foreach (string letter in _partialWordAlwaysReplaceList.Keys)
{ {
word = word.Replace(letter, _partialWordReplaceListAlways[letter]); word = word.Replace(letter, _partialWordAlwaysReplaceList[letter]);
} }
string pre = string.Empty; string pre = string.Empty;

4
src/Forms/Ocr/VobSubOcr.cs
View File

@ -1116,8 +1116,8 @@ namespace Nikse.SubtitleEdit.Forms.Ocr
break; break;
} }
if (tl.Text.StartsWith("Spannish", StringComparison.OrdinalIgnoreCase) && (languageString.StartsWith("spannish", StringComparison.OrdinalIgnoreCase) || languageString.StartsWith("españo", StringComparison.OrdinalIgnoreCase)) || if (tl.Text.StartsWith("Spanish", StringComparison.OrdinalIgnoreCase) && (languageString.StartsWith("spanish", StringComparison.OrdinalIgnoreCase) || languageString.StartsWith("españo", StringComparison.OrdinalIgnoreCase)) ||
tl.Text.StartsWith("Spannish", StringComparison.OrdinalIgnoreCase) && languageString.Equals("esp", StringComparison.OrdinalIgnoreCase)) tl.Text.StartsWith("Spanish", StringComparison.OrdinalIgnoreCase) && languageString.Equals("esp", StringComparison.OrdinalIgnoreCase))
{ {
comboBoxTesseractLanguages.SelectedIndex = i; comboBoxTesseractLanguages.SelectedIndex = i;
break; break;