Merge pull request #783 from xylographe/updnl

Added ExportPngXml.FullFrameImage to ML
This commit is contained in:
Nikolaj Olsson 2015-05-26 22:54:26 +02:00
commit 998e6312f6
6 changed files with 13 additions and 6 deletions

View File

@ -423,6 +423,7 @@ Note: Do check free disk space.</WaveFileMalformed>
<ShadowWidth>Shadow width</ShadowWidth>
<Transparency>Alpha</Transparency>
<ImageFormat>Image format</ImageFormat>
<FullFrameImage>Full frame image</FullFrameImage>
<SimpleRendering>Simple rendering</SimpleRendering>
<AntiAliasingWithTransparency>Anti-aliasing with transparency</AntiAliasingWithTransparency>
<Text3D>3D</Text3D>

View File

@ -2642,6 +2642,7 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
labelSubtitleFontSize.Text = Configuration.Settings.Language.ExportPngXml.FontSize;
labelResolution.Text = Configuration.Settings.Language.ExportPngXml.VideoResolution;
buttonColor.Text = Configuration.Settings.Language.ExportPngXml.FontColor;
checkBoxBold.Text = Configuration.Settings.Language.General.Bold;
checkBoxSimpleRender.Text = Configuration.Settings.Language.ExportPngXml.SimpleRendering;
checkBoxTransAntiAliase.Text = Configuration.Settings.Language.ExportPngXml.AntiAliasingWithTransparency;
@ -2664,13 +2665,12 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
comboBox3D.Left = label3D.Left + label3D.Width + 3;
checkBoxBold.Text = Configuration.Settings.Language.General.Bold;
buttonBorderColor.Text = Configuration.Settings.Language.ExportPngXml.BorderColor;
//labelBorderWidth.Text = Configuration.Settings.Language.ExportPngXml.BorderWidth;
labelBorderWidth.Text = Configuration.Settings.Language.ExportPngXml.BorderStyle;
labelImageFormat.Text = Configuration.Settings.Language.ExportPngXml.ImageFormat;
checkBoxFullFrameImage.Text = Configuration.Settings.Language.ExportPngXml.FullFrameImage;
buttonExport.Text = Configuration.Settings.Language.ExportPngXml.ExportAllLines;
buttonCancel.Text = Configuration.Settings.Language.General.Ok;
labelLanguage.Text = Configuration.Settings.Language.ChooseLanguage.Language;

View File

@ -423,6 +423,7 @@ Is er voldoende beschikbare ruimte op de harde schijf?</WaveFileMalformed>
<ShadowWidth>Schaduwbreedte</ShadowWidth>
<Transparency>Alpha</Transparency>
<ImageFormat>Beeldformaat</ImageFormat>
<FullFrameImage>Volledig beeld</FullFrameImage>
<SimpleRendering>Eenvoudige weergave</SimpleRendering>
<AntiAliasingWithTransparency>Anti-aliasing met transparantie</AntiAliasingWithTransparency>
<Text3D>3D teksten</Text3D>
@ -437,7 +438,7 @@ Is er voldoende beschikbare ruimte op de harde schijf?</WaveFileMalformed>
<Right>Rechts</Right>
<Center>Midden</Center>
<BottomMargin>Ondermarge</BottomMargin>
<LeftRightMargin>Linker- en rechtermarge</LeftRightMargin>
<LeftRightMargin>marge</LeftRightMargin>
<SaveBluRraySupAs>Blu-ray sup-bestand kiezen</SaveBluRraySupAs>
<SaveVobSubAs>VobSub-bestand kiezen</SaveVobSubAs>
<SaveFabImageScriptAs>FAB image script-bestand kiezen</SaveFabImageScriptAs>
@ -451,7 +452,7 @@ Is er voldoende beschikbare ruimte op de harde schijf?</WaveFileMalformed>
<BoxSingleLine>Enkellijnig kader</BoxSingleLine>
<BoxMultiLine>Meerlijnig kader</BoxMultiLine>
<Forced>Ingebakken</Forced>
<ChooseBackgroundColor>Kies achtergrondkleur</ChooseBackgroundColor>
<ChooseBackgroundColor>Achtergrondkleur kiezen</ChooseBackgroundColor>
<SaveImageAs>Afbeelding opslaan als...</SaveImageAs>
</ExportPngXml>
<ExportText>
@ -636,7 +637,7 @@ Is er voldoende beschikbare ruimte op de harde schijf?</WaveFileMalformed>
<DescriptionLine1>Download Tesseract OCR-woordenboeken</DescriptionLine1>
<DownloadFailed>Download mislukt!</DownloadFailed>
<GetDictionariesHere>Haal woordenboeken hier:</GetDictionariesHere>
<ChooseLanguageAndClickDownload>Kies uw taal en klik Download</ChooseLanguageAndClickDownload>
<ChooseLanguageAndClickDownload>Kies uw taal en klik op Download</ChooseLanguageAndClickDownload>
<OpenDictionariesFolder>Open woordenboekenmap</OpenDictionariesFolder>
<Download>Download</Download>
<XDownloaded>{0} is gedownload en geïnstalleerd</XDownloaded>

View File

@ -599,6 +599,7 @@ namespace Nikse.SubtitleEdit.Logic
ShadowWidth = "Shadow width",
Transparency = "Alpha",
ImageFormat = "Image format",
FullFrameImage = "Full frame image",
ExportAllLines = "Export all lines...",
FontColor = "Font color",
FontFamily = "Font family",

View File

@ -1077,6 +1077,9 @@ namespace Nikse.SubtitleEdit.Logic
case "ExportPngXml/ImageFormat":
language.ExportPngXml.ImageFormat = reader.Value;
break;
case "ExportPngXml/FullFrameImage":
language.ExportPngXml.FullFrameImage = reader.Value;
break;
case "ExportPngXml/SimpleRendering":
language.ExportPngXml.SimpleRendering = reader.Value;
break;

View File

@ -475,6 +475,7 @@
public string ShadowWidth { get; set; }
public string Transparency { get; set; }
public string ImageFormat { get; set; }
public string FullFrameImage { get; set; }
public string SimpleRendering { get; set; }
public string AntiAliasingWithTransparency { get; set; }
public string Text3D { get; set; }