git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1078 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2012-03-29 12:54:09 +00:00
parent abffe03960
commit a626dceb94
4 changed files with 4 additions and 5 deletions

View File

@ -1,6 +1,6 @@
Subtitle Edit Changelog
3.2.6 (soon)
3.2.6 (29th March 2012)
* NEW:
* Added new subtitle formats - now 100 formats supported
* IMPROVED:

View File

@ -365,11 +365,10 @@ namespace Nikse.SubtitleEdit.Logic
UndockedVideoPosition = "-32000;-32000";
UndockedWaveformPosition = "-32000;-32000";
UndockedVideoControlsPosition = "-32000;-32000";
SmallDelayMilliseconds = 500;
LargeDelayMilliseconds = 5000;
OpenSubtitleExtraExtensions = "*.mp4;*.m4v;*.mkv;"; // matroska/mp4/m4v files (can contain subtitles)
ListViewColumsRememberSize = true;
}
}

View File

@ -1858,7 +1858,7 @@ namespace Nikse.SubtitleEdit.Logic
var sb = new StringBuilder();
if (uppercase)
sb.Append(Configuration.Settings.General.UppercaseLetters);
sb.Append(Configuration.Settings.General.UppercaseLetters.ToUpper());
if (lowercase)
sb.Append(Configuration.Settings.General.UppercaseLetters.ToLower());

View File

@ -31,4 +31,4 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("3.2.5.*")]
[assembly: AssemblyVersion("3.2.6.*")]