Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-22 03:02:35 +01:00
Code Issues Projects Releases Wiki Activity

* include the Spanish translation in the installer

Browse Source 
* remove unneeded whitespaces

git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@819 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
XhmikosR 2011-11-17 19:40:40 +00:00
parent 916aa6f1af
commit 6ebfc84055
7 changed files with 31 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
installer/Subtitle_Edit_installer.iss
View File

@ -51,12 +51,12 @@
#expr ParseVersion(bindir + "\SubtitleEdit.exe", VerMajor, VerMinor, VerBuild, VerRevision)
;#define app_version str(VerMajor) + "." + str(VerMinor)
;#define app_version str(VerMajor) + "." + str(VerMinor)
; The following app_version is for 3 digit releases, one of the two must be uncommented at a time
#define app_version str(VerMajor) + "." + str(VerMinor) + "." + str(VerBuild)
#define app_version str(VerMajor) + "." + str(VerMinor) + "." + str(VerBuild)
#define installer_build_date GetDateTimeString('mmm, d yyyy', '', '')
#define quick_launch "{userappdata}\Microsoft\Internet Explorer\Quick Launch"
#define quick_launch "{userappdata}\Microsoft\Internet Explorer\Quick Launch"
[Setup]
@ -188,7 +188,7 @@ Source: {#bindir}\Languages\cs-CZ.xml; DestDir: {app}\Languages;
Source: {#bindir}\Languages\da-DK.xml; DestDir: {app}\Languages; Flags: ignoreversion; Components: translations
Source: {#bindir}\Languages\de-De.xml; DestDir: {app}\Languages; Flags: ignoreversion; Components: translations
Source: {#bindir}\Languages\el-GR.xml; DestDir: {app}\Languages; Flags: ignoreversion; Components: translations
;Source: {#bindir}\Languages\es-ES.xml; DestDir: {app}\Languages; Flags: ignoreversion; Components: translations
Source: {#bindir}\Languages\es-ES.xml; DestDir: {app}\Languages; Flags: ignoreversion; Components: translations
Source: {#bindir}\Languages\eu-ES.xml; DestDir: {app}\Languages; Flags: ignoreversion; Components: translations
Source: {#bindir}\Languages\fr-FR.xml; DestDir: {app}\Languages; Flags: ignoreversion; Components: translations
Source: {#bindir}\Languages\hu-HU.xml; DestDir: {app}\Languages; Flags: ignoreversion; Components: translations
@ -273,7 +273,6 @@ Type: files; Name: {app}\Languages\sr-Latn-CS.xml
; The following language files are incompatible with this SE version,
; so remove them when we are upgrading. If they are updated remove this code.
Type: files; Name: {app}\Languages\es-ES.xml; Check: IsComponentSelected('translations') and IsUpgrade()
Type: files; Name: {app}\Languages\it-IT.xml; Check: IsComponentSelected('translations') and IsUpgrade()
; Cleanup language files if it's an upgrade and the translations are not selected

12
src/Forms/ExportPngXml.cs
View File

@ -13,7 +13,7 @@ using Nikse.SubtitleEdit.Logic.VobSub;
namespace Nikse.SubtitleEdit.Forms
{
public sealed partial class ExportPngXml : Form
{
private class MakeBitmapParameter
@ -71,7 +71,7 @@ namespace Nikse.SubtitleEdit.Forms
}
else if (paramter.Type == "VOBSUB")
{
}
}
@ -175,9 +175,9 @@ namespace Nikse.SubtitleEdit.Forms
threadEqual.Start(paramEqual);
int i = 1;
for (; i < _subtitle.Paragraphs.Count; i++)
{
{
if (i % 2 == 0)
{
{
if (threadEqual.ThreadState == ThreadState.Running)
threadEqual.Join(3000);
imagesSavedCount = WriteParagraph(width, sb, border, height, imagesSavedCount, vobSubWriter, binarySubtitleFile, paramEqual, i);
@ -198,8 +198,8 @@ namespace Nikse.SubtitleEdit.Forms
threadUnEqual.Start(paramUnEqual);
}
progressBar1.Refresh();
Application.DoEvents();
progressBar1.Value = i;
Application.DoEvents();
progressBar1.Value = i;
}
if (i % 2 == 0)

4
src/Forms/Main.cs
View File

@ -4940,7 +4940,7 @@ namespace Nikse.SubtitleEdit.Forms
original.Text = Utilities.AutoBreakLine(original.Text);
original.EndTime.TotalMilliseconds = currentParagraph.EndTime.TotalMilliseconds;
_subtitleAlternate.Renumber(1);
}
}
}
if (_networkSession != null)
@ -6696,7 +6696,7 @@ namespace Nikse.SubtitleEdit.Forms
PlayPrevious();
else
ButtonPreviousClick(null, null);
}
}
else if (_mainGoToNext == e.KeyData && inListView)
{
if (AutoRepeatContinueOn)

18
src/Logic/SubtitleFormats/Cavena890.cs
View File

@ -10,7 +10,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
static List<int> _hebrewCodes = new List<int> {
0x40, // א
0x41, // ב
0x41, // ב
0x42, // ג
0x43, // ד
0x44, // ה
@ -29,8 +29,8 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
0x56, // צ
0x57, // ק
0x58, // ר
0x59, // ש
0x59, // ש
};
static List<string> _hebrewLetters = new List<string> {
@ -138,17 +138,17 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
buffer[251] = 0x4C;
buffer[252] = 0x2E;
buffer[253] = 0x56;
buffer[254] = 0x4B;
buffer[254] = 0x4B;
buffer[255] = 0x02;
buffer[256] = 0x30;
buffer[257] = 0x30;
buffer[258] = 0x3A;
buffer[258] = 0x3A;
buffer[259] = 0x30;
buffer[260] = 0x30;
buffer[261] = 0x3A;
buffer[261] = 0x3A;
buffer[262] = 0x30;
buffer[263] = 0x30;
buffer[264] = 0x3A;
buffer[264] = 0x3A;
buffer[265] = 0x30;
buffer[266] = 0x30;
@ -240,7 +240,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
byte[] buffer = new byte[51];
for (int i = 0; i < buffer.Length; i++)
buffer[i] = 0x7F;
buffer[i] = 0x7F;
var encoding = Encoding.Default;
int index = 0;
@ -412,7 +412,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
p.StartTime.TotalMilliseconds = ((1000.0 / Configuration.Settings.General.CurrentFrameRate) * startFrame);
p.EndTime.TotalMilliseconds = ((1000.0 / Configuration.Settings.General.CurrentFrameRate) * endFrame);
p.Text = (line1 + Environment.NewLine + line2).Trim();
}
}
i += TextLength * 2;
lastNumber = number;

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

@ -117,7 +117,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
valueNode = xml.CreateElement("string");
valueNode.InnerText = line;
paragraph.AppendChild(valueNode);
}
}
div.AppendChild(paragraph);
no++;
}
@ -126,7 +126,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
XmlTextWriter writer = new XmlTextWriter(ms, Encoding.UTF8);
writer.Formatting = Formatting.Indented;
xml.Save(writer);
return Encoding.UTF8.GetString(ms.ToArray()).Trim().Replace("<plist>", "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">" + Environment.NewLine +
return Encoding.UTF8.GetString(ms.ToArray()).Trim().Replace("<plist>", "<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">" + Environment.NewLine +
"<plist version=\"1.0\">;");
}
@ -173,7 +173,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
}
subtitle.Renumber(1);
}
}
}

12
src/Logic/SubtitleFormats/Pac.cs
View File

@ -159,7 +159,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
"ż",
};
static List<int> _hebrewCodes = new List<int>
static List<int> _hebrewCodes = new List<int>
{
0xa0, // א
0xa1, // ב
@ -173,7 +173,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
0xa9, // י
0xaa, // ף
0xab, // מ
0xac, // ל
0xac, // ל
0xad, // ם
0xae, // מ
0xaf, // ן
@ -188,10 +188,10 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
0xb8, // ר
0xb9, // ש
0xba, // י
};
static List<string> _hebrewLetters = new List<string>
static List<string> _hebrewLetters = new List<string>
{
"א", // 0xa0
"ב", // 0xa1
@ -222,7 +222,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
"י", // 0xba
};
static List<int> _arabicCodes = new List<int> {
0xe081, //=أ
@ -574,7 +574,7 @@ namespace Nikse.SubtitleEdit.Logic.SubtitleFormats
p.EndTime = GetTimeCode(timeStartIndex + 5, buffer);
}
return p;
}
}
public static Encoding GetEncoding(int codePage)
{

2
src/Logic/Utilities.cs
View File

@ -494,7 +494,7 @@ namespace Nikse.SubtitleEdit.Logic
}
else if (couldBeUtf8 && fileName.ToLower().EndsWith(".xml") && Encoding.Default.GetString(buffer).ToLower().Replace("'", "\"").Contains("encoding=\"utf-8\""))
{ // keep utf-8 encoding for xml files with utf-8 in header (without any utf-8 encoded characters, but with only allowed utf-8 characters)
encoding = Encoding.UTF8;
encoding = Encoding.UTF8;
}
else if (Configuration.Settings.General.AutoGuessAnsiEncoding)
{