Skip to content

Commit

Permalink
SE 3.4.6
Browse files Browse the repository at this point in the history
  • Loading branch information
niksedk committed Mar 29, 2015
1 parent 9cb6216 commit 20fcea2
Show file tree
Hide file tree
Showing 35 changed files with 61 additions and 34 deletions.
3 changes: 2 additions & 1 deletion Changelog.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Subtitle Edit Changelog

3.4.6 (xth March 2015) BETA
3.4.6 (29th March 2015) BETA
* NEW:
* Added new subtitle formats (Sami YouTube and more)
* Added waveform text size/bold to UI
Expand Down Expand Up @@ -47,6 +47,7 @@
* Fixed bug in mplayer2 subtitle format - thx Maciek
* Fixed bug preventing compare from working in "History" window - thx xylographe
* Fix for Advanced Substation Alpha loading - thx Vic
* Fix for unwanted play/pause by click in list view after hiding VLC - thx Ivandrofly
* + Many minor fixes from Ivandrofly and xylographe


Expand Down
2 changes: 1 addition & 1 deletion LanguageMaster.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="English">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Translated by Nikse</TranslatedBy>
<CultureName>en-US</CultureName>
<HelpFile />
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/bg-BG.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Bulgarian">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Превод на български: Ivo Ivanov и JJD</TranslatedBy>
<CultureName>bg-BG</CultureName>
<HelpFile />
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/ca-ES.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Catalan">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Traduït per Juansa</TranslatedBy>
<CultureName>ca-ES</CultureName>
<HelpFile />
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/cs-CZ.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Čeština">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Překlad do češtiny: Trottel</TranslatedBy>
<CultureName>cs-CZ</CultureName>
<HelpFile />
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/da-DK.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Dansk">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Oversat til dansk af Nikse (mailto:[email protected])</TranslatedBy>
<CultureName>da-DK</CultureName>
<HelpFile />
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/de-DE.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Deutsch">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Übersetzt von Christoph Kitsche. Überarbeitet von Nobody.</TranslatedBy>
<CultureName>de-DE</CultureName>
<HelpFile />
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/el-GR.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Greek">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Μετάφραση από: CrazyRabbit - Κλεάνθης Μανωλόπουλος
Σχόλια για τη μετάφραση στο: mailto:[email protected]</TranslatedBy>
<CultureName>el-GR</CultureName>
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/es-AR.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Español">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Traducido por Marcelo1ar, correcciones por walterh78</TranslatedBy>
<CultureName>es-AR</CultureName>
<HelpFile>http://www.nikse.dk/SubtitleEdit/HelpEs</HelpFile>
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/es-MX.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Español">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Traducido por Francisco Naranjo (paconaranjo)</TranslatedBy>
<CultureName>es-MX</CultureName>
<HelpFile>http://www.nikse.dk/SubtitleEdit/HelpEs</HelpFile>
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/eu-ES.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Euskara">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Itzultzailea: Xabier Aramendi</TranslatedBy>
<CultureName>eu-ES</CultureName>
<HelpFile>http://www.nikse.dk/SubtitleEdit/HelpEU</HelpFile>
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/fi-FI.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Finnish">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Suomentanut vm, päivittänyt Teijo S. [27-06-2014]</TranslatedBy>
<CultureName>fi-FI</CultureName>
<HelpFile />
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/fr-FR.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Français">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Traduction française par JM GBT</TranslatedBy>
<CultureName>fr-FR</CultureName>
<HelpFile />
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/hr-HR.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Hrvatski">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Prijevod: Jozo Marić</TranslatedBy>
<CultureName>hr-HR</CultureName>
<HelpFile />
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/hu-HU.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Hungarian">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Fordító: ZityiSoft Team (http://szoftverforditasok.hu)</TranslatedBy>
<CultureName>hu-HU</CultureName>
<HelpFile />
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/it-IT.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Italiano">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Traduzione Italiana SilverDrake ([email protected])</TranslatedBy>
<CultureName>it-IT</CultureName>
<HelpFile />
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/ja-JP.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="日本語">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Nardog</TranslatedBy>
<CultureName>ja-JP</CultureName>
<HelpFile />
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/ko-KR.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="한국어">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>☞ 한글화: 도움돌 ([email protected])</TranslatedBy>
<CultureName>ko-KR</CultureName>
<HelpFile />
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/nl-NL.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Nederlands">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Vertaald door Quetsbeek en minouhse 11082014</TranslatedBy>
<CultureName>nl-NL</CultureName>
<HelpFile />
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/pl-PL.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Polish">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Tłumaczenie Adam Malich (mailto: [email protected])</TranslatedBy>
<CultureName>pl-PL</CultureName>
<HelpFile>http://potplayer.pl/ccount/click.php?id=10</HelpFile>
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/pt-BR.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Brazilian Portuguese">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Tradução (Português do Brasil): Igor Rückert</TranslatedBy>
<CultureName>pt-BR</CultureName>
<HelpFile />
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/pt-PT.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Portuguese - Portugal">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>------------------------------------------------------------------------------------------------
Traduzido para Português de Portugal, por moob
Email: mailto:[email protected]</TranslatedBy>
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/ro-RO.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Română">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Tradus de Mircea Voiculescu</TranslatedBy>
<CultureName>ro-RO</CultureName>
<HelpFile />
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/ru-RU.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Russian">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Перевод на русский: Leserg (mailto:[email protected])</TranslatedBy>
<CultureName>ru-RU</CultureName>
<HelpFile>http://www.nikse.dk/Content/SubtitleEdit/Help/RU/</HelpFile>
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/sl-SI.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Slovenian">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Prevedel: Hawk</TranslatedBy>
<CultureName>sl-SI</CultureName>
<HelpFile />
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/sr-Latn-RS.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Srpski">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Prevod: Misa Forger</TranslatedBy>
<CultureName>sr-Latn-RS</CultureName>
<HelpFile />
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/sv-SE.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Swedish">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Översätt av Ted</TranslatedBy>
<CultureName>sv-Subtitle Edit</CultureName>
<HelpFile />
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/th-TH.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="ไทย">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>ภาษาไทยโดย Bonfelder</TranslatedBy>
<CultureName>th-TH</CultureName>
<HelpFile />
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/tr-TR.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Turkish">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Çevirmen: mailto:[email protected]</TranslatedBy>
<CultureName>tr-TR</CultureName>
<HelpFile />
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/vi-VN.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="Viet Nam">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>Dịch qua Tiếng Việt bởi by everytime
Mọi góp ý về bản dịch vui lòng gửi thư tới hộp thư: [email protected]
Cảm ơn rất nhiều</TranslatedBy>
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/zh-CHS.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="简体中文">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>翻译: FeiXJ | Leon Cheung | larsenlouis</TranslatedBy>
<CultureName>zh-CHS</CultureName>
<HelpFile />
Expand Down
2 changes: 1 addition & 1 deletion src/Languages/zh-tw.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Language Name="繁體中文">
<General>
<Title>Subtitle Edit</Title>
<Version>3.4.5</Version>
<Version>3.4.6</Version>
<TranslatedBy>翻譯: BAWAN【增補:風逸蘭】</TranslatedBy>
<CultureName>zh-TW</CultureName>
<HelpFile />
Expand Down
2 changes: 1 addition & 1 deletion src/Logic/Forms/RemoveTextForHI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public string RemoveColon(string text)
// House 7x01 line 52: and she would like you to do three things:
// Okay or remove???
var noTagText = HtmlUtil.RemoveHtmlTags(text);
if (noTagText.IndexOf(':') > 0 && noTagText.IndexOf(':') == noTagText.Length - 1 && noTagText != noTagText.ToUpper())
if (noTagText.IndexOf(':') > 0 && noTagText.IndexOf(':') == noTagText.Length - 1 && noTagText != noTagText.ToUpper() && noTagText.Length > 10)
return text;

string newText = string.Empty;
Expand Down
2 changes: 1 addition & 1 deletion src/Properties/AssemblyInfo.cs.template
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ 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.4.5.[REVNO]")]
[assembly: AssemblyVersion("3.4.6.[REVNO]")]

// Make the internal types available in our testing assembly.
[assembly: InternalsVisibleTo("Test")]
26 changes: 26 additions & 0 deletions src/Test/RemoveTextForHearImpairedTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1125,6 +1125,32 @@ public void RemoveTextRememberDialogueTag()
Assert.AreEqual(expected, actual);
}

[TestMethod]
[DeploymentItem("SubtitleEdit.exe")]
public void RemoveTextRemoveLineWithColon()
{
RemoveTextForHI target = GetRemoveTextForHiLib();
target.Settings.RemoveTextBeforeColon = true;
target.Settings.RemoveTextBeforeColonOnlyUppercase = false;
const string text = "Before:";
string expected = string.Empty;
string actual = target.RemoveColon(text);
Assert.AreEqual(expected, actual);
}

[TestMethod]
[DeploymentItem("SubtitleEdit.exe")]
public void RemoveTextRemoveLineWithColon2()
{
RemoveTextForHI target = GetRemoveTextForHiLib();
target.Settings.RemoveTextBeforeColon = true;
target.Settings.RemoveTextBeforeColonOnlyUppercase = false;
const string text = "COP 1: Call it in, code four. COP 4: Get him out of here.";
const string expected = "Call it in, code four. Get him out of here.";
string actual = target.RemoveColon(text);
Assert.AreEqual(expected, actual);
}

#region Additional test attributes

//
Expand Down

0 comments on commit 20fcea2

Please sign in to comment.