mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 14:32:35 +01:00
-fix compilation
-add Japanese language in the installer -minor cleanup in build.bat git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@369 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
parent
92fc2bcaab
commit
b6315ab570
@ -133,6 +133,20 @@ it.tsk_ResetDictionaries=Reset Dictionaries and delete any custom names
|
|||||||
it.tsk_ResetSettings=Reset Subtitle Edit's settings
|
it.tsk_ResetSettings=Reset Subtitle Edit's settings
|
||||||
|
|
||||||
|
|
||||||
|
; Japanese
|
||||||
|
ja.msg_SetupIsRunningWarning=Subtitle Edit Setup is already running!
|
||||||
|
ja.msg_AppIsRunning=Subtitle Edit is running! Please close it before proceeding.
|
||||||
|
ja.msg_AskToDownNET=Subtitle Edit requires the .NET Framework 2.0. Please download and install the .NET Framework and run setup again. %n%nDo you want to download the .NET Framework 2.0 now?
|
||||||
|
ja.msg_DeleteSettings=Do you also want to delete Subtitle Edit's settings and any custom changes you made in the dictionaries? %n%nIf you plan on reinstalling Subtitle Edit you do not have to delete them.
|
||||||
|
ja.run_VisitWebsite=Visit Subtitle Edit's Website
|
||||||
|
ja.sm_com_Changelog=Subtitle Edit's Changelog
|
||||||
|
ja.tsk_AllUsers=For all users
|
||||||
|
ja.tsk_CurrentUser=For the current user only
|
||||||
|
ja.tsk_Other=Other:
|
||||||
|
ja.tsk_ResetDictionaries=Reset Dictionaries and delete any custom names
|
||||||
|
ja.tsk_ResetSettings=Reset Subtitle Edit's settings
|
||||||
|
|
||||||
|
|
||||||
; Dutch
|
; Dutch
|
||||||
nl.msg_SetupIsRunningWarning=Subtitle Edit Setup is already running!
|
nl.msg_SetupIsRunningWarning=Subtitle Edit Setup is already running!
|
||||||
nl.msg_AppIsRunning=Subtitle Edit is running! Please close it before proceeding.
|
nl.msg_AppIsRunning=Subtitle Edit is running! Please close it before proceeding.
|
||||||
|
@ -18,16 +18,10 @@
|
|||||||
;* along with Subtitle Edit. If not, see <http://www.gnu.org/licenses/>.
|
;* along with Subtitle Edit. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
; Requirements:
|
; Requirements:
|
||||||
; Inno Setup Unicode v5.4.1: http://www.jrsoftware.org/isdl.php
|
; Inno Setup Unicode: http://www.jrsoftware.org/isdl.php
|
||||||
|
|
||||||
|
|
||||||
#define installer_build_number "12"
|
; preprocessor checks
|
||||||
|
|
||||||
#define VerMajor
|
|
||||||
#define VerMinor
|
|
||||||
#define VerBuild
|
|
||||||
#define VerRevision
|
|
||||||
|
|
||||||
#if VER < 0x05040200
|
#if VER < 0x05040200
|
||||||
#error Update your Inno Setup version
|
#error Update your Inno Setup version
|
||||||
#endif
|
#endif
|
||||||
@ -36,28 +30,35 @@
|
|||||||
#error Compile Subtitle Edit first
|
#error Compile Subtitle Edit first
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
#define installer_build_number "13"
|
||||||
|
|
||||||
|
#define VerMajor
|
||||||
|
#define VerMinor
|
||||||
|
#define VerBuild
|
||||||
|
#define VerRevision
|
||||||
|
|
||||||
#expr ParseVersion("..\src\bin\Release\SubtitleEdit.exe", VerMajor, VerMinor, VerBuild, VerRevision)
|
#expr ParseVersion("..\src\bin\Release\SubtitleEdit.exe", VerMajor, VerMinor, VerBuild, VerRevision)
|
||||||
#define app_version str(VerMajor) + "." + str(VerMinor) + "." + str(VerBuild) + "." + str(VerRevision)
|
#define app_version str(VerMajor) + "." + str(VerMinor) + "." + str(VerBuild) + "." + str(VerRevision)
|
||||||
|
|
||||||
;the following simple_app_version is for 3 digit releases, one of the two must be uncommented at a time
|
; the following simple_app_version is for 3 digit releases, one of the two must be uncommented at a time
|
||||||
;#define simple_app_version str(VerMajor) + "." + str(VerMinor) + "." + str(VerBuild)
|
;#define simple_app_version str(VerMajor) + "." + str(VerMinor) + "." + str(VerBuild)
|
||||||
#define simple_app_version str(VerMajor) + "." + str(VerMinor)
|
#define simple_app_version str(VerMajor) + "." + str(VerMinor)
|
||||||
|
|
||||||
#define app_web_site "http://www.nikse.dk/se/"
|
|
||||||
#define installer_build_date GetDateTimeString('mmm, d yyyy', '', '')
|
#define installer_build_date GetDateTimeString('mmm, d yyyy', '', '')
|
||||||
|
|
||||||
|
|
||||||
[Setup]
|
[Setup]
|
||||||
AppID=SubtitleEdit
|
AppID=SubtitleEdit
|
||||||
AppCopyright=Copyright © 2001-2011, Nikse
|
AppCopyright=Copyright © 2001-2011, Nikse
|
||||||
AppContact={#= app_web_site}
|
AppContact=http://www.nikse.dk/se/
|
||||||
AppName=Subtitle Edit
|
AppName=Subtitle Edit
|
||||||
AppVerName=Subtitle Edit v{#= simple_app_version}
|
AppVerName=Subtitle Edit v{#= simple_app_version}
|
||||||
AppVersion={#= simple_app_version}
|
AppVersion={#= simple_app_version}
|
||||||
AppPublisher=Nikse
|
AppPublisher=Nikse
|
||||||
AppPublisherURL={#= app_web_site}
|
AppPublisherURL=http://www.nikse.dk/se/
|
||||||
AppSupportURL={#= app_web_site}
|
AppSupportURL=http://www.nikse.dk/se/
|
||||||
AppUpdatesURL={#= app_web_site}
|
AppUpdatesURL=http://www.nikse.dk/se/
|
||||||
UninstallDisplayName=Subtitle Edit v{#= simple_app_version}
|
UninstallDisplayName=Subtitle Edit v{#= simple_app_version}
|
||||||
UninstallDisplayIcon={app}\SubtitleEdit.exe
|
UninstallDisplayIcon={app}\SubtitleEdit.exe
|
||||||
DefaultDirName={pf}\Subtitle Edit
|
DefaultDirName={pf}\Subtitle Edit
|
||||||
@ -99,6 +100,7 @@ Name: es; MessagesFile: compiler:Languages\Spanish.isl
|
|||||||
Name: fr; MessagesFile: compiler:Languages\French.isl
|
Name: fr; MessagesFile: compiler:Languages\French.isl
|
||||||
Name: hu; MessagesFile: compiler:Languages\Hungarian.isl
|
Name: hu; MessagesFile: compiler:Languages\Hungarian.isl
|
||||||
Name: it; MessagesFile: compiler:Languages\Italian.isl
|
Name: it; MessagesFile: compiler:Languages\Italian.isl
|
||||||
|
Name: ja; MessagesFile: compiler:Languages\Japanese.isl
|
||||||
Name: nl; MessagesFile: compiler:Languages\Dutch.isl
|
Name: nl; MessagesFile: compiler:Languages\Dutch.isl
|
||||||
Name: pl; MessagesFile: compiler:Languages\Polish.isl
|
Name: pl; MessagesFile: compiler:Languages\Polish.isl
|
||||||
Name: ro; MessagesFile: Languages\Romanian.isl
|
Name: ro; MessagesFile: Languages\Romanian.isl
|
||||||
@ -160,7 +162,7 @@ Source: ..\Tesseract\tesseract.exe; DestDir: {app}\Tesseract;
|
|||||||
Name: {group}\Subtitle Edit; Filename: {app}\SubtitleEdit.exe; WorkingDir: {app}; Comment: Subtitle Edit v{#= simple_app_version}; AppUserModelID: Nikse.SubtitleEdit; IconFilename: {app}\SubtitleEdit.exe; IconIndex: 0
|
Name: {group}\Subtitle Edit; Filename: {app}\SubtitleEdit.exe; WorkingDir: {app}; Comment: Subtitle Edit v{#= simple_app_version}; AppUserModelID: Nikse.SubtitleEdit; IconFilename: {app}\SubtitleEdit.exe; IconIndex: 0
|
||||||
Name: {group}\Help and Support\Changelog; Filename: {app}\Changelog.txt; WorkingDir: {app}; Comment: {cm:sm_com_Changelog}
|
Name: {group}\Help and Support\Changelog; Filename: {app}\Changelog.txt; WorkingDir: {app}; Comment: {cm:sm_com_Changelog}
|
||||||
Name: {group}\Help and Support\Online Help; Filename: http://www.nikse.dk/se/Help.aspx
|
Name: {group}\Help and Support\Online Help; Filename: http://www.nikse.dk/se/Help.aspx
|
||||||
Name: {group}\Help and Support\{cm:ProgramOnTheWeb,Subtitle Edit}; Filename: {#= app_web_site}; Comment: {cm:ProgramOnTheWeb,Subtitle Edit}
|
Name: {group}\Help and Support\{cm:ProgramOnTheWeb,Subtitle Edit}; Filename: http://www.nikse.dk/se/; Comment: {cm:ProgramOnTheWeb,Subtitle Edit}
|
||||||
Name: {group}\{cm:UninstallProgram,Subtitle Edit}; Filename: {uninstallexe}; Comment: {cm:UninstallProgram,Subtitle Edit}; WorkingDir: {app}; IconFilename: {app}\uninstall.ico
|
Name: {group}\{cm:UninstallProgram,Subtitle Edit}; Filename: {uninstallexe}; Comment: {cm:UninstallProgram,Subtitle Edit}; WorkingDir: {app}; IconFilename: {app}\uninstall.ico
|
||||||
|
|
||||||
Name: {commondesktop}\Subtitle Edit; Filename: {app}\SubtitleEdit.exe; WorkingDir: {app}; Comment: Subtitle Edit v{#= simple_app_version}; AppUserModelID: Nikse.SubtitleEdit; IconFilename: {app}\SubtitleEdit.exe; IconIndex: 0; Tasks: desktopicon\common
|
Name: {commondesktop}\Subtitle Edit; Filename: {app}\SubtitleEdit.exe; WorkingDir: {app}; Comment: Subtitle Edit v{#= simple_app_version}; AppUserModelID: Nikse.SubtitleEdit; IconFilename: {app}\SubtitleEdit.exe; IconIndex: 0; Tasks: desktopicon\common
|
||||||
@ -175,7 +177,7 @@ Type: files; Name: {commondesktop}\Subtitle Edit.lnk; Check: NOT IsT
|
|||||||
Type: files; Name: {userappdata}\Subtitle Edit\Settings.xml; Tasks: reset_settings
|
Type: files; Name: {userappdata}\Subtitle Edit\Settings.xml; Tasks: reset_settings
|
||||||
Type: dirifempty; Name: {userappdata}\Subtitle Edit; Tasks: reset_settings
|
Type: dirifempty; Name: {userappdata}\Subtitle Edit; Tasks: reset_settings
|
||||||
|
|
||||||
;remove old files from the {app} dir
|
; remove old files from the {app} dir
|
||||||
Type: files; Name: {app}\Dictionaries\da_DK_names_etc.xml
|
Type: files; Name: {app}\Dictionaries\da_DK_names_etc.xml
|
||||||
Type: files; Name: {app}\Dictionaries\da_DK_user.xml
|
Type: files; Name: {app}\Dictionaries\da_DK_user.xml
|
||||||
Type: files; Name: {app}\Dictionaries\dan_OCRFixReplaceList.xml
|
Type: files; Name: {app}\Dictionaries\dan_OCRFixReplaceList.xml
|
||||||
@ -202,8 +204,8 @@ Type: files; Name: {app}\Settings.xml
|
|||||||
|
|
||||||
|
|
||||||
[Run]
|
[Run]
|
||||||
Filename: {app}\SubtitleEdit.exe; Description: {cm:LaunchProgram,Subtitle Edit}; WorkingDir: {app}; Flags: nowait postinstall skipifsilent runascurrentuser unchecked
|
Filename: {app}\SubtitleEdit.exe; Description: {cm:LaunchProgram,Subtitle Edit}; WorkingDir: {app}; Flags: nowait postinstall skipifsilent runascurrentuser unchecked
|
||||||
Filename: {#= app_web_site}; Description: {cm:run_VisitWebsite}; Flags: nowait postinstall skipifsilent shellexec runascurrentuser unchecked
|
Filename: http://www.nikse.dk/se/; Description: {cm:run_VisitWebsite}; Flags: nowait postinstall skipifsilent shellexec runascurrentuser unchecked
|
||||||
|
|
||||||
|
|
||||||
[Code]
|
[Code]
|
||||||
|
@ -84,10 +84,8 @@ IF "%PROGRAMFILES(x86)%zzz"=="zzz" (
|
|||||||
SET "U_=HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall"
|
SET "U_=HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall"
|
||||||
)
|
)
|
||||||
|
|
||||||
SET "I_=Inno Setup"
|
FOR /F "delims=" %%a IN (
|
||||||
SET "A_=%I_% 5"
|
'REG QUERY "%U_%\Inno Setup 5_is1" /v "Inno Setup: App Path"2^>Nul^|FIND "REG_"') DO (
|
||||||
FOR /f "delims=" %%a IN (
|
|
||||||
'REG QUERY "%U_%\%A_%_is1" /v "%I_%: App Path"2^>Nul^|FIND "REG_"') DO (
|
|
||||||
SET "InnoSetupPath=%%a" & CALL :SubIS %%InnoSetupPath:*Z=%%)
|
SET "InnoSetupPath=%%a" & CALL :SubIS %%InnoSetupPath:*Z=%%)
|
||||||
EXIT /B
|
EXIT /B
|
||||||
|
|
||||||
|
@ -526,7 +526,6 @@
|
|||||||
<Compile Include="Logic\SubtitleFormats\UnknownSubtitle5.cs" />
|
<Compile Include="Logic\SubtitleFormats\UnknownSubtitle5.cs" />
|
||||||
<Compile Include="Logic\SubtitleFormats\OpenDvt.cs" />
|
<Compile Include="Logic\SubtitleFormats\OpenDvt.cs" />
|
||||||
<Compile Include="Logic\SubtitleFormats\AbcIViewer.cs" />
|
<Compile Include="Logic\SubtitleFormats\AbcIViewer.cs" />
|
||||||
<Compile Include="Logic\SubtitleFormats\UnknownSubtitle6.cs" />
|
|
||||||
<Compile Include="Logic\SubtitleFormats\YouTubeSbv.cs" />
|
<Compile Include="Logic\SubtitleFormats\YouTubeSbv.cs" />
|
||||||
<Compile Include="Logic\SubtitleFormats\SubViewer10.cs" />
|
<Compile Include="Logic\SubtitleFormats\SubViewer10.cs" />
|
||||||
<Compile Include="Logic\SubtitleFormats\TimedText.cs" />
|
<Compile Include="Logic\SubtitleFormats\TimedText.cs" />
|
||||||
|
Loading…
Reference in New Issue
Block a user