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 'hotfix/lang_file' into develop

Browse Source
This commit is contained in:
ivandrofly 2014-06-12 01:49:24 +01:00
commit 8d97f6544f
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
LanguageMaster.xml
View File

@ -966,7 +966,9 @@ Email: mailto:nikse.dk@gmail.com</AboutText1>
<SavedOriginalSubtitleX>Saved original subtitle {0}</SavedOriginalSubtitleX>
<FileOnDiskModified>file on disk modified</FileOnDiskModified>
<OverwriteModifiedFile>Overwrite the file {0} modified at {1} {2}{3} with current file loaded from disk at {4} {5}?</OverwriteModifiedFile>
<UnableToSaveSubtitleX>Unable to save subtitle file {0}</UnableToSaveSubtitleX>
<UnableToSaveSubtitleX>Unable to save subtitle file {0}
Subtitle seems to be empty - try to re-save if you're working on a valid subtitle!
</UnableToSaveSubtitleX>
<BeforeNew>Before new</BeforeNew>
<New>New</New>
<BeforeConvertingToX>Before converting to {0}</BeforeConvertingToX>

2
src/Forms/Main.cs
View File

@ -3495,7 +3495,7 @@ namespace Nikse.SubtitleEdit.Forms
{
if (allText.Trim().Length == 0)
{
MessageBox.Show(string.Format(_language.UnableToSaveSubtitleX, _fileName) + Environment.NewLine + Environment.NewLine + "Subtitle seems to be empty - try to re-save if you're working on a valid subtitle!");
MessageBox.Show(string.Format(_language.UnableToSaveSubtitleX, _fileName), String.Empty, MessageBoxButtons.OK, MessageBoxIcon.Stop);
return DialogResult.Cancel;
}
File.WriteAllText(_fileName, allText, currentEncoding);

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

@ -981,7 +981,9 @@ Email: mailto:nikse.dk@gmail.com</AboutText1>
<SavedOriginalSubtitleX>Legenda original guardada {0}</SavedOriginalSubtitleX>
<FileOnDiskModified>Ficheiro modificado no disco</FileOnDiskModified>
<OverwriteModifiedFile>Substituir o ficheiro {0} modificado em {1} {2}{3} pelo ficheiro actual carregado do disco em {4} {5}?</OverwriteModifiedFile>
<UnableToSaveSubtitleX>Não foi possível guardar a legenda {0}</UnableToSaveSubtitleX>
<UnableToSaveSubtitleX>Não foi possível guardar a legenda {0}
parece estar vazia!
</UnableToSaveSubtitleX>
<BeforeNew>Antes de novo</BeforeNew>
<New>Novo</New>
<BeforeConvertingToX>Convertendo anterior para {0}</BeforeConvertingToX>