Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-23 03:33:18 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into feature/cdg-make-video

Browse Source
This commit is contained in:
Nikolaj Olsson 2020-10-04 19:37:18 +02:00
commit 4353ba4a4c
7 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog.txt
View File

@ -26,6 +26,7 @@
* Add "Remove cues with style/actor" to "Batch Convert"
* Add hidden "Split removes dashes" option - thx OmrSi
* Add frame mode for "Bridge gaps between subtitles" - thx Jan
* Add some support for CDG Karaoke => Bluray sup - thx Peter
* IMPROVED:
* Update Bulgarian translation - thx KalinM
* Update Hungarian translation - thx Zityi
@ -33,6 +34,7 @@
* Update Korean translation - thx domddol
* Update Portugese translation - thx moob
* Update Greek translation - thx Lero91
* Update Russian translation - thx Elheym
* Update Polish spell check dictionary - thx borifax
* Improve support for transport stream in "cmd line convert"
* Improve support for transport stream in "Batch convert"
@ -82,6 +84,8 @@
* Fix image export issue with align+justify for box
* Fix transparent color in bdsup export - the thehulk
* Fix crash in spell check - thx FeMaster1
* Fix change tracking after translate - thx Sopor
* Fix bugs with export plain text settings - thx raidsan
3.5.16 (16th June 2020)

6
LanguageMaster.xml
View File

@ -565,12 +565,12 @@ Note: Do check free disk space.</WaveFileMalformed>
</ExtractDateTimeInfo>
<FindDialog>
<Title>Find</Title>
<Find>Find</Find>
<Find>&amp;Find</Find>
<Normal>&amp;Normal</Normal>
<CaseSensitive>&amp;Case sensitive</CaseSensitive>
<RegularExpression>Regular e&amp;xpression</RegularExpression>
<WholeWord>Whole word</WholeWord>
<Count>Count</Count>
<WholeWord>&amp;Whole word</WholeWord>
<Count>Coun&amp;t</Count>
<XNumberOfMatches>{0:#,##0} matches</XNumberOfMatches>
<OneMatch>One match</OneMatch>
</FindDialog>

6
libse/Language.cs
View File

@ -758,12 +758,12 @@ namespace Nikse.SubtitleEdit.Core
FindDialog = new LanguageStructure.FindDialog
{
Title = "Find",
Find = "Find",
Find = "&Find",
Normal = "&Normal",
CaseSensitive = "&Case sensitive",
RegularExpression = "Regular e&xpression",
WholeWord = "Whole word",
Count = "Count",
WholeWord = "&Whole word",
Count = "Coun&t",
XNumberOfMatches = "{0:#,##0} matches",
OneMatch = "One match"
};

9
src/Forms/ExportText.cs
View File

@ -13,7 +13,7 @@ namespace Nikse.SubtitleEdit.Forms
{
public bool ShowLineNumbers { get; set; }
public bool AddNewlineAfterLineNumber { get; set; }
public bool ShowTimecodes { get; set; }
public bool ShowTimeCodes { get; set; }
public bool TimeCodeSrt { get; set; }
public bool TimeCodeHHMMSSFF { get; set; }
public bool AddNewlineAfterTimeCodes { get; set; }
@ -102,8 +102,7 @@ namespace Nikse.SubtitleEdit.Forms
{
radioButtonTimeCodeHHMMSSFF.Checked = true;
}
if (Configuration.Settings.Tools.ExportTextTimeCodeFormat == "Milliseconds")
else if (Configuration.Settings.Tools.ExportTextTimeCodeFormat == "Milliseconds")
{
radioButtonTimeCodeMs.Checked = true;
}
@ -139,7 +138,7 @@ namespace Nikse.SubtitleEdit.Forms
{
ShowLineNumbers = checkBoxShowLineNumbers.Checked,
AddNewlineAfterLineNumber = checkBoxAddNewlineAfterLineNumber.Checked,
ShowTimecodes = checkBoxShowTimeCodes.Checked,
ShowTimeCodes = checkBoxShowTimeCodes.Checked,
TimeCodeSrt = radioButtonTimeCodeSrt.Checked,
TimeCodeHHMMSSFF = radioButtonTimeCodeHHMMSSFF.Checked,
AddNewlineAfterTimeCodes = checkBoxAddNewlineAfterTimeCodes.Checked,
@ -172,7 +171,7 @@ namespace Nikse.SubtitleEdit.Forms
sb.Append(' ');
}
}
if (exportOptions.ShowTimecodes)
if (exportOptions.ShowTimeCodes)
{
if (exportOptions.TimeCodeSrt)
{

10
src/Logic/CommandLineConvert/CommandLineConverter.cs
View File

@ -1359,11 +1359,11 @@ namespace Nikse.SubtitleEdit.Logic.CommandLineConvert
{
ShowLineNumbers = Configuration.Settings.Tools.ExportTextShowLineNumbers,
AddNewlineAfterLineNumber = Configuration.Settings.Tools.ExportTextShowLineNumbersNewLine,
ShowTimecodes = Configuration.Settings.Tools.ExportTextShowTimeCodes,
TimeCodeSrt = Configuration.Settings.Tools.ExportTextShowTimeCodesNewLine,
TimeCodeHHMMSSFF = false,
AddNewlineAfterTimeCodes = Configuration.Settings.Tools.ExportTextShowTimeCodes,
TimeCodeSeparator = string.Empty,
ShowTimeCodes = Configuration.Settings.Tools.ExportTextShowTimeCodes,
TimeCodeSrt = Configuration.Settings.Tools.ExportTextTimeCodeFormat == "Srt",
TimeCodeHHMMSSFF = Configuration.Settings.Tools.ExportTextTimeCodeFormat == "Frames",
AddNewlineAfterTimeCodes = Configuration.Settings.Tools.ExportTextShowTimeCodesNewLine,
TimeCodeSeparator = Configuration.Settings.Tools.ExportTextTimeCodeSeparator,
RemoveStyling = Configuration.Settings.Tools.ExportTextRemoveStyling,
FormatUnbreak = Configuration.Settings.Tools.ExportTextFormatText == "Unbreak",
AddNewAfterText = Configuration.Settings.Tools.ExportTextNewLineAfterText,

2
src/Resources/HunspellDictionaries.xml
View File

@ -218,7 +218,7 @@
<Dictionary>
<EnglishName>Malayalam</EnglishName>
<NativeName>Malayalam</NativeName>
<DownloadLink>https://ayera.dl.sourceforge.net/project/aoo-extensions/2741/3/ml_in_dict-1-1.oxt</DownloadLink>
<DownloadLink>https://master.dl.sourceforge.net/project/aoo-extensions/2741/3/ml_in_dict-1-1.oxt</DownloadLink>
<Description>Malayalam Spellchecker 1.1.0</Description>
</Dictionary>
<Dictionary>

BIN
src/Resources/HunspellDictionaries.xml.gz
View File

Binary file not shown.