From 0d422e93290c59b45efec9dbf652e9fafa84cc64 Mon Sep 17 00:00:00 2001
From: Waldi Ravens <wr86420@gmail.com>
Date: Tue, 26 May 2015 20:55:39 +0200
Subject: [PATCH 1/2] Multi-language addition (Forms/ExportPngXml)

---
 LanguageMaster.xml                | 1 +
 src/Forms/ExportPngXml.cs         | 6 +++---
 src/Logic/Language.cs             | 1 +
 src/Logic/LanguageDeserializer.cs | 3 +++
 src/Logic/LanguageStructure.cs    | 1 +
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/LanguageMaster.xml b/LanguageMaster.xml
index e171edaba..8203ad21c 100644
--- a/LanguageMaster.xml
+++ b/LanguageMaster.xml
@@ -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>
diff --git a/src/Forms/ExportPngXml.cs b/src/Forms/ExportPngXml.cs
index d0c6ba05f..ed3028ea9 100644
--- a/src/Forms/ExportPngXml.cs
+++ b/src/Forms/ExportPngXml.cs
@@ -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;
diff --git a/src/Logic/Language.cs b/src/Logic/Language.cs
index c0b7cab1c..e99554c9a 100644
--- a/src/Logic/Language.cs
+++ b/src/Logic/Language.cs
@@ -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",
diff --git a/src/Logic/LanguageDeserializer.cs b/src/Logic/LanguageDeserializer.cs
index 0d4420782..463568ecb 100644
--- a/src/Logic/LanguageDeserializer.cs
+++ b/src/Logic/LanguageDeserializer.cs
@@ -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;
diff --git a/src/Logic/LanguageStructure.cs b/src/Logic/LanguageStructure.cs
index 9a4940f36..d40d3eb28 100644
--- a/src/Logic/LanguageStructure.cs
+++ b/src/Logic/LanguageStructure.cs
@@ -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; }

From 71b977869644576023be9976934878e278ef1eda Mon Sep 17 00:00:00 2001
From: Waldi Ravens <wr86420@gmail.com>
Date: Tue, 26 May 2015 20:26:19 +0200
Subject: [PATCH 2/2] nl-NL translation: added ExportPngXml.FullFrameImage

---
 src/Languages/nl-NL.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Languages/nl-NL.xml b/src/Languages/nl-NL.xml
index daf81f35e..67f396583 100644
--- a/src/Languages/nl-NL.xml
+++ b/src/Languages/nl-NL.xml
@@ -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>Zijmarge</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>