Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2025-01-31 21:11:39 +01:00
Code Issues Projects Releases Wiki Activity

Formatting (whitespace only)

Browse Source
This commit is contained in:
Waldi Ravens 2015-09-01 00:50:24 +02:00
parent 3af13be054
commit f9e9bf3804
9 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libse/LanguageStructure.cs
View File

@ -1053,7 +1053,7 @@
public string BeforeMergeLinesWithSameText { get; set; }
public string ImportTimeCodesDifferentNumberOfLinesWarning { get; set; }
public string ParsingTransportStream { get; set; }
public string XPercentCompleted { get; set; }
public string XPercentCompleted { get; set; }
public string ErrorLoadIdx { get; set; }
public string ErrorLoadRar { get; set; }
public string ErrorLoadZip { get; set; }

6
libse/SubtitleFormats/Cavena890.cs
View File

@ -235,7 +235,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
{
_languageIdLine1 = LanguageIdDanish;
_languageIdLine2 = LanguageIdDanish;
}
}
// prompt???
//if (Configuration.Settings.SubtitleSettings.CurrentCavena890LanguageIdLine1 >= 0)
@ -707,7 +707,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
if (_languageIdLine1 == LanguageIdHebrew || fontNameLine1 == "HEBNOA" || fontNameLine2 == "HEBNOA")
{
_languageIdLine1 = LanguageIdHebrew;
_languageIdLine2 = LanguageIdHebrew;
_languageIdLine2 = LanguageIdHebrew;
}
// Russian
@ -727,7 +727,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
else if (_languageIdLine1 == LanguageIdChineseTraditional || fontNameLine1 == "CCKM44" || fontNameLine2 == "CCKM44")
{
_languageIdLine1 = LanguageIdChineseTraditional;
_languageIdLine2 = LanguageIdChineseTraditional;
_languageIdLine2 = LanguageIdChineseTraditional;
}

3
libse/SubtitleFormats/NciTimedRollUpCaptions.cs
View File

@ -73,7 +73,6 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
public override void LoadSubtitle(Subtitle subtitle, List<string> lines, string fileName)
{
var paragraph = new Paragraph();
var expecting = ExpectingLine.TimeCodes;
_errorCount = 0;
@ -162,4 +161,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

4
libse/SubtitleFormats/Pac.cs
View File

@ -1139,7 +1139,7 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
else
{
sb.Append(Encoding.GetEncoding(950).GetString(buffer, index, 2));
sb.Append(Encoding.GetEncoding(950).GetString(buffer, index, 2));
}
}
index++;
@ -1793,4 +1793,4 @@ namespace Nikse.SubtitleEdit.Core.SubtitleFormats
}
}
}
}

2
libse/Utilities.cs
View File

@ -179,7 +179,7 @@ namespace Nikse.SubtitleEdit.Core
return string.Format("{0:0.0} gb", (float)fileSize / (1024 * 1024 * 1024));
}
/// <summary>
/// Downloads the requested resource as a <see cref="String"/> using the configured <see cref="WebProxy"/>.

4
src/Forms/ExportPngXml.cs
View File

@ -118,7 +118,7 @@ namespace Nikse.SubtitleEdit.Forms
return d;
return 25;
}
}
}
private int MillisecondsToFramesMaxFrameRate(double milliseconds)
{
@ -4065,4 +4065,4 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
}
}
}
}

2
src/Forms/Main.cs
View File

@ -32,7 +32,6 @@ namespace Nikse.SubtitleEdit.Forms
private class ComboBoxZoomItem
{
public string Text { get; set; }
public double ZoomFactor { get; set; }
@ -40,7 +39,6 @@ namespace Nikse.SubtitleEdit.Forms
{
return Text;
}
}
private const int TabControlListView = 0;

6
src/Logic/UiEbuSaveHelper.cs
View File

@ -18,7 +18,7 @@ namespace Nikse.SubtitleEdit.Logic
_header = header;
_justificationCode = justificationCode;
_fileName = fileName;
_subtitle = subtitle;
_subtitle = subtitle;
}
public bool ShowDialogOk()
@ -32,9 +32,9 @@ namespace Nikse.SubtitleEdit.Logic
public byte JustificationCode
{
get { return _justificationCode; }
get { return _justificationCode; }
set { _justificationCode = value; }
}
}
}
}

2
src/UpdateAssemblyInfo/Program.cs
View File

@ -172,7 +172,7 @@ namespace UpdateAssemblyInfo
}
else
{
Console.WriteLine("updating version number to " + newVersionInfo.Version + " " + newVersionInfo.RevisionGuid);
Console.WriteLine("updating version number to " + newVersionInfo.Version + " " + newVersionInfo.RevisionGuid);
}
UpdateAssemblyInfo(seTemplateFileName, newVersionInfo);
UpdateAssemblyInfo(libSeTmplateFileName, newVersionInfo);