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

Merge branch 'master' of https://github.com/SubtitleEdit/subtitleedit

Browse Source
This commit is contained in:
niksedk 2014-06-22 20:28:54 +02:00
commit 584e5cda12
6 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Forms/FixCommonErrors.cs
View File

@ -554,7 +554,7 @@ namespace Nikse.SubtitleEdit.Forms
int emptyLinesRemoved = 0;
int firstNumber = _subtitle.Paragraphs[0].Number;
listViewFixes.BeginUpdate();
for (int i = _subtitle.Paragraphs.Count - 1; i >= 0; i--)
{
Paragraph p = _subtitle.Paragraphs[i];
@ -601,6 +601,7 @@ namespace Nikse.SubtitleEdit.Forms
}
}
listViewFixes.EndUpdate();
if (emptyLinesRemoved > 0)
{
LogStatus(_language.RemovedEmptyLinesUnsedLineBreaks, string.Format(_language.EmptyLinesRemovedX, emptyLinesRemoved));
@ -1779,6 +1780,15 @@ namespace Nikse.SubtitleEdit.Forms
for (int i = 0; i < _subtitle.Paragraphs.Count; i++)
{
Paragraph p = _subtitle.Paragraphs[i];
if (!p.Text.Contains("\""))
continue;
// Removes ' if like: "' or '"
while (p.Text.Contains("\"'") || p.Text.Contains("'\""))
{
p.Text = p.Text.Replace("\"'", "\"");
p.Text = p.Text.Replace("'\"", "\"");
}
if (Utilities.CountTagInText(p.Text, "\"") == 1)
{
Paragraph next = _subtitle.GetParagraphOrDefault(i + 1);

2
src/Forms/Main.cs
View File

@ -19456,7 +19456,7 @@ namespace Nikse.SubtitleEdit.Forms
_timerCheckForUpdates.Stop();
}
catch
{
{
}
var form = new CheckForUpdates(this);

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

@ -202,7 +202,7 @@ Email: mailto:nikse.dk@gmail.com</AboutText1>
<CheckingForUpdatesNoneAvailable>Está a usar a última versão do Subtitle Edit :)</CheckingForUpdatesNoneAvailable>
<CheckingForUpdatesNewVersion>Nova versão disponível!</CheckingForUpdatesNewVersion>
<InstallUpdate>Ir para a página de transferência</InstallUpdate>
</CheckForUpdates>
</CheckForUpdates>
<ChooseAudioTrack>
<Title>Escolher a faixa de áudio</Title>
</ChooseAudioTrack>
@ -830,7 +830,7 @@ Email: mailto:nikse.dk@gmail.com</AboutText1>
<LeaveSession>Abandonar sessão</LeaveSession>
</Networking>
<Help>
<CheckForUpdates>Verificar se há atualizações...</CheckForUpdates>
<CheckForUpdates>Verificar se há atualizações...</CheckForUpdates>
<Title>Ajuda</Title>
<Help>&amp;Ajuda</Help>
<About>&amp;Sobre</About>
@ -1485,7 +1485,7 @@ editar o mesmo ficheiro de legenda (colaboração)</Information>
<VideoEngine>Mecanismo de vídeo</VideoEngine>
<DirectShow>DirectShow</DirectShow>
<DirectShowDescription>quartz.dll na pasta system32</DirectShowDescription>
<DirectShowDescription64>quartz.dll na pasta SysWOW64</DirectShowDescription64>
<DirectShowDescription64>quartz.dll na pasta SysWOW64</DirectShowDescription64>
<ManagedDirectX>Gerado pelo DirectX</ManagedDirectX>
<ManagedDirectXDescription>Microsoft.DirectX.AudioVideoPlayback - Código .NET gerado pelo DirectX</ManagedDirectXDescription>
<MPlayer>MPlayer</MPlayer>

10
src/Logic/Forms/CheckForUpdatesHelper.cs
View File

@ -18,9 +18,9 @@ namespace Nikse.SubtitleEdit.Logic.Forms
private int _successCount;
public string Error { get; set; }
public bool Done
{
get
public bool Done
{
get
{
return _successCount == 1;
}
@ -150,7 +150,7 @@ namespace Nikse.SubtitleEdit.Logic.Forms
public void CheckForUpdates()
{
// load github release json
// load github release json
//StartDownloadString(ReleasesUrl, "application/json", new AsyncCallback(FinishWebRequestReleases));
// load change log
@ -183,7 +183,7 @@ namespace Nikse.SubtitleEdit.Logic.Forms
catch
{
return false;
}
}
}

4
src/Logic/Language.cs
View File

@ -26,7 +26,7 @@ namespace Nikse.SubtitleEdit.Logic
public LanguageStructure.ChangeCasingNames ChangeCasingNames;
public LanguageStructure.ChangeFrameRate ChangeFrameRate;
public LanguageStructure.ChangeSpeedInPercent ChangeSpeedInPercent;
public LanguageStructure.CheckForUpdates CheckForUpdates;
public LanguageStructure.CheckForUpdates CheckForUpdates;
public LanguageStructure.ChooseAudioTrack ChooseAudioTrack;
public LanguageStructure.ChooseEncoding ChooseEncoding;
public LanguageStructure.ChooseLanguage ChooseLanguage;
@ -339,7 +339,7 @@ namespace Nikse.SubtitleEdit.Logic
CheckingForUpdatesNewVersion = "New version available!",
InstallUpdate = "Go to download page",
NoUpdates = "Don't update",
};
};
ChooseAudioTrack = new LanguageStructure.ChooseAudioTrack
{

4
src/Logic/LanguageStructure.cs
View File

@ -1179,7 +1179,7 @@
public class HelpMenu
{
public string CheckForUpdates { get; set; }
public string CheckForUpdates { get; set; }
public string Title { get; set; }
public string Help { get; set; }
public string About { get; set; }
@ -1647,7 +1647,7 @@
public string AutoBackupEveryMinute { get; set; }
public string AutoBackupEveryFiveMinutes { get; set; }
public string AutoBackupEveryFifteenMinutes { get; set; }
public string CheckForUpdates { get; set; }
public string CheckForUpdates { get; set; }
public string AllowEditOfOriginalSubtitle { get; set; }
public string PromptDeleteLines { get; set; }
public string TimeCodeMode { get; set; }