diff --git a/src/Languages/nl-NL.xml b/src/Languages/nl-NL.xml index cf273ef2f..ab5cbb885 100644 --- a/src/Languages/nl-NL.xml +++ b/src/Languages/nl-NL.xml @@ -3,7 +3,7 @@ Subtitle Edit 3.3 - Quetsbeek en minouhse + Vertaald door: Quetsbeek en minouhse nl-NL &Oké @@ -73,7 +73,14 @@ Over Subtitle Edit - Subtitle Edit is vrije software onder de GNU Public License. U mag het verspreiden, wijzigen en vrij gebruik van maken. C # broncode is beschikbaar op http://code.google.com ./p/subtitleedit Bezoek www.nikse.dk voor de nieuwste versie Suggesties zijn van harte welkom E-mail:. mailto: nikse. dk@gmail.com + +Subtitle Edit is vrije software onder de GNU Public License. +U mag het verspreiden, wijzigen en vrij gebruik van maken. + +C# broncode is beschikbaar op http://code.google.com/p/subtitleedit +Bezoek www.nikse.dk voor de nieuwste versie + +Suggesties zijn van harte welkom E-mail: mailto:nikse.dk@gmail.com Toevoegen aan namen/etc lijst diff --git a/src/Logic/SubtitleFormats/AdvancedSubStationAlpha.cs b/src/Logic/SubtitleFormats/AdvancedSubStationAlpha.cs index a8a19fdc9..942cd9494 100644 --- a/src/Logic/SubtitleFormats/AdvancedSubStationAlpha.cs +++ b/src/Logic/SubtitleFormats/AdvancedSubStationAlpha.cs @@ -129,7 +129,7 @@ Format: Layer, Start, End, Style, Actor, MarginL, MarginR, MarginV, Effect, Text sb.AppendLine(string.Format(paragraphWriteFormat, start, end, FormatText(p), style, actor)); } - if (!string.IsNullOrEmpty(subtitle.Footer) && subtitle.Footer.Contains("[fonts]" + Environment.NewLine)) + if (!string.IsNullOrEmpty(subtitle.Footer) && (subtitle.Footer.Contains("[Fonts]" + Environment.NewLine) || subtitle.Footer.Contains("[Graphics]" + Environment.NewLine))) { sb.AppendLine(); sb.AppendLine(subtitle.Footer); @@ -595,6 +595,7 @@ Format: Layer, Start, End, Style, Actor, MarginL, MarginR, MarginV, Effect, Text _errorCount = 0; bool eventsStarted = false; bool fontsStarted = false; + bool graphicsStarted = false; subtitle.Paragraphs.Clear(); string[] format = "Layer, Start, End, Style, Actor, MarginL, MarginR, MarginV, Effect, Text".Split(','); int indexStart = 1; @@ -606,11 +607,11 @@ Format: Layer, Start, End, Style, Actor, MarginL, MarginR, MarginV, Effect, Text int lineNumber = 0; var header = new StringBuilder(); - var fonts = new StringBuilder(); + var footer = new StringBuilder(); foreach (string line in lines) { lineNumber++; - if (!eventsStarted && !fontsStarted) + if (!eventsStarted && !fontsStarted && !graphicsStarted) header.AppendLine(line); if (line.Trim().Length == 0) @@ -625,22 +626,38 @@ Format: Layer, Start, End, Style, Actor, MarginL, MarginR, MarginV, Effect, Text { eventsStarted = true; fontsStarted = false; + graphicsStarted = false; } if (line.Trim().ToLower() == "[events]") { eventsStarted = true; fontsStarted = false; + graphicsStarted = false; } else if (line.Trim().ToLower() == "[fonts]") { eventsStarted = false; fontsStarted = true; - fonts.AppendLine("[fonts]"); + graphicsStarted = false; + footer.AppendLine(); + footer.AppendLine("[Fonts]"); + } + else if (line.Trim().ToLower() == "[graphics]") + { + eventsStarted = false; + fontsStarted = false; + graphicsStarted = true; + footer.AppendLine(); + footer.AppendLine("[Graphics]"); } else if (fontsStarted) { - fonts.AppendLine(line); + footer.AppendLine(line); + } + else if (graphicsStarted) + { + footer.AppendLine(line); } else if (eventsStarted) { @@ -721,8 +738,8 @@ Format: Layer, Start, End, Style, Actor, MarginL, MarginR, MarginV, Effect, Text } if (header.Length > 0) subtitle.Header = header.ToString(); - if (fonts.Length > 0) - subtitle.Footer = fonts.ToString(); + if (footer.Length > 0) + subtitle.Footer = footer.ToString().Trim(); subtitle.Renumber(1); Errors = errors.ToString(); }