-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

InnoSetupScript/Custom_Messages.iss

@@ -133,6 +133,20 @@ it.tsk_ResetDictionaries=Reset Dictionaries and delete any custom names
 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
 nl.msg_SetupIsRunningWarning=Subtitle Edit Setup is already running!
 nl.msg_AppIsRunning=Subtitle Edit is running! Please close it before proceeding.

InnoSetupScript/Subtitle_Edit_installer.iss

@@ -18,16 +18,10 @@
 ;* along with Subtitle Edit.  If not, see <http://www.gnu.org/licenses/>.
 
 ; 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"
-
-#define VerMajor
-#define VerMinor
-#define VerBuild
-#define VerRevision
-
+; preprocessor checks
 #if VER < 0x05040200
   #error Update your Inno Setup version
 #endif
@@ -36,28 +30,35 @@
   #error Compile Subtitle Edit first
 #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)
 #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)
 
-#define app_web_site "http://www.nikse.dk/se/"
 #define installer_build_date GetDateTimeString('mmm, d yyyy', '', '')
 
 
 [Setup]
 AppID=SubtitleEdit
 AppCopyright=Copyright © 2001-2011, Nikse
-AppContact={#= app_web_site}
+AppContact=http://www.nikse.dk/se/
 AppName=Subtitle Edit
 AppVerName=Subtitle Edit v{#= simple_app_version}
 AppVersion={#= simple_app_version}
 AppPublisher=Nikse
-AppPublisherURL={#= app_web_site}
-AppSupportURL={#= app_web_site}
-AppUpdatesURL={#= app_web_site}
+AppPublisherURL=http://www.nikse.dk/se/
+AppSupportURL=http://www.nikse.dk/se/
+AppUpdatesURL=http://www.nikse.dk/se/
 UninstallDisplayName=Subtitle Edit v{#= simple_app_version}
 UninstallDisplayIcon={app}\SubtitleEdit.exe
 DefaultDirName={pf}\Subtitle Edit
@@ -99,6 +100,7 @@ Name: es; MessagesFile: compiler:Languages\Spanish.isl
 Name: fr; MessagesFile: compiler:Languages\French.isl
 Name: hu; MessagesFile: compiler:Languages\Hungarian.isl
 Name: it; MessagesFile: compiler:Languages\Italian.isl
+Name: ja; MessagesFile: compiler:Languages\Japanese.isl
 Name: nl; MessagesFile: compiler:Languages\Dutch.isl
 Name: pl; MessagesFile: compiler:Languages\Polish.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}\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\{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: {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: 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_user.xml
 Type: files;      Name: {app}\Dictionaries\dan_OCRFixReplaceList.xml
@@ -203,7 +205,7 @@ Type: files;      Name: {app}\Settings.xml
 
 [Run]
 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]

build.bat

@@ -84,10 +84,8 @@ IF "%PROGRAMFILES(x86)%zzz"=="zzz" (
   SET "U_=HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall"
 )
 
-SET "I_=Inno Setup"
-SET "A_=%I_% 5"
-FOR /f "delims=" %%a IN (
-  'REG QUERY "%U_%\%A_%_is1" /v "%I_%: App Path"2^>Nul^|FIND "REG_"') DO (
+FOR /F "delims=" %%a IN (
+  'REG QUERY "%U_%\Inno Setup 5_is1" /v "Inno Setup: App Path"2^>Nul^|FIND "REG_"') DO (
   SET "InnoSetupPath=%%a" & CALL :SubIS %%InnoSetupPath:*Z=%%)
 EXIT /B
 

src/SubtitleEdit.csproj

@@ -526,7 +526,6 @@
     <Compile Include="Logic\SubtitleFormats\UnknownSubtitle5.cs" />
     <Compile Include="Logic\SubtitleFormats\OpenDvt.cs" />
     <Compile Include="Logic\SubtitleFormats\AbcIViewer.cs" />
-    <Compile Include="Logic\SubtitleFormats\UnknownSubtitle6.cs" />
     <Compile Include="Logic\SubtitleFormats\YouTubeSbv.cs" />
     <Compile Include="Logic\SubtitleFormats\SubViewer10.cs" />
     <Compile Include="Logic\SubtitleFormats\TimedText.cs" />