Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-27 14:32:35 +01:00
Code Issues Projects Releases Wiki Activity

Updated change log + Danish language file

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@2142 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2013-10-12 17:19:59 +00:00
parent 6f6edb6987
commit 2f64a6e9ee
5 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Changelog.txt
View File

@ -11,6 +11,7 @@
* Updated Russian language file - thx Sergey * Updated Russian language file - thx Sergey
* Updated Brazilian Portuguese langauge file - thx Igor * Updated Brazilian Portuguese langauge file - thx Igor
* Updated German langauge file - thx Siegwarth * Updated German langauge file - thx Siegwarth
* Updated Bulgarian language file - thx Iavor
* Updated word lists - thx Siegwarth * Updated word lists - thx Siegwarth
* Minor improvements for EBU open subtitling * Minor improvements for EBU open subtitling
* Added "Allow overlap in waveform" as setting * Added "Allow overlap in waveform" as setting
@ -20,6 +21,8 @@
* Open original subtitle now allows EBU/890/PAC formats - thx Andreas * Open original subtitle now allows EBU/890/PAC formats - thx Andreas
* "DCinema SMPTE" format is now valid (uses xsd) - thx Wolfgang * "DCinema SMPTE" format is now valid (uses xsd) - thx Wolfgang
* Improved italic fix - thx XhmikosR * Improved italic fix - thx XhmikosR
* NCI CAPT format can now also read version 1.2 files
* Pageup/Pagedown can now be used in custom shortcuts
* FIXED: * FIXED:
* Crash in export of images - thx Eros UK * Crash in export of images - thx Eros UK
* Crash in OCR via "Image compare" with large image databases - thx Zoltan * Crash in OCR via "Image compare" with large image databases - thx Zoltan

8
src/Forms/ExportPngXml.cs
View File

@ -1323,6 +1323,9 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
SizeF textSize = g.MeasureString("Hj!", font); SizeF textSize = g.MeasureString("Hj!", font);
var lineHeight = (textSize.Height * 0.64f); var lineHeight = (textSize.Height * 0.64f);
textSize = g.MeasureString(Utilities.RemoveHtmlTags(text), font); textSize = g.MeasureString(Utilities.RemoveHtmlTags(text), font);
g.Dispose(); g.Dispose();
bmp.Dispose(); bmp.Dispose();
@ -1359,6 +1362,11 @@ $DROP=[DROPVALUE]" + Environment.NewLine + Environment.NewLine +
baseLinePadding = 0; baseLinePadding = 0;
} }
//TODO: Better baseline - test http://bobpowell.net/formattingtext.aspx
//float baselineOffset=font.SizeInPoints/font.FontFamily.GetEmHeight(font.Style)*font.FontFamily.GetCellAscent(font.Style);
//float baselineOffsetPixels = g.DpiY/72f*baselineOffset;
//baseLinePadding = (int)Math.Round(baselineOffsetPixels);
var lefts = new List<float>(); var lefts = new List<float>();
foreach (string line in Utilities.RemoveHtmlFontTag(text.Replace("<i>", string.Empty).Replace("</i>", string.Empty)).Split(Environment.NewLine.ToCharArray(), StringSplitOptions.RemoveEmptyEntries)) foreach (string line in Utilities.RemoveHtmlFontTag(text.Replace("<i>", string.Empty).Replace("</i>", string.Empty)).Split(Environment.NewLine.ToCharArray(), StringSplitOptions.RemoveEmptyEntries))
{ {

4
src/Languages/da-DK.xml
View File

@ -1524,6 +1524,8 @@ Fortsæt?</SubtitleAppendPrompt>
<ListViewColumnInsert>Column, indsæt tekst</ListViewColumnInsert> <ListViewColumnInsert>Column, indsæt tekst</ListViewColumnInsert>
<ListViewColumnPaste>Column, indsæt fra udklipsholder</ListViewColumnPaste> <ListViewColumnPaste>Column, indsæt fra udklipsholder</ListViewColumnPaste>
<ShowBeamer>Start undertekst fremviser (fuldskærm)</ShowBeamer> <ShowBeamer>Start undertekst fremviser (fuldskærm)</ShowBeamer>
<MainTextBoxMoveLastWordDown>Flyt sidste ord ned til næste linje</MainTextBoxMoveLastWordDown>
<MainTextBoxMoveFirstWordFromNextUp>Flyt første ord fra næste linje op</MainTextBoxMoveFirstWordFromNextUp>
</Settings> </Settings>
<ShowEarlierLater> <ShowEarlierLater>
<Title>Vis valgte linjer tidligere/senere</Title> <Title>Vis valgte linjer tidligere/senere</Title>
@ -1771,6 +1773,8 @@ Fortsæt?</SubtitleAppendPrompt>
<Stop>Stop</Stop> <Stop>Stop</Stop>
<StartOcrFrom>Start OCR fra undertekst nr:</StartOcrFrom> <StartOcrFrom>Start OCR fra undertekst nr:</StartOcrFrom>
<LoadingVobSubImages>Indlæser VobSub billeder...</LoadingVobSubImages> <LoadingVobSubImages>Indlæser VobSub billeder...</LoadingVobSubImages>
<LoadingImageCompareDatabase>Loader billede database...</LoadingImageCompareDatabase>
<ConvertingImageCompareDatabase>Konverterer billede database til nyt format (images.db/images.xml)...</ConvertingImageCompareDatabase>
<SubtitleImage>Undertekst billede</SubtitleImage> <SubtitleImage>Undertekst billede</SubtitleImage>
<SubtitleText>Undertekst</SubtitleText> <SubtitleText>Undertekst</SubtitleText>
<UnableToCreateCharacterDatabaseFolder>Stand til at skabe 'tegn database mappe': {0}</UnableToCreateCharacterDatabaseFolder> <UnableToCreateCharacterDatabaseFolder>Stand til at skabe 'tegn database mappe': {0}</UnableToCreateCharacterDatabaseFolder>

6
src/Logic/SubtitleFormats/WebVTT.cs
View File

@ -39,7 +39,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
public override string ToText(Subtitle subtitle, string title) public override string ToText(Subtitle subtitle, string title)
{ {
const string timeCodeFormatNoHours = "{1:00}:{2:00}.{3:000}"; // mm:ss.cc const string timeCodeFormatNoHours = "{0:00}:{1:00}.{2:000}"; // mm:ss.cc
const string timeCodeFormatHours = "{0:00}:{1:00}:{2:00}.{3:000}"; // hh:mm:ss.cc const string timeCodeFormatHours = "{0:00}:{1:00}:{2:00}.{3:000}"; // hh:mm:ss.cc
const string paragraphWriteFormat = "{0} --> {1}{4}{2}{3}{4}"; const string paragraphWriteFormat = "{0} --> {1}{4}{2}{3}{4}";
@ -48,8 +48,8 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
sb.AppendLine(); sb.AppendLine();
foreach (Paragraph p in subtitle.Paragraphs) foreach (Paragraph p in subtitle.Paragraphs)
{ {
string start = string.Format(timeCodeFormatNoHours, p.StartTime.Hours, p.StartTime.Minutes, p.StartTime.Seconds, p.StartTime.Milliseconds); string start = string.Format(timeCodeFormatNoHours, p.StartTime.Minutes, p.StartTime.Seconds, p.StartTime.Milliseconds);
string end = string.Format(timeCodeFormatNoHours, p.EndTime.Hours, p.EndTime.Minutes, p.EndTime.Seconds, p.EndTime.Milliseconds); string end = string.Format(timeCodeFormatNoHours, p.EndTime.Minutes, p.EndTime.Seconds, p.EndTime.Milliseconds);
if (p.StartTime.Hours > 0 || p.EndTime.Hours > 0) if (p.StartTime.Hours > 0 || p.EndTime.Hours > 0)
{ {

6
src/Logic/SubtitleFormats/WebVTTFileWithLineNumber.cs
View File

@ -39,7 +39,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
public override string ToText(Subtitle subtitle, string title) public override string ToText(Subtitle subtitle, string title)
{ {
const string timeCodeFormatNoHours = "{1:00}:{2:00}.{3:000}"; // h:mm:ss.cc const string timeCodeFormatNoHours = "{0:00}:{1:00}.{2:000}"; // h:mm:ss.cc
const string timeCodeFormatHours = "{0}:{1:00}:{2:00}.{3:000}"; // h:mm:ss.cc const string timeCodeFormatHours = "{0}:{1:00}:{2:00}.{3:000}"; // h:mm:ss.cc
const string paragraphWriteFormat = "{0} --> {1}{4}{2}{3}{4}"; const string paragraphWriteFormat = "{0} --> {1}{4}{2}{3}{4}";
@ -49,8 +49,8 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
int count = 1; int count = 1;
foreach (Paragraph p in subtitle.Paragraphs) foreach (Paragraph p in subtitle.Paragraphs)
{ {
string start = string.Format(timeCodeFormatNoHours, p.StartTime.Hours, p.StartTime.Minutes, p.StartTime.Seconds, p.StartTime.Milliseconds); string start = string.Format(timeCodeFormatNoHours, p.StartTime.Minutes, p.StartTime.Seconds, p.StartTime.Milliseconds);
string end = string.Format(timeCodeFormatNoHours, p.EndTime.Hours, p.EndTime.Minutes, p.EndTime.Seconds, p.EndTime.Milliseconds); string end = string.Format(timeCodeFormatNoHours, p.EndTime.Minutes, p.EndTime.Seconds, p.EndTime.Milliseconds);
if (p.StartTime.Hours > 0 || p.EndTime.Hours > 0) if (p.StartTime.Hours > 0 || p.EndTime.Hours > 0)
{ {