mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
Merge branch 'master' of https://github.com/SubtitleEdit/subtitleedit
This commit is contained in:
commit
8680355d03
@ -463,9 +463,12 @@ Root: HKLM; Subkey: "{#keyApps}\SubtitleEdit.exe\SupportedTypes"; ValueType: str
|
||||
; 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}')
|
||||
; 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: ".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: ".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: ".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]
|
||||
|
@ -22,7 +22,7 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
|
||||
private readonly Dictionary<string, string> _beginLineReplaceList;
|
||||
private readonly Dictionary<string, string> _endLineReplaceList;
|
||||
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> _regExList;
|
||||
private readonly string _replaceListXmlFileName;
|
||||
@ -38,7 +38,7 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
|
||||
_beginLineReplaceList = new Dictionary<string, string>();
|
||||
_endLineReplaceList = new Dictionary<string, string>();
|
||||
_wholeLineReplaceList = new Dictionary<string, string>();
|
||||
_partialWordReplaceListAlways = new Dictionary<string, string>();
|
||||
_partialWordAlwaysReplaceList = new Dictionary<string, string>();
|
||||
_partialWordReplaceList = new Dictionary<string, string>();
|
||||
_regExList = new Dictionary<string, string>();
|
||||
|
||||
@ -46,10 +46,10 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
|
||||
var userDoc = LoadXmlReplaceListUserDocument();
|
||||
|
||||
WordReplaceList = LoadReplaceList(doc, "WholeWords");
|
||||
_partialWordReplaceListAlways = LoadReplaceList(doc, "PartialWordsAlways");
|
||||
_partialWordAlwaysReplaceList = LoadReplaceList(doc, "PartialWordsAlways");
|
||||
_partialWordReplaceList = LoadReplaceList(doc, "PartialWords");
|
||||
PartialLineWordBoundaryReplaceList = LoadReplaceList(doc, "PartialLines");
|
||||
_partialLineAlwaysReplaceList = LoadReplaceList(doc, "PartialAlwaysLines");
|
||||
_partialLineAlwaysReplaceList = LoadReplaceList(doc, "PartialLinesAlways");
|
||||
_beginLineReplaceList = LoadReplaceList(doc, "BeginLines");
|
||||
_endLineReplaceList = LoadReplaceList(doc, "EndLines");
|
||||
_wholeLineReplaceList = LoadReplaceList(doc, "WholeLines");
|
||||
@ -427,9 +427,9 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
|
||||
}
|
||||
|
||||
//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;
|
||||
@ -711,9 +711,9 @@ namespace Nikse.SubtitleEdit.Core.Dictionaries
|
||||
var word = input;
|
||||
|
||||
//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;
|
||||
|
@ -1116,8 +1116,8 @@ namespace Nikse.SubtitleEdit.Forms.Ocr
|
||||
break;
|
||||
}
|
||||
|
||||
if (tl.Text.StartsWith("Spannish", StringComparison.OrdinalIgnoreCase) && (languageString.StartsWith("spannish", StringComparison.OrdinalIgnoreCase) || languageString.StartsWith("españo", StringComparison.OrdinalIgnoreCase)) ||
|
||||
tl.Text.StartsWith("Spannish", StringComparison.OrdinalIgnoreCase) && languageString.Equals("esp", StringComparison.OrdinalIgnoreCase))
|
||||
if (tl.Text.StartsWith("Spanish", StringComparison.OrdinalIgnoreCase) && (languageString.StartsWith("spanish", StringComparison.OrdinalIgnoreCase) || languageString.StartsWith("españo", StringComparison.OrdinalIgnoreCase)) ||
|
||||
tl.Text.StartsWith("Spanish", StringComparison.OrdinalIgnoreCase) && languageString.Equals("esp", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
comboBoxTesseractLanguages.SelectedIndex = i;
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user