From 3c9f2b66a22bed5571beb2554edac799739592f4 Mon Sep 17 00:00:00 2001 From: niksedk Date: Sat, 23 Nov 2013 20:46:41 +0000 Subject: [PATCH] Updated version number to 3.3.11 git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@2231 99eadd0c-20b8-1223-b5c4-2a2b2df33de2 --- src/Changelog.txt | 10 ++ src/Forms/AddWareForm.cs | 2 +- src/Languages/bg-BG.xml | 2 +- src/Languages/ca-ES.xml | 2 +- src/Languages/cs-CZ.xml | 2 +- src/Languages/da-DK.xml | 2 +- src/Languages/de-DE.xml | 2 +- src/Languages/es-AR.xml | 2 +- src/Languages/es-MX.xml | 2 +- src/Languages/eu-ES.xml | 2 +- src/Languages/fi-FI.xml | 2 +- src/Languages/fr-FR.xml | 2 +- src/Languages/hr-HR.xml | 2 +- src/Languages/hu-HU.xml | 2 +- src/Languages/it-IT.xml | 2 +- src/Languages/ja-JP.xml | 2 +- src/Languages/ko-KR.xml | 2 +- src/Languages/nl-NL.xml | 2 +- src/Languages/pl-PL.xml | 2 +- src/Languages/pt-BR.xml | 2 +- src/Languages/pt-PT.xml | 2 +- src/Languages/ro-RO.xml | 2 +- src/Languages/ru-RU.xml | 2 +- src/Languages/sr-Latn-RS.xml | 2 +- src/Languages/sv-SE.xml | 2 +- src/Languages/tr-TR.xml | 2 +- src/Languages/zh-CHS.xml | 2 +- src/Languages/zh-tw.xml | 2 +- src/Logic/SubtitleFormats/Nuendo.cs | 141 ------------------------ src/Properties/AssemblyInfo.cs.in | 2 +- src/Properties/AssemblyInfo.cs.template | 2 +- 31 files changed, 39 insertions(+), 170 deletions(-) delete mode 100644 src/Logic/SubtitleFormats/Nuendo.cs diff --git a/src/Changelog.txt b/src/Changelog.txt index 6b1658df4..fe47fbae5 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -1,5 +1,15 @@ Subtitle Edit Changelog + +3.3.11 (xx December 2013) +* NEW: +* IMPROVED: + * Updated Italian language file - thx SilverDrake + * Added file type .m4a to audio file types +* FIXED: + * Dragging line in wave form in frames mode keeps duration - thx Adrian + + 3.3.10 (22nd November 2013) * NEW: * Added new subtitle formats diff --git a/src/Forms/AddWareForm.cs b/src/Forms/AddWareForm.cs index ba3fe3326..65cdb64ef 100644 --- a/src/Forms/AddWareForm.cs +++ b/src/Forms/AddWareForm.cs @@ -94,7 +94,7 @@ namespace Nikse.SubtitleEdit.Forms labelInfo.Text = "VCL"; if (Configuration.Settings.General.UseFFMPEGForWaveExtraction && File.Exists(Configuration.Settings.General.FFMPEGLocation)) { - string FFMPEGWaveTranscodeSettings = "-i \"{0}\" -vn -ar 44100 -ac 2 -ab 128 -vol 448 -f wav \"{1}\""; // -vol 512 will boot volume... 256 is normal + string FFMPEGWaveTranscodeSettings = "-i \"{0}\" -vn -ar 44100 -ac 2 -ab 128 -vol 448 -f wav \"{1}\""; // -vol 448 will boot volume... 256 is normal exeFilePath = Configuration.Settings.General.FFMPEGLocation; parameters = string.Format(FFMPEGWaveTranscodeSettings, SourceVideoFileName, targetFile); //-i indicates the input diff --git a/src/Languages/bg-BG.xml b/src/Languages/bg-BG.xml index 3261ac21f..9f757f1df 100644 --- a/src/Languages/bg-BG.xml +++ b/src/Languages/bg-BG.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 Превод на български: Ivo Ivanov и JJD bg-BG Помощен файл diff --git a/src/Languages/ca-ES.xml b/src/Languages/ca-ES.xml index 663d50203..baeb54ece 100644 --- a/src/Languages/ca-ES.xml +++ b/src/Languages/ca-ES.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 Traduït per Juansa ca-ES diff --git a/src/Languages/cs-CZ.xml b/src/Languages/cs-CZ.xml index 992e174bd..272aed3b5 100644 --- a/src/Languages/cs-CZ.xml +++ b/src/Languages/cs-CZ.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 Translated by Trottel cs-CZ diff --git a/src/Languages/da-DK.xml b/src/Languages/da-DK.xml index 4caeff688..6d029885b 100644 --- a/src/Languages/da-DK.xml +++ b/src/Languages/da-DK.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 Oversat til dansk af Nikse (mailto:nikse.dk@gmail.com) da-DK diff --git a/src/Languages/de-DE.xml b/src/Languages/de-DE.xml index 2176764c8..e2ee60935 100644 --- a/src/Languages/de-DE.xml +++ b/src/Languages/de-DE.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 Übersetzt von Christoph Kitsche. Überarbeitet von Nobody. de-DE diff --git a/src/Languages/es-AR.xml b/src/Languages/es-AR.xml index bb3c7936d..d33a351b2 100644 --- a/src/Languages/es-AR.xml +++ b/src/Languages/es-AR.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 Traducido por Marcelo1ar es-AR http://www.nikse.dk/SubtitleEdit/HelpEs diff --git a/src/Languages/es-MX.xml b/src/Languages/es-MX.xml index 9ca21b69f..bac1d81d6 100644 --- a/src/Languages/es-MX.xml +++ b/src/Languages/es-MX.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 Traducido por Francisco Naranjo (paconaranjo) es-MX http://www.nikse.dk/SubtitleEdit/HelpEs diff --git a/src/Languages/eu-ES.xml b/src/Languages/eu-ES.xml index e1861c172..8d6e38d0f 100644 --- a/src/Languages/eu-ES.xml +++ b/src/Languages/eu-ES.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 Itzultzailea: Xabier Aramendi eu-ES http://www.nikse.dk/SubtitleEdit/HelpEU diff --git a/src/Languages/fi-FI.xml b/src/Languages/fi-FI.xml index 1baef80d1..7e07ff50e 100644 --- a/src/Languages/fi-FI.xml +++ b/src/Languages/fi-FI.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 Kääntänyt vm fi-FI diff --git a/src/Languages/fr-FR.xml b/src/Languages/fr-FR.xml index 6969cb490..d7a06cb61 100644 --- a/src/Languages/fr-FR.xml +++ b/src/Languages/fr-FR.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 Traduction française par JM GBT fr-FR diff --git a/src/Languages/hr-HR.xml b/src/Languages/hr-HR.xml index 310c5b817..96f3d9f24 100644 --- a/src/Languages/hr-HR.xml +++ b/src/Languages/hr-HR.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 Prijevod: Jozo Marić hr-HR diff --git a/src/Languages/hu-HU.xml b/src/Languages/hu-HU.xml index 0756914f2..c4e81ebc3 100644 --- a/src/Languages/hu-HU.xml +++ b/src/Languages/hu-HU.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 Fordító: ZityiSoft Team (http://szoftverforditasok.hu) hu-HU diff --git a/src/Languages/it-IT.xml b/src/Languages/it-IT.xml index c999675bc..0d61176ff 100644 --- a/src/Languages/it-IT.xml +++ b/src/Languages/it-IT.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 Traduzione Italiana SilverDrake (giurdiATkatamailDOTcom) it-IT diff --git a/src/Languages/ja-JP.xml b/src/Languages/ja-JP.xml index 524c89410..0f273909f 100644 --- a/src/Languages/ja-JP.xml +++ b/src/Languages/ja-JP.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 Nardog ja-JP diff --git a/src/Languages/ko-KR.xml b/src/Languages/ko-KR.xml index d17201eff..e0e47037f 100644 --- a/src/Languages/ko-KR.xml +++ b/src/Languages/ko-KR.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 한글: 도움돌 (domddol@gmail.com) ko-KR diff --git a/src/Languages/nl-NL.xml b/src/Languages/nl-NL.xml index da9faef30..12eacab92 100644 --- a/src/Languages/nl-NL.xml +++ b/src/Languages/nl-NL.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 Vertaald door: Quetsbeek en minouhse nl-NL diff --git a/src/Languages/pl-PL.xml b/src/Languages/pl-PL.xml index 3aeb10cf6..dd9b8247e 100644 --- a/src/Languages/pl-PL.xml +++ b/src/Languages/pl-PL.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 Tłumaczenie Adam Malich (mailto: adam_malich@gizycko.mm.pl) pl-PL http://www.potplayer.pl/storage/SubtitleEdit/Help/PL/ diff --git a/src/Languages/pt-BR.xml b/src/Languages/pt-BR.xml index 1c04c5d47..7c10c1f48 100644 --- a/src/Languages/pt-BR.xml +++ b/src/Languages/pt-BR.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 Tradução (Português do Brasil): Igor Rückert pt-BR diff --git a/src/Languages/pt-PT.xml b/src/Languages/pt-PT.xml index fceac1576..ff764e880 100644 --- a/src/Languages/pt-PT.xml +++ b/src/Languages/pt-PT.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 ------------------------------------------------------------------------------------------------ Traduzido sem o novo Acordo Ortográfico para Português de Portugal, por moob e Ricardo Perdigão Contactos: diff --git a/src/Languages/ro-RO.xml b/src/Languages/ro-RO.xml index 281e03443..8474ac6ad 100644 --- a/src/Languages/ro-RO.xml +++ b/src/Languages/ro-RO.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 Tradus de DrJackson ro-RO Ajutor diff --git a/src/Languages/ru-RU.xml b/src/Languages/ru-RU.xml index 9b9b44b7d..10f28d85d 100644 --- a/src/Languages/ru-RU.xml +++ b/src/Languages/ru-RU.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 Перевод на русский: Leserg (mailto:leserg@ua.fm) ru-RU http://www.nikse.dk/Content/SubtitleEdit/Help/RU/ diff --git a/src/Languages/sr-Latn-RS.xml b/src/Languages/sr-Latn-RS.xml index eeb13a7be..1faa97717 100644 --- a/src/Languages/sr-Latn-RS.xml +++ b/src/Languages/sr-Latn-RS.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 Prevod: Misa Forger sr-Latn-RS diff --git a/src/Languages/sv-SE.xml b/src/Languages/sv-SE.xml index 07f2f9834..6fe8e4d71 100644 --- a/src/Languages/sv-SE.xml +++ b/src/Languages/sv-SE.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 Översätt av Ted sv-SE diff --git a/src/Languages/tr-TR.xml b/src/Languages/tr-TR.xml index 4a27ca064..b5c9a38b3 100644 --- a/src/Languages/tr-TR.xml +++ b/src/Languages/tr-TR.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 Çevirmen: mailto:shadowxvb@windowslive.com tr-TR diff --git a/src/Languages/zh-CHS.xml b/src/Languages/zh-CHS.xml index f4237465c..4445a12c9 100644 --- a/src/Languages/zh-CHS.xml +++ b/src/Languages/zh-CHS.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 翻译: FeiXJ | Leon Cheung zh-CHS diff --git a/src/Languages/zh-tw.xml b/src/Languages/zh-tw.xml index ca1a98b8a..7b8118061 100644 --- a/src/Languages/zh-tw.xml +++ b/src/Languages/zh-tw.xml @@ -2,7 +2,7 @@ Subtitle Edit - 3.3.10 + 3.3.11 翻譯: BAWAN zh-CHT diff --git a/src/Logic/SubtitleFormats/Nuendo.cs b/src/Logic/SubtitleFormats/Nuendo.cs deleted file mode 100644 index a0b2dc45e..000000000 --- a/src/Logic/SubtitleFormats/Nuendo.cs +++ /dev/null @@ -1,141 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using System.Text.RegularExpressions; - -namespace Nikse.SubtitleEdit.Logic.SubtitleFormats -{ - public class Nuendo : SubtitleFormat - { - private const string Seperator = ";"; - private const string NewLineSeperator = " "; - static readonly Regex CsvLine = new Regex(@"^\""[^""]*\""" + Seperator + @"\d\d:\d\d:\d\d:\d\d" + Seperator + @"\d\d:\d\d:\d\d:\d\d" + Seperator + @"[^;]*" + Seperator + @"[^;]*" + Seperator + @"[^;]*" + Seperator + @"\"".*\""$", RegexOptions.Compiled); - static readonly Regex CsvLineEmpty = new Regex(@"^\""[^""]*\""" + Seperator + @"\d\d:\d\d:\d\d:\d\d" + Seperator + @"\d\d:\d\d:\d\d:\d\d" + Seperator + @"[^;]*" + Seperator + @"[^;]*" + Seperator + @"[^;]*" + Seperator + "$", RegexOptions.Compiled); - - public override string Extension - { - get { return ".csv"; } - } - - public override string Name - { - get { return "Nuendo"; } - } - - public override bool IsTimeBased - { - get { return true; } - } - - public override bool IsMine(List lines, string fileName) - { - int fine = 0; - int failed = 0; - foreach (string line in lines) - { - if (CsvLine.IsMatch(line) || CsvLineEmpty.IsMatch(line)) - fine++; - else - failed++; - - } - return fine > failed; - } - - public override string ToText(Subtitle subtitle, string title) - { - const string format = "\"{1}\"{0}{2}{0}{3}{0}{4}{0}{5}{0}\"{6}\"{0}\"{7}\""; - var sb = new StringBuilder(); - - sb.AppendLine(string.Format(format, Seperator, "Track name", "\"Timecode In\"", "\"Timecode Out\"", "\"Description\"", "\"Length\"", "Character", "Dialogue")); - foreach (Paragraph p in subtitle.Paragraphs) - { - string actor = string.Empty; - if (p.Actor != null) - actor = p.Actor; - sb.AppendLine(string.Format(format, Seperator, title, EncodeTime(p.StartTime), EncodeTime(p.EndTime), "", "1", actor, p.Text.Replace(Environment.NewLine, NewLineSeperator).Trim())); - } - return sb.ToString().Trim(); - } - - private string EncodeTime(TimeCode timeCode) - { - return timeCode.ToHHMMSSFF(); - } - - public override void LoadSubtitle(Subtitle subtitle, List lines, string fileName) - { - _errorCount = 0; - - foreach (string line in lines) - { - if (CsvLine.IsMatch(line) || CsvLineEmpty.IsMatch(line)) - { - string[] parts = line.Split(Seperator.ToCharArray(), StringSplitOptions.RemoveEmptyEntries); - if (parts.Length == 6) - try - { - TimeCode start = DecodeTime(Utilities.FixQuotes(parts[1])); - TimeCode end = DecodeTime(Utilities.FixQuotes(parts[2])); - string text = Utilities.FixQuotes(parts[5]); - if (text.Contains(NewLineSeperator)) - text = text.Replace(NewLineSeperator, Environment.NewLine); - else - text = Utilities.AutoBreakLine(text); - text = text.Replace(Environment.NewLine + Environment.NewLine, Environment.NewLine); - text = text.Replace(Environment.NewLine + Environment.NewLine, Environment.NewLine); - text = text.Replace(Environment.NewLine + Environment.NewLine, Environment.NewLine); - var p = new Paragraph(start, end, text); - string actor = Utilities.FixQuotes(parts[4]); - if (actor.Trim().Length > 0) - p.Actor = actor; - p.Extra = p.Actor; - - subtitle.Paragraphs.Add(p); - } - catch - { - _errorCount++; - } - } - else - { - _errorCount++; - } - } - subtitle.Renumber(1); - } - - private TimeCode DecodeTime(string part) - { - //00:00:07:12 - var parts = part.Split(":;.".ToCharArray(), StringSplitOptions.RemoveEmptyEntries); - string hour = parts[0]; - string minutes = parts[1]; - string seconds = parts[2]; - string frames = parts[3]; - - return new TimeCode(int.Parse(hour), int.Parse(minutes), int.Parse(seconds), FramesToMillisecondsMax999(int.Parse(frames))); - } - - public override bool HasStyleSupport - { - get { return true; } - } - - public static List GetStylesFromHeader(Subtitle subtitle) - { - var list = new List(); - foreach (Paragraph p in subtitle.Paragraphs) - { - if (!string.IsNullOrEmpty(p.Actor)) - { - if (list.IndexOf(p.Actor) < 0) - list.Add(p.Actor); - } - } - return list; - } - - } -} diff --git a/src/Properties/AssemblyInfo.cs.in b/src/Properties/AssemblyInfo.cs.in index 26f0a4624..0c28e4402 100644 --- a/src/Properties/AssemblyInfo.cs.in +++ b/src/Properties/AssemblyInfo.cs.in @@ -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.3.10.$WCREV$")] +[assembly: AssemblyVersion("3.3.11.$WCREV$")] diff --git a/src/Properties/AssemblyInfo.cs.template b/src/Properties/AssemblyInfo.cs.template index dd49d73d8..30fbe9d7a 100644 --- a/src/Properties/AssemblyInfo.cs.template +++ b/src/Properties/AssemblyInfo.cs.template @@ -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.3.10.0")] +[assembly: AssemblyVersion("3.3.11.0")]