Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-27 22:42:38 +01:00
Code Issues Projects Releases Wiki Activity

Updated version number to 3.3.11

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@2231 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2013-11-23 20:46:41 +00:00
parent ca95328dee
commit 3c9f2b66a2
31 changed files with 39 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Changelog.txt
View File

@ -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

2
src/Forms/AddWareForm.cs
View File

@ -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

2
src/Languages/bg-BG.xml
View File

@ -2,7 +2,7 @@
<Language Name="Bulgarian">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>Превод на български: Ivo Ivanov и JJD</TranslatedBy>
<CultureName>bg-BG</CultureName>
<HelpFile>Помощен файл</HelpFile>

2
src/Languages/ca-ES.xml
View File

@ -2,7 +2,7 @@
<Language Name="Catalan">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>Traduït per Juansa</TranslatedBy>
<CultureName>ca-ES</CultureName>
<HelpFile />

2
src/Languages/cs-CZ.xml
View File

@ -2,7 +2,7 @@
<Language Name="Čeština">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>Translated by Trottel</TranslatedBy>
<CultureName>cs-CZ</CultureName>
<HelpFile />

2
src/Languages/da-DK.xml
View File

@ -2,7 +2,7 @@
<Language Name="Dansk">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>Oversat til dansk af Nikse (mailto:nikse.dk@gmail.com)</TranslatedBy>
<CultureName>da-DK</CultureName>
<HelpFile>

2
src/Languages/de-DE.xml
View File

@ -2,7 +2,7 @@
<Language Name="Deutsch">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>Übersetzt von Christoph Kitsche. Überarbeitet von Nobody.</TranslatedBy>
<CultureName>de-DE</CultureName>
<HelpFile></HelpFile>

2
src/Languages/es-AR.xml
View File

@ -2,7 +2,7 @@
<Language Name="Español">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>Traducido por Marcelo1ar</TranslatedBy>
<CultureName>es-AR</CultureName>
<HelpFile>http://www.nikse.dk/SubtitleEdit/HelpEs</HelpFile>

2
src/Languages/es-MX.xml
View File

@ -2,7 +2,7 @@
<Language Name="Español">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>Traducido por Francisco Naranjo (paconaranjo)</TranslatedBy>
<CultureName>es-MX</CultureName>
<HelpFile>http://www.nikse.dk/SubtitleEdit/HelpEs</HelpFile>

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

@ -2,7 +2,7 @@
<Language Name="Euskara">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>Itzultzailea: Xabier Aramendi</TranslatedBy>
<CultureName>eu-ES</CultureName>
<HelpFile>http://www.nikse.dk/SubtitleEdit/HelpEU</HelpFile>

2
src/Languages/fi-FI.xml
View File

@ -2,7 +2,7 @@
<Language Name="Finnish">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>Kääntänyt vm</TranslatedBy>
<CultureName>fi-FI</CultureName>
<HelpFile>

2
src/Languages/fr-FR.xml
View File

@ -2,7 +2,7 @@
<Language Name="Français">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>Traduction française par JM GBT</TranslatedBy>
<CultureName>fr-FR</CultureName>
<HelpFile>

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

@ -2,7 +2,7 @@
<Language Name="Hrvatski">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>Prijevod: Jozo Marić</TranslatedBy>
<CultureName>hr-HR</CultureName>
<HelpFile></HelpFile>

2
src/Languages/hu-HU.xml
View File

@ -2,7 +2,7 @@
<Language Name="Hungarian">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>Fordító: ZityiSoft Team (http://szoftverforditasok.hu)</TranslatedBy>
<CultureName>hu-HU</CultureName>
<HelpFile/>

2
src/Languages/it-IT.xml
View File

@ -2,7 +2,7 @@
<Language Name="Italiano">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>Traduzione Italiana SilverDrake (giurdiATkatamailDOTcom)</TranslatedBy>
<CultureName>it-IT</CultureName>
<HelpFile />

2
src/Languages/ja-JP.xml
View File

@ -2,7 +2,7 @@
<Language Name="日本語">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>Nardog</TranslatedBy>
<CultureName>ja-JP</CultureName>
<HelpFile />

2
src/Languages/ko-KR.xml
View File

@ -2,7 +2,7 @@
<Language Name="한국어">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>한글: 도움돌 (domddol@gmail.com)</TranslatedBy>
<CultureName>ko-KR</CultureName>
<HelpFile></HelpFile>

2
src/Languages/nl-NL.xml
View File

@ -2,7 +2,7 @@
<Language Name="Nederlands">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>Vertaald door: Quetsbeek en minouhse</TranslatedBy>
<CultureName>nl-NL</CultureName>
<HelpFile></HelpFile>

2
src/Languages/pl-PL.xml
View File

@ -2,7 +2,7 @@
<Language Name="Polish">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>Tłumaczenie Adam Malich (mailto: adam_malich@gizycko.mm.pl)</TranslatedBy>
<CultureName>pl-PL</CultureName>
<HelpFile>http://www.potplayer.pl/storage/SubtitleEdit/Help/PL/</HelpFile>

2
src/Languages/pt-BR.xml
View File

@ -2,7 +2,7 @@
<Language Name="Brazilian Portuguese">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>Tradução (Português do Brasil): Igor Rückert</TranslatedBy>
<CultureName>pt-BR</CultureName>
<HelpFile>

2
src/Languages/pt-PT.xml
View File

@ -2,7 +2,7 @@
<Language Name="Portuguese - Portugal">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy> ------------------------------------------------------------------------------------------------
Traduzido sem o novo Acordo Ortográfico para Português de Portugal, por moob e Ricardo Perdigão
Contactos:

2
src/Languages/ro-RO.xml
View File

@ -2,7 +2,7 @@
<Language Name="Romana (fara diacritice)">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>Tradus de DrJackson</TranslatedBy>
<CultureName>ro-RO</CultureName>
<HelpFile>Ajutor</HelpFile>

2
src/Languages/ru-RU.xml
View File

@ -2,7 +2,7 @@
<Language Name="Russian">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>Перевод на русский: Leserg (mailto:leserg@ua.fm)</TranslatedBy>
<CultureName>ru-RU</CultureName>
<HelpFile>http://www.nikse.dk/Content/SubtitleEdit/Help/RU/</HelpFile>

2
src/Languages/sr-Latn-RS.xml
View File

@ -2,7 +2,7 @@
<Language Name="Srpski">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>Prevod: Misa Forger</TranslatedBy>
<CultureName>sr-Latn-RS</CultureName>
<HelpFile></HelpFile>

2
src/Languages/sv-SE.xml
View File

@ -2,7 +2,7 @@
<Language Name="Swedish">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>Översätt av Ted</TranslatedBy>
<CultureName>sv-SE</CultureName>
<HelpFile>

2
src/Languages/tr-TR.xml
View File

@ -2,7 +2,7 @@
<Language Name="Turkish">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>Çevirmen: mailto:shadowxvb@windowslive.com</TranslatedBy>
<CultureName>tr-TR</CultureName>
<HelpFile>

2
src/Languages/zh-CHS.xml
View File

@ -2,7 +2,7 @@
<Language Name="简体中文">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>翻译: FeiXJ | Leon Cheung</TranslatedBy>
<CultureName>zh-CHS</CultureName>
<HelpFile />

2
src/Languages/zh-tw.xml
View File

@ -2,7 +2,7 @@
<Language Name="繁體中文">
<General>
<Title>Subtitle Edit</Title>
<Version>3.3.10</Version>
<Version>3.3.11</Version>
<TranslatedBy>翻譯: BAWAN</TranslatedBy>
<CultureName>zh-CHT</CultureName>
<HelpFile>

141
src/Logic/SubtitleFormats/Nuendo.cs
View File

@ -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<string> 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<string> 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<string> GetStylesFromHeader(Subtitle subtitle)
{
var list = new List<string>();
foreach (Paragraph p in subtitle.Paragraphs)
{
if (!string.IsNullOrEmpty(p.Actor))
{
if (list.IndexOf(p.Actor) < 0)
list.Add(p.Actor);
}
}
return list;
}
}
}

2
src/Properties/AssemblyInfo.cs.in
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.3.10.$WCREV$")]
[assembly: AssemblyVersion("3.3.11.$WCREV$")]

2
src/Properties/AssemblyInfo.cs.template
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.3.10.0")]
[assembly: AssemblyVersion("3.3.11.0")]