diff --git a/Dictionaries/hrv_OCRFixReplaceList.xml b/Dictionaries/hrv_OCRFixReplaceList.xml
index c0b3d99dc..e9b01f9b3 100644
--- a/Dictionaries/hrv_OCRFixReplaceList.xml
+++ b/Dictionaries/hrv_OCRFixReplaceList.xml
@@ -1560,4 +1560,4 @@
-
+
\ No newline at end of file
diff --git a/libse/FileUtil.cs b/libse/FileUtil.cs
index 5acf276b0..9fb847ce9 100644
--- a/libse/FileUtil.cs
+++ b/libse/FileUtil.cs
@@ -37,7 +37,7 @@ namespace Nikse.SubtitleEdit.Core
}
return bytes;
}
- }
+ }
public static bool IsZip(string fileName)
{
diff --git a/libse/Properties/AssemblyInfo.cs.template b/libse/Properties/AssemblyInfo.cs.template
index bc352e96e..646010e1f 100644
--- a/libse/Properties/AssemblyInfo.cs.template
+++ b/libse/Properties/AssemblyInfo.cs.template
@@ -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)]
diff --git a/libse/RichTextToPlainText.cs b/libse/RichTextToPlainText.cs
index 419ddf8f8..2b3cf6519 100644
--- a/libse/RichTextToPlainText.cs
+++ b/libse/RichTextToPlainText.cs
@@ -93,7 +93,7 @@ namespace Nikse.SubtitleEdit.Core
{ "lquote", "\u2018" },
{ "rquote", "\u2019" },
{ "ldblquote", "\u201C" },
- { "rdblquote", "\u201D" },
+ { "rdblquote", "\u201D" },
};
///
@@ -263,4 +263,4 @@ namespace Nikse.SubtitleEdit.Core
}
-}
+}
\ No newline at end of file
diff --git a/libse/Settings.cs b/libse/Settings.cs
index 2daf0fb1b..75eefa108 100644
--- a/libse/Settings.cs
+++ b/libse/Settings.cs
@@ -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));
diff --git a/libse/StringExtensions.cs b/libse/StringExtensions.cs
index f5aed50ad..71fd2e305 100644
--- a/libse/StringExtensions.cs
+++ b/libse/StringExtensions.cs
@@ -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;
}
diff --git a/libse/SubtitleFormats/Ebu.cs b/libse/SubtitleFormats/Ebu.cs
index 62ae64291..ac2557d3a 100644
--- a/libse/SubtitleFormats/Ebu.cs
+++ b/libse/SubtitleFormats/Ebu.cs
@@ -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
diff --git a/libse/SubtitleFormats/TimedText10.cs b/libse/SubtitleFormats/TimedText10.cs
index 4ce6bf167..87af2b100 100644
--- a/libse/SubtitleFormats/TimedText10.cs
+++ b/libse/SubtitleFormats/TimedText10.cs
@@ -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;
}
diff --git a/libse/SubtitleFormats/UnknownSubtitle16.cs b/libse/SubtitleFormats/UnknownSubtitle16.cs
index 6dad7c6f0..faa0a13dc 100644
--- a/libse/SubtitleFormats/UnknownSubtitle16.cs
+++ b/libse/SubtitleFormats/UnknownSubtitle16.cs
@@ -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;
}
}
-}
+}
\ No newline at end of file
diff --git a/libse/Utilities.cs b/libse/Utilities.cs
index 08ad8563d..1cf80ba5a 100644
--- a/libse/Utilities.cs
+++ b/libse/Utilities.cs
@@ -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);
}
- }
+ }
}
}
\ No newline at end of file
diff --git a/src/Forms/EbuSaveOptions.cs b/src/Forms/EbuSaveOptions.cs
index 2d6208d68..151922d29 100644
--- a/src/Forms/EbuSaveOptions.cs
+++ b/src/Forms/EbuSaveOptions.cs
@@ -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);
}
}
diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs
index c102b1e38..31a4b1a6b 100644
--- a/src/Forms/Main.cs
+++ b/src/Forms/Main.cs
@@ -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;
- }
+ }
}
}
\ No newline at end of file
diff --git a/src/Forms/Settings.cs b/src/Forms/Settings.cs
index 0b3708986..31139673f 100644
--- a/src/Forms/Settings.cs
+++ b/src/Forms/Settings.cs
@@ -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;
diff --git a/src/Languages/eu-ES.xml b/src/Languages/eu-ES.xml
index 638bae7ac..1402a6835 100644
--- a/src/Languages/eu-ES.xml
+++ b/src/Languages/eu-ES.xml
@@ -110,12 +110,12 @@ Post@: mailto:nikse.dk@gmail.com
Argilitza sortzen...
Audioa ateratzen: {0:0.0} segundu
Audioa ateratzen: {0}.{1:00} minutu
- Ezin da ateratako uhin agiria aurkitu! Ezaugarri honek VLC multimedia irakurgailua 1.1.x edo berriagoa behar du ({0}-bit).
-
+ Ezin da ateratako uhin agiria aurkitu! Ezaugarri honek VLC multimedia irakurgailua 1.1.x edo berriagoa behar du ({0}-bit).
+
Agindu lerroa: {1} {2}
- {0}-k ezin ditu audio datuak atera uhin agirira!
-Agindu lerroa: {1} {2}
-
+ {0}-k ezin ditu audio datuak atera uhin agirira!
+Agindu lerroa: {1} {2}
+
Oharra: Egiaztatu diskako toki askea.
TOKI GUTXI DISKAN
{0} aske
diff --git a/src/Languages/hr-HR.xml b/src/Languages/hr-HR.xml
index 98b026d43..5e4ac0b9b 100644
--- a/src/Languages/hr-HR.xml
+++ b/src/Languages/hr-HR.xml
@@ -2101,4 +2101,4 @@ određeni podnaslov s drugim ljudima.
WebVTT - postavi novi glas
Naziv glasa
-
+
\ No newline at end of file
diff --git a/src/Properties/AssemblyInfo.cs.template b/src/Properties/AssemblyInfo.cs.template
index 8470ab494..766b06391 100644
--- a/src/Properties/AssemblyInfo.cs.template
+++ b/src/Properties/AssemblyInfo.cs.template
@@ -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("")]
diff --git a/src/UpdateLanguageFiles/Properties/AssemblyInfo.cs b/src/UpdateLanguageFiles/Properties/AssemblyInfo.cs
index 9fbda6226..43aa7fe77 100644
--- a/src/UpdateLanguageFiles/Properties/AssemblyInfo.cs
+++ b/src/UpdateLanguageFiles/Properties/AssemblyInfo.cs
@@ -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("")]