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

Merge pull request #1419 from xylographe/xcorr

Browse Source 
Minor corrections + Automated upkeep
This commit is contained in:
Nikolaj Olsson 2015-11-26 23:00:50 +01:00
commit 7d3331c10c
17 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dictionaries/hrv_OCRFixReplaceList.xml
View File

@ -1560,4 +1560,4 @@
<!-- Skraćenice bez razmaka -->
<RegEx find="d\. o\.o\." replaceWith="d.o.o." />
</RegularExpressions>
</OCRFixReplaceList>
</OCRFixReplaceList>

2
libse/FileUtil.cs
View File

@ -37,7 +37,7 @@ namespace Nikse.SubtitleEdit.Core
}
return bytes;
}
}
}
public static bool IsZip(string fileName)
{

2
libse/Properties/AssemblyInfo.cs.template
View File

@ -6,7 +6,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Nikse")]
[assembly: AssemblyProduct("libse")]
[assembly: AssemblyCopyright("Copyright © 2015")]
[assembly: AssemblyCopyright("Copyright 2001-2015, Nikse")]
[assembly: AssemblyTrademark("Licensed under the GPL v3")]
[assembly: AssemblyCulture("")]
[assembly: ComVisible(false)]

4
libse/RichTextToPlainText.cs
View File

@ -93,7 +93,7 @@ namespace Nikse.SubtitleEdit.Core
{ "lquote", "\u2018" },
{ "rquote", "\u2019" },
{ "ldblquote", "\u201C" },
{ "rdblquote", "\u201D" },
{ "rdblquote", "\u201D" },
};
/// <summary>
@ -263,4 +263,4 @@ namespace Nikse.SubtitleEdit.Core
}
}
}

4
libse/Settings.cs
View File

@ -250,7 +250,7 @@ namespace Nikse.SubtitleEdit.Core
public int SsaMarginLeft { get; set; }
public int SsaMarginRight { get; set; }
public int SsaMarginTopBottom { get; set; }
public string DCinemaFontFile { get; set; }
public string DCinemaLoadFontResource { get; set; }
public int DCinemaFontSize { get; set; }
@ -2938,7 +2938,7 @@ namespace Nikse.SubtitleEdit.Core
textWriter.WriteElementString("SamiDisplayTwoClassesAsTwoSubtitles", settings.SubtitleSettings.SamiDisplayTwoClassesAsTwoSubtitles.ToString());
textWriter.WriteElementString("SamiFullHtmlEncode", settings.SubtitleSettings.SamiHtmlEncodeMode.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("TimedText10TimeCodeFormat", settings.SubtitleSettings.TimedText10TimeCodeFormat);
textWriter.WriteElementString("TimedText10ShowStyleAndLanguage", settings.SubtitleSettings.TimedText10ShowStyleAndLanguage.ToString());
textWriter.WriteElementString("TimedText10ShowStyleAndLanguage", settings.SubtitleSettings.TimedText10ShowStyleAndLanguage.ToString());
textWriter.WriteElementString("FcpFontSize", settings.SubtitleSettings.FcpFontSize.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("FcpFontName", settings.SubtitleSettings.FcpFontName);
textWriter.WriteElementString("CheetahCaptionAlwayWriteEndTime", settings.SubtitleSettings.CheetahCaptionAlwayWriteEndTime.ToString(CultureInfo.InvariantCulture));

4
libse/StringExtensions.cs
View File

@ -127,13 +127,13 @@ namespace Nikse.SubtitleEdit.Core
return -1;
}
public static int IndexOfAny(this string s, string[] words, StringComparison comparionType)
public static int IndexOfAny(this string s, string[] words, StringComparison comparisonType)
{
if (words == null || string.IsNullOrEmpty(s))
return -1;
for (int i = 0; i < words.Length; i++)
{
var idx = s.IndexOf(words[i], comparionType);
var idx = s.IndexOf(words[i], comparisonType);
if (idx >= 0)
return idx;
}

2
libse/SubtitleFormats/Ebu.cs
View File

@ -38,7 +38,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
{
public string CodePageNumber { get; set; } // 0..2
public string DiskFormatCode { get; set; } // 3..10
public double FrameRateFromSaveDialog { get; set; }
public double FrameRateFromSaveDialog { get; set; }
public string DisplayStandardCode { get; set; } // 11
public string CharacterCodeTableNumber { get; set; } // 12..13
public string LanguageCode { get; set; } // 14..15

2
libse/SubtitleFormats/TimedText10.cs
View File

@ -639,7 +639,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
private static bool IsFrames(string timeCode)
{
if (timeCode.Length == 12 && (timeCode[8] == '.' || timeCode[8] == ',')) // 00:00:08.292 or 00:00:08.292
if (timeCode.Length == 12 && (timeCode[8] == '.' || timeCode[8] == ',')) // 00:00:08.292 or 00:00:08,292
return false;
return true;
}

4
libse/SubtitleFormats/UnknownSubtitle16.cs
View File

@ -46,11 +46,11 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
var text = new StringBuilder();
foreach (string s in lines)
text.AppendLine(s);
var lines2 = text.ToString().FromRtf().SplitToLines().ToList();
var u52 = new UnknownSubtitle52();
u52.LoadSubtitle(subtitle, lines2, fileName);
_errorCount = u52.ErrorCount;
}
}
}
}

8
libse/Utilities.cs
View File

@ -908,7 +908,7 @@ namespace Nikse.SubtitleEdit.Core
return sb.ToString();
}
public static bool IsValidRegex(string testPattern)
{
if (string.IsNullOrEmpty(testPattern))
@ -1137,7 +1137,7 @@ namespace Nikse.SubtitleEdit.Core
{
return "aeiouyæøåéóáôèòæøåäöïɤəɛʊʉɨ";
}
}
}
public static int CountTagInText(string text, string tag)
{
@ -1240,7 +1240,7 @@ namespace Nikse.SubtitleEdit.Core
return Uri.UnescapeDataString(text);
}
public static string FixEnglishTextInRightToLeftLanguage(string text, string reverseChars)
{
@ -2197,7 +2197,7 @@ namespace Nikse.SubtitleEdit.Core
var hash = hasher.ComputeHash(bytes);
return Convert.ToBase64String(hash, 0, hash.Length);
}
}
}
}
}

14
src/Forms/EbuSaveOptions.cs
View File

@ -137,27 +137,27 @@ namespace Nikse.SubtitleEdit.Forms
if (header.DiskFormatCode == "STL30.01")
{
comboBoxDiscFormatCode.SelectedIndex = 4;
comboBoxFrameRate.Text = (30).ToString(CultureInfo.CurrentUICulture);
comboBoxFrameRate.Text = (30).ToString(CultureInfo.CurrentCulture);
}
else if (header.DiskFormatCode == "STL23.01")
{
comboBoxDiscFormatCode.SelectedIndex = 0;
comboBoxFrameRate.Text = (23.976).ToString(CultureInfo.CurrentUICulture);
comboBoxFrameRate.Text = (23.976).ToString(CultureInfo.CurrentCulture);
}
else if (header.DiskFormatCode == "STL24.01")
{
comboBoxDiscFormatCode.SelectedIndex = 1;
comboBoxFrameRate.Text = (24).ToString(CultureInfo.CurrentUICulture);
comboBoxFrameRate.Text = (24).ToString(CultureInfo.CurrentCulture);
}
else if (header.DiskFormatCode == "STL29.01")
{
comboBoxDiscFormatCode.SelectedIndex = 3;
comboBoxFrameRate.Text = (25).ToString(CultureInfo.CurrentUICulture);
comboBoxFrameRate.Text = (25).ToString(CultureInfo.CurrentCulture);
}
else
{
comboBoxDiscFormatCode.SelectedIndex = 2;
comboBoxFrameRate.Text = (25).ToString(CultureInfo.CurrentUICulture);
comboBoxFrameRate.Text = (25).ToString(CultureInfo.CurrentCulture);
}
if (header.FrameRateFromSaveDialog > 20 && header.FrameRateFromSaveDialog < 200)
@ -348,11 +348,11 @@ namespace Nikse.SubtitleEdit.Forms
{
if (comboBoxDiscFormatCode.SelectedIndex == 2)
{
comboBoxFrameRate.Text = (25).ToString(CultureInfo.CurrentUICulture);
comboBoxFrameRate.Text = (25).ToString(CultureInfo.CurrentCulture);
}
else if (comboBoxDiscFormatCode.SelectedIndex == 4)
{
comboBoxFrameRate.Text = (30).ToString(CultureInfo.CurrentUICulture);
comboBoxFrameRate.Text = (30).ToString(CultureInfo.CurrentCulture);
}
}

4
src/Forms/Main.cs
View File

@ -14801,7 +14801,7 @@ namespace Nikse.SubtitleEdit.Forms
private void translatepoweredByMicrosoftToolStripMenuItem_Click(object sender, EventArgs e)
{
TranslateViaGoogle(false, false);
}
}
private void AudioWaveform_Click(object sender, EventArgs e)
{
@ -19526,7 +19526,7 @@ namespace Nikse.SubtitleEdit.Forms
private void contextMenuStripWaveform_Closing(object sender, ToolStripDropDownClosingEventArgs e)
{
_lastWaveformMenuCloseTicks = DateTime.Now.Ticks;
}
}
}
}

10
src/Forms/Settings.cs
View File

@ -72,13 +72,13 @@ namespace Nikse.SubtitleEdit.Forms
checkBoxSpellCheck.Checked = gs.ShowToolbarSpellCheck;
checkBoxHelp.Checked = gs.ShowToolbarHelp;
comboBoxFrameRate.Items.Add((23.976).ToString(CultureInfo.CurrentUICulture));
comboBoxFrameRate.Items.Add((24.0).ToString(CultureInfo.CurrentUICulture));
comboBoxFrameRate.Items.Add((25.0).ToString(CultureInfo.CurrentUICulture));
comboBoxFrameRate.Items.Add((29.97).ToString(CultureInfo.CurrentUICulture));
comboBoxFrameRate.Items.Add((23.976).ToString(CultureInfo.CurrentCulture));
comboBoxFrameRate.Items.Add((24.0).ToString(CultureInfo.CurrentCulture));
comboBoxFrameRate.Items.Add((25.0).ToString(CultureInfo.CurrentCulture));
comboBoxFrameRate.Items.Add((29.97).ToString(CultureInfo.CurrentCulture));
checkBoxShowFrameRate.Checked = gs.ShowFrameRate;
comboBoxFrameRate.Text = gs.DefaultFrameRate.ToString(CultureInfo.CurrentUICulture);
comboBoxFrameRate.Text = gs.DefaultFrameRate.ToString(CultureInfo.CurrentCulture);
comboBoxEncoding.Items.Clear();
int encodingSelectedIndex = 0;

10
src/Languages/eu-ES.xml
View File

@ -110,12 +110,12 @@ Post@: mailto:nikse.dk@gmail.com</AboutText1>
<GeneratingSpectrogram>Argilitza sortzen...</GeneratingSpectrogram>
<ExtractingSeconds>Audioa ateratzen: {0:0.0} segundu</ExtractingSeconds>
<ExtractingMinutes>Audioa ateratzen: {0}.{1:00} minutu</ExtractingMinutes>
<WaveFileNotFound>Ezin da ateratako uhin agiria aurkitu! Ezaugarri honek VLC multimedia irakurgailua 1.1.x edo berriagoa behar du ({0}-bit).
<WaveFileNotFound>Ezin da ateratako uhin agiria aurkitu! Ezaugarri honek VLC multimedia irakurgailua 1.1.x edo berriagoa behar du ({0}-bit).
Agindu lerroa: {1} {2}</WaveFileNotFound>
<WaveFileMalformed>{0}-k ezin ditu audio datuak atera uhin agirira!
Agindu lerroa: {1} {2}
<WaveFileMalformed>{0}-k ezin ditu audio datuak atera uhin agirira!
Agindu lerroa: {1} {2}
Oharra: Egiaztatu diskako toki askea.</WaveFileMalformed>
<LowDiskSpace>TOKI GUTXI DISKAN</LowDiskSpace>
<FreeDiskSpace>{0} aske</FreeDiskSpace>

2
src/Languages/hr-HR.xml
View File

@ -2101,4 +2101,4 @@ određeni podnaslov s drugim ljudima.</Information>
<Title>WebVTT - postavi novi glas</Title>
<VoiceName>Naziv glasa</VoiceName>
</WebVttNewVoice>
</Language>
</Language>

2
src/Properties/AssemblyInfo.cs.template
View File

@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Nikse")]
[assembly: AssemblyProduct("SubtitleEdit")]
[assembly: AssemblyCopyright("Nikse")]
[assembly: AssemblyCopyright("Copyright 2001-2015, Nikse")]
[assembly: AssemblyTrademark("Licensed under the GPL v3")]
[assembly: AssemblyCulture("")]

4
src/UpdateLanguageFiles/Properties/AssemblyInfo.cs
View File

@ -4,11 +4,11 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("UpdateAssemblyDescription")]
[assembly: AssemblyTitle("UpdateLanguageFiles")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("UpdateAssemblyDescription")]
[assembly: AssemblyProduct("UpdateLanguageFiles")]
[assembly: AssemblyCopyright("Copyright © 2014")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]