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

Merge branch 'SubtitleEdit:main' into master

Browse Source
This commit is contained in:
May Kittens Devour Your Soul 2023-11-25 12:35:08 +01:00 committed by GitHub
commit e467b80e22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Dictionaries/hrv_OCRFixReplaceList.xml
View File

@ -1741,9 +1741,6 @@
<Word from="prineo" to="prinio" />
<Word from="Prineo" to="Prinio" />
<Word from="pripovetke" to="pripovjetke" />
<Word from="pripoveda" to="pripovijeda" />
<Word from="pripovedala" to="pripovijedala" />
<Word from="pripovedanje" to="pripovijedanje" />
<Word from="privilegovan" to="privilegiran" />
<Word from="privilegovani" to="privilegirani" />
<Word from="prjevoz" to="prijevoz" />
@ -3897,7 +3894,15 @@
<LinePart from="Želi da zna" to="Želi znati" />
<LinePart from="želi da zna" to="želi znati" />
</PartialLines>
<BeginLines />
<BeginLines>
<Beginning from="-] " to="- I " />
<Beginning from="- ] " to="- I " />
<Beginning from="] " to="I " />
<Beginning from="-| " to="- I " />
<Beginning from="- | " to="- I " />
<Beginning from="l " to="I " />
<Beginning from="- l " to="- I " />
</BeginLines>
<EndLines />
<RegularExpressions>
<!-- deklinacije imenica i konjugacije glagola -->
@ -4470,6 +4475,7 @@
<RegEx find="\b([pP])rimet([aln])" replaceWith="$1rimjet$2" />
<RegEx find="([pP])rimj?et([ie])" replaceWith="$1rimijet$2" />
<RegEx find="\b([pP])rimj?eni([lošmt])" replaceWith="$1rimijeni$2" />
<RegEx find="([pP])ripovj?eda" replaceWith="$1ripovijeda" />
<RegEx find="([pP])(ri|od)sj?e[čć]a" replaceWith="$1$2sjeća" />
<RegEx find="\b([pP])rocen(?!t)" replaceWith="$1rocjen" />
<RegEx find="([pP])rose([kcč])" replaceWith="$1rosje$2" />

2
src/libse/Common/Utilities.cs
View File

@ -30,7 +30,7 @@ namespace Nikse.SubtitleEdit.Core.Common
private static readonly Regex RegexNumberSpacePeriod = new Regex(@"(\d) (\.)", RegexOptions.Compiled);
public static string[] VideoFileExtensions { get; } = { ".avi", ".mkv", ".wmv", ".mpg", ".mpeg", ".divx", ".mp4", ".asf", ".flv", ".mov", ".m4v", ".vob", ".ogv", ".webm", ".ts", ".tts", ".m2ts", ".mts", ".avs", ".mxf" };
public static string[] AudioFileExtensions { get; } = { ".mp3", ".wav", ".wma", ".ogg", ".mpa", ".m4a", ".ape", ".aiff", ".flac", ".aac", ".ac3", ".eac3", ".mka" };
public static string[] AudioFileExtensions { get; } = { ".mp3", ".wav", ".wma", ".ogg", ".mpa", ".m4a", ".ape", ".aiff", ".flac", ".aac", ".ac3", ".eac3", ".mka", ".opus" };
public static bool IsInteger(string s)
{

7
src/ui/Forms/AudioToText/WhisperDownload.cs
View File

@ -51,7 +51,12 @@ namespace Nikse.SubtitleEdit.Forms.AudioToText
private static readonly string[] Sha512HashesCppCuBlas =
{
"de5b6fe7487f4cdc5e883ef6825dd0ecfe3ce4f9c914b0e02ba19b89c138e47e76584ae221a75eb7aed1a96893d4764401e065e196e0455a2e72050209252780", // 1.5.0
"f5bbad24cb99333cb6d9ec95e6797dda9e36f834fc0d4cee84d839637a06b5564df09b49f5ca6c16b2cf681429155b1ceee808d411024da658fba52d503cebdf", // 1.5.0 second upload
};
private static readonly string[] OldSha512HashesCppCuBlas =
{
"de5b6fe7487f4cdc5e883ef6825dd0ecfe3ce4f9c914b0e02ba19b89c138e47e76584ae221a75eb7aed1a96893d4764401e065e196e0455a2e72050209252780", // 1.5.0 first upload
};
private const string DownloadUrlConstMe = "https://github.com/Const-me/Whisper/releases/download/1.12.0/cli.zip";

2
src/ui/Logic/CommandLineConvert/CommandLineConverter.cs
View File

@ -2290,7 +2290,7 @@ namespace Nikse.SubtitleEdit.Logic.CommandLineConvert
break;
case BatchAction.MergeShortLines:
var mergedShortLinesSub = MergeShortLinesUtils.MergeShortLinesInSubtitle(sub, Configuration.Settings.Tools.MergeShortLinesMaxGap, Configuration.Settings.General.SubtitleLineMaximumLength, Configuration.Settings.Tools.MergeShortLinesOnlyContinuous);
var mergedShortLinesSub = MergeShortLinesUtils.MergeShortLinesInSubtitle(sub, Configuration.Settings.Tools.MergeShortLinesMaxGap, Configuration.Settings.Tools.MergeShortLinesMaxChars, Configuration.Settings.Tools.MergeShortLinesOnlyContinuous);
if (mergedShortLinesSub.Paragraphs.Count != sub.Paragraphs.Count)
{
sub.Paragraphs.Clear();