[matroska] r1159 - in trunk/MatroskaPack/Satsuki: . langs

[email protected] Tue, 10 May 2005 19:30:48 +0400 (MSD)
Newsgroups gmane.comp.multimedia.matroska.cvs
Message-ID <[email protected]>
Author: robux4
Date: 2005-05-10 19:30:44 +0400 (Tue, 10 May 2005)
New Revision: 1159

Added:
   trunk/MatroskaPack/Satsuki/langs/ru.nsh
Modified:
   trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi
   trunk/MatroskaPack/Satsuki/Matroska_Pack_Lite.nsi
   trunk/MatroskaPack/Satsuki/langs/en.nsh
   trunk/MatroskaPack/Satsuki/langs/fr.nsh
   trunk/MatroskaPack/Satsuki/todo.txt
Log:
Pack: beta 4
- add russian to the installer (thanks to slipstream)
- finer uninstallation
- disable MSE by default
- better shortcuts for Win98


Modified: trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi
===================================================================
--- trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi	2005-05-10 08:58:43 UTC (rev 1158)
+++ trunk/MatroskaPack/Satsuki/Matroska_Pack_Full.nsi	2005-05-10 15:30:44 UTC (rev 1159)
@@ -12,7 +12,7 @@
 !include "MUI.nsh"
 !include "sections.nsh"
 Name "Matroska Pack"
-OutFile "Matroska_Pack_Full_v1.1.0b3.exe"
+OutFile "Matroska_Pack_Full_v1.1.0b4.exe"
 InstallDir "$PROGRAMFILES\Matroska Pack"
 InstallDirRegKey HKCU "Software\Matroska Pack" ""
 Var MUI_TEMP
@@ -49,12 +49,13 @@
 
 !insertmacro MUI_LANGUAGE "English"
 !insertmacro MUI_LANGUAGE "French"
+!insertmacro MUI_LANGUAGE "Russian"
 
 ;--------------------------------
 ;Version Information
 
-  VIProductVersion "1.1.0.2"
-  VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Matroska Pack 1.1.0 Beta 3"
+  VIProductVersion "1.1.0.4"
+  VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Matroska Pack 1.1.0 Beta 4"
   VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "Matroska.org"
 ;  VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" "Test Application is a trademark of Fake company"
 
@@ -62,6 +63,7 @@
 
 !include "langs\en.nsh"
 !include "langs\fr.nsh"
+!include "langs\ru.nsh"
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;
@@ -109,7 +111,7 @@
 section "-desinstallversion"
 	ReadRegStr $R1 HKCU "Software\Matroska Pack" ""
 	IfFileExists "$R1\uninstall.exe" desinstallpack suiteinstall
-	desinstallpack:
+  desinstallpack:
 	ExecWait '"$R1\uninstall.exe" /S _?=$R7' 
 	suiteinstall:
 	WriteRegStr HKCU "Software\Matroska Pack" "" $INSTDIR
@@ -177,7 +179,6 @@
    WriteRegStr HKCR "$1" "backupcommand" $0
 	WriteRegStr HKCR "$1" "" $1
 	WriteRegStr HKCR "$1\shell" "" "open"
-; let MatroskaProp do it	WriteRegStr HKCR "$1\DefaultIcon" "" "$INSTDIR\MatroskaProp\MatroskaProp.dll,1"
 
 	readregstr $3 HKCR ".avi" ""
 	readregstr $2 HKCR "$3\shell\open\command" ""
@@ -203,7 +204,7 @@
         AddSize 495
         file "elements\MatroskaSplitter.exe"
         execwait '"$INSTDIR\provo\MatroskaSplitter.exe" /S /NCRC /D=$INSTDIR\haali'
-        WriteRegStr HKCR "Media Type\Extensions\.mkv" "Source Filter" "{55DA30FC-F16B-49FC-BAA5-AE59FC65F82D}"
+;        WriteRegStr HKCR "Media Type\Extensions\.mkv" "Source Filter" "{55DA30FC-F16B-49FC-BAA5-AE59FC65F82D}"
         WriteRegdword HKCU "Software\Haali\Matroska Splitter" "vsfilter.autoload" "00000001"
         delete "$INSTDIR\provo\MatroskaSplitter.exe"
         SetShellVarContext "all"
@@ -357,21 +358,20 @@
 	regdll "$INSTDIR\TTADSSplitter.ax"
 sectionend
 
-section "Matroska Shell Extension" SecMSE
-	SetOutPath "$INSTDIR"
-	file "elements\MatroskaProp\*.*"
-	SetOutPath "$SYSDIR"
-    AddSize 1860
-	file "elements\unicows.dll"
-	regdll "$INSTDIR\MatroskaProp.dll"
-sectionend
-
 section "!MatroskaDiag" SecDiag
 	SetOutPath "$INSTDIR\MatroskaDiag"
     AddSize 253
 	file "elements\MatroskaDiag.exe"
 sectionend
 
+section /o "Matroska Shell Extension" SecMSE
+	SetOutPath "$INSTDIR\provo"
+    AddSize 1860
+    file "elements\MatroskaProp.exe"
+    execwait '"$INSTDIR\provo\MatroskaProp.exe" /S /NCRC /D=$INSTDIR\MSE'
+    delete "$INSTDIR\provo\MatroskaProp.exe"
+sectionend
+
 section "MKVMuxer" SecMuxer
 	Unregdll "MatroskaMuxer.ax"
 	SetOutPath "$INSTDIR"
@@ -395,13 +395,16 @@
 	file "elements\matroska.ico"
 	!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
 	    CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
-	    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Haali Media Splitter.lnk" rundll32.exe '"$INSTDIR\haali\splitter.ax",Configure' "$INSTDIR\haali\splitter.ax" 0 "" "" $(SecShortHaali)
+    	SetOutPath "$INSTDIR\haali"
+	    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Haali Media Splitter.lnk" rundll32.exe "splitter.ax,Configure" "$INSTDIR\haali\splitter.ax" 0 "" "" $(SecShortHaali)
+    	SetOutPath "$INSTDIR\MatroskaDiag"
 	    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\MatroskaDiag.lnk" "$INSTDIR\MatroskaDiag\MatroskaDiag.exe" "" "" "" "" "" $(SecShortDiag)
-	    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Matroska Prop.lnk" "$INSTDIR\MatroskaProp_Configure.exe" "" "$INSTDIR\MatroskaProp.dll" 0 "" "" $(SecShortMSE)
-	    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Matroska Icon.lnk" "$INSTDIR\MatroskaProp_ChooseIcon.exe" "" "$INSTDIR\MatroskaProp.dll" 1 "" "" $(SecShortIcon)
-	    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\VSFilter.lnk" rundll32.exe '"$INSTDIR\vsfilter.dll",DirectVobSub' "$INSTDIR\icones\vobsub.ico" 0 "" "" $(SecShortSubs)
-	    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\FFdshow.lnk" rundll32.exe '"$INSTDIR\ffdshow\ffdshow.ax",configure' "$INSTDIR\icones\ffdico.ico" 0 "" "" "Video codec"
-	    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\FFdshow Audio.lnk" rundll32.exe '"$INSTDIR\ffdshow\ffdshow.ax",configureAudio' "$INSTDIR\icones\ffdico.ico" 0 "" "" "Audio codec"
+    	SetOutPath "$INSTDIR"
+	    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\VSFilter.lnk" rundll32.exe "vsfilter.dll,DirectVobSub" "$INSTDIR\icones\vobsub.ico" 0 "" "" $(SecShortSubs)
+    	SetOutPath "$INSTDIR\ffdshow"
+	    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\FFdshow.lnk" rundll32.exe "ffdshow.ax,configure" "$INSTDIR\icones\ffdico.ico" 0 "" "" "Video codec"
+	    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\FFdshow Audio.lnk" rundll32.exe "ffdshow.ax,configureAudio" "$INSTDIR\icones\ffdico.ico" 0 "" "" "Audio codec"
+    	SetOutPath "$INSTDIR"
 	    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\$(SecShortUninstall).lnk" "$INSTDIR\Uninstall.exe" "" "" "" "" "" $(SecShortUninstall)
 	!insertmacro MUI_STARTMENU_WRITE_END
 sectionend
@@ -444,13 +447,15 @@
 
 Section "Uninstall"
 
-	ExecWait '"$INSTDIR\filtres\haali\uninstall.exe" /S _?=$INSTDIR\filtres\haali'
-    WriteRegStr HKCR "Media Type\{e436eb83-524f-11ce-9f53-0020af0ba770}\{49952F4C-3EDC-4A9B-8906-1DE02A3D4BC2}" "3" ""
-    WriteRegStr HKCR "Media Type\{e436eb83-524f-11ce-9f53-0020af0ba770}\{49952F4C-3EDC-4A9B-8906-1DE02A3D4BC2}" "3" ""
-	deleteregkey HKCR "Media Type\Extensions\.mkv\Source Filter"
-	deleteregkey HKCU "Software\Haali\Matroska Splitter\vsfilter.autoload"
+	ExecWait '"$INSTDIR\filtres\uninstall.exe" /S _?=$INSTDIR\haali'
+    DeleteRegValue  HKCR "Media Type\{e436eb83-524f-11ce-9f53-0020af0ba770}\{49952F4C-3EDC-4A9B-8906-1DE02A3D4BC2}" "2"
+    DeleteRegValue  HKCR "Media Type\{e436eb83-524f-11ce-9f53-0020af0ba770}\{49952F4C-3EDC-4A9B-8906-1DE02A3D4BC2}" "3"
+;	DeleteRegValue  HKCR "Media Type\Extensions\.mkv" "Source Filter"
+;	deleteregkey HKCU "Software\Haali\Matroska Splitter\vsfilter.autoload"
 
-	Unregdll "$INSTDIR\ffdshow.ax"
+	ExecWait '"$INSTDIR\MSE\MatroskaProp-uninstall.exe" /S _?=$INSTDIR\MSE'
+
+	Unregdll "$INSTDIR\ffdshow\ffdshow.ax"
 	deleteregkey HKCU "SOFTWARE\GNU\ffdshow"
 
 	Unregdll "$INSTDIR\GplMpgDec.ax"
@@ -467,13 +472,11 @@
 
 	Unregdll "$INSTDIR\VSFilter.dll"
 
-	Unregdll "$INSTDIR\MatroskaProp.dll"
-
 	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Matroska Pack"
-	RMDir /r "$INSTDIR\ffdshow"
-	RMDir /r "$INSTDIR\haali"
-	RMDir /r "$INSTDIR\icones"
-	RMDir /r "$INSTDIR"
+	RMDir /r /REBOOTOK "$INSTDIR\ffdshow"
+;	RMDir /r "$INSTDIR\haali"
+	RMDir /r /REBOOTOK "$INSTDIR\icones"
+	RMDir /r /REBOOTOK "$INSTDIR"
 	!insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP 
 	  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
 	StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"

Modified: trunk/MatroskaPack/Satsuki/Matroska_Pack_Lite.nsi
===================================================================
--- trunk/MatroskaPack/Satsuki/Matroska_Pack_Lite.nsi	2005-05-10 08:58:43 UTC (rev 1158)
+++ trunk/MatroskaPack/Satsuki/Matroska_Pack_Lite.nsi	2005-05-10 15:30:44 UTC (rev 1159)
@@ -12,7 +12,7 @@
 !include "MUI.nsh"
 !include "sections.nsh"
 Name "Matroska Pack"
-OutFile "Matroska_Pack_Lite_v1.1.0b3.exe"
+OutFile "Matroska_Pack_Lite_v1.1.0b4.exe"
 InstallDir "$PROGRAMFILES\Matroska Pack"
 InstallDirRegKey HKCU "Software\Matroska Pack" ""
 Var MUI_TEMP
@@ -49,12 +49,13 @@
 
 !insertmacro MUI_LANGUAGE "English"
 !insertmacro MUI_LANGUAGE "French"
+!insertmacro MUI_LANGUAGE "Russian"
 
 ;--------------------------------
 ;Version Information
 
-  VIProductVersion "1.1.0.2"
-  VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Matroska Pack 1.1.0 Beta 3"
+  VIProductVersion "1.1.0.4"
+  VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Matroska Pack 1.1.0 Beta 4"
   VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "Matroska.org"
 ;  VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" "Test Application is a trademark of Fake company"
 
@@ -62,6 +63,7 @@
 
 !include "langs\en.nsh"
 !include "langs\fr.nsh"
+!include "langs\ru.nsh"
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;
@@ -109,7 +111,7 @@
 section "-desinstallversion"
 	ReadRegStr $R1 HKCU "Software\Matroska Pack" ""
 	IfFileExists "$R1\uninstall.exe" desinstallpack suiteinstall
-	desinstallpack:
+  desinstallpack:
 	ExecWait '"$R1\uninstall.exe" /S _?=$R7' 
 	suiteinstall:
 	WriteRegStr HKCU "Software\Matroska Pack" "" $INSTDIR
@@ -191,10 +193,10 @@
 ;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-section "-iconetassoc"
-	!insertmacro Associate "mka"
-	!insertmacro Associate "mkv"
-sectionend
+;section "-iconetassoc"
+;	!insertmacro Associate "mka"
+;	!insertmacro Associate "mkv"
+;sectionend
 
 sectiongroup "!Haali Media Splitter" SecHaali
     Section "!Matroska" SecHaaliMkv
@@ -202,7 +204,7 @@
         AddSize 495
         file "elements\MatroskaSplitter.exe"
         execwait '"$INSTDIR\provo\MatroskaSplitter.exe" /S /NCRC /D=$INSTDIR\haali'
-        WriteRegStr HKCR "Media Type\Extensions\.mkv" "Source Filter" "{55DA30FC-F16B-49FC-BAA5-AE59FC65F82D}"
+;        WriteRegStr HKCR "Media Type\Extensions\.mkv" "Source Filter" "{55DA30FC-F16B-49FC-BAA5-AE59FC65F82D}"
         WriteRegdword HKCU "Software\Haali\Matroska Splitter" "vsfilter.autoload" "00000001"
         delete "$INSTDIR\provo\MatroskaSplitter.exe"
         SetShellVarContext "all"
@@ -247,6 +249,12 @@
 	regdll "$INSTDIR\WavPackDSSplitter.ax"
 sectionend
 
+section "!MatroskaDiag" SecDiag
+	SetOutPath "$INSTDIR\MatroskaDiag"
+    AddSize 253
+	file "elements\MatroskaDiag.exe"
+sectionend
+
 section "MKVMuxer" SecMuxer
 	Unregdll "MatroskaMuxer.ax"
 	SetOutPath "$INSTDIR"
@@ -270,8 +278,10 @@
 	file "elements\matroska.ico"
 	!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
 	    CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
-	    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Haali Media Splitter.lnk" rundll32.exe '"$INSTDIR\haali\splitter.ax",Configure' "$INSTDIR\haali\splitter.ax" 0 "" "" $(SecShortHaali)
-	    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\VSFilter.lnk" rundll32.exe '"$INSTDIR\vsfilter.dll",DirectVobSub' "$INSTDIR\icones\vobsub.ico" 0 "" "" $(SecShortSubs)
+    	SetOutPath "$INSTDIR\haali"
+	    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Haali Media Splitter.lnk" rundll32.exe "splitter.ax,Configure" "$INSTDIR\haali\splitter.ax" 0 "" "" $(SecShortHaali)
+    	SetOutPath "$INSTDIR"
+	    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\VSFilter.lnk" rundll32.exe "vsfilter.dll,DirectVobSub" "$INSTDIR\icones\vobsub.ico" 0 "" "" $(SecShortSubs)
 	    CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\$(SecShortUninstall).lnk" "$INSTDIR\Uninstall.exe" "" "" "" "" "" $(SecShortUninstall)
 	!insertmacro MUI_STARTMENU_WRITE_END
 sectionend
@@ -290,11 +300,11 @@
 
 Section "Uninstall"
 
-	ExecWait '"$INSTDIR\filtres\haali\uninstall.exe" /S _?=$INSTDIR\filtres\haali'
-    WriteRegStr HKCR "Media Type\{e436eb83-524f-11ce-9f53-0020af0ba770}\{49952F4C-3EDC-4A9B-8906-1DE02A3D4BC2}" "3" ""
-    WriteRegStr HKCR "Media Type\{e436eb83-524f-11ce-9f53-0020af0ba770}\{49952F4C-3EDC-4A9B-8906-1DE02A3D4BC2}" "3" ""
-	deleteregkey HKCR "Media Type\Extensions\.mkv\Source Filter"
-	deleteregkey HKCU "Software\Haali\Matroska Splitter\vsfilter.autoload"
+	ExecWait '"$INSTDIR\filtres\uninstall.exe" /S _?=$INSTDIR\haali'
+    DeleteRegValue  HKCR "Media Type\{e436eb83-524f-11ce-9f53-0020af0ba770}\{49952F4C-3EDC-4A9B-8906-1DE02A3D4BC2}" "2"
+    DeleteRegValue  HKCR "Media Type\{e436eb83-524f-11ce-9f53-0020af0ba770}\{49952F4C-3EDC-4A9B-8906-1DE02A3D4BC2}" "3"
+;	DeleteRegValue  HKCR "Media Type\Extensions\.mkv" "Source Filter"
+;	deleteregkey HKCU "Software\Haali\Matroska Splitter\vsfilter.autoload"
 
 	Unregdll "$INSTDIR\MatroskaMuxer.ax"
 
@@ -304,9 +314,9 @@
 	Unregdll "$INSTDIR\VSFilter.dll"
 
 	DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Matroska Pack"
-	RMDir /r "$INSTDIR\haali"
-	RMDir /r "$INSTDIR\icones"
-	RMDir /r "$INSTDIR"
+;	RMDir /r "$INSTDIR\haali"
+	RMDir /r /REBOOTOK "$INSTDIR\icones"
+	RMDir /r /REBOOTOK "$INSTDIR"
 	!insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP 
 	  Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
 	StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"

Modified: trunk/MatroskaPack/Satsuki/langs/en.nsh
===================================================================
--- trunk/MatroskaPack/Satsuki/langs/en.nsh	2005-05-10 08:58:43 UTC (rev 1158)
+++ trunk/MatroskaPack/Satsuki/langs/en.nsh	2005-05-10 15:30:44 UTC (rev 1159)
@@ -1,7 +1,7 @@
 LangString SecCheckUpdates     ${LANG_ENGLISH} "Check for updates online"
 
 LangString SeccompletedName    ${LANG_ENGLISH} "Installation finished"
-LangString SecinstallName      ${LANG_ENGLISH} "Installation of Matroska Pack 1.1.0 Beta 3"
+LangString SecinstallName      ${LANG_ENGLISH} "Installation of Matroska Pack 1.1.0 Beta 4"
 LangString SecdescName         ${LANG_ENGLISH} "Select the components you want to install"
 LangString SecverifversionName ${LANG_ENGLISH} "Your version of Matroska Pack isn't up to date$\nDo you want to visit packs.matroska.org to download the latest version ?"
 LangString SecrealName         ${LANG_ENGLISH} "Your system doesn't seems to have RealNetwork DLL installed$\nWithout them you won't be able to play RealVideo in mkv files$\nDo you want to download RealAlternative to install those dll ?"
@@ -27,7 +27,7 @@
 LangString SecSecMuxer         ${LANG_ENGLISH} "v1.0.0.9$\nCapture video to matroska files"
 
 
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.1.0 b2"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "1.1.0 b4"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Matroska Pack"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "© 2005 Matroska.org"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "Include the necessary Directshow filters and Windows utilities to use Matroska files"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "Includes the necessary Directshow filters and Windows utilities to use Matroska files"

Modified: trunk/MatroskaPack/Satsuki/langs/fr.nsh
===================================================================
--- trunk/MatroskaPack/Satsuki/langs/fr.nsh	2005-05-10 08:58:43 UTC (rev 1158)
+++ trunk/MatroskaPack/Satsuki/langs/fr.nsh	2005-05-10 15:30:44 UTC (rev 1159)
@@ -1,8 +1,8 @@
 LangString SecCheckUpdates     ${LANG_FRENCH} "Vérifier les mises à jour en ligne"
 
 LangString SeccompletedName    ${LANG_FRENCH} "Installation terminée"
-LangString SecinstallName      ${LANG_FRENCH} "Installation du Matroska Pack 1.1.0 Beta 3"
-LangString SecdescName         ${LANG_FRENCH} "Selectionnez les éléments que vous désirez"
+LangString SecinstallName      ${LANG_FRENCH} "Installation du Matroska Pack 1.1.0 Beta 4"
+LangString SecdescName         ${LANG_FRENCH} "Sélectionnez les éléments que vous désirez"
 LangString SecverifversionName ${LANG_FRENCH} "Votre version du Matroska Pack n'est pas à jour$\nVoulez vous visiter packs.matroska.org pour téléchager la dernière version ?"
 LangString SecrealName         ${LANG_FRENCH} "Votre système ne semble pas avoir des DLL RealNetwork installées$\nSans ces DLL vous ne pourrez pas lire les mkv contenant un flux RealVideo$\nVoulez vous télécharger RealAlternative pour installer ces DLL ?"
 
@@ -27,7 +27,7 @@
 LangString SecSecMuxer         ${LANG_FRENCH} "v1.0.0.9$\nCrée des fichiers matroska (utile pour la capture video)"
 
 
-VIAddVersionKey /LANG=${LANG_FRENCH} "FileVersion" "1.1.0 b2"
+VIAddVersionKey /LANG=${LANG_FRENCH} "FileVersion" "1.1.0 b4"
 VIAddVersionKey /LANG=${LANG_FRENCH} "FileDescription" "Matroska Pack"
 VIAddVersionKey /LANG=${LANG_FRENCH} "LegalCopyright" "© 2005 Matroska.org"
 VIAddVersionKey /LANG=${LANG_FRENCH} "Comments" "Inclus les filtres Directshow et utilitaires pour utiliser les fichiers Matroska sous Windows"

Added: trunk/MatroskaPack/Satsuki/langs/ru.nsh
===================================================================
--- trunk/MatroskaPack/Satsuki/langs/ru.nsh	2005-05-10 08:58:43 UTC (rev 1158)
+++ trunk/MatroskaPack/Satsuki/langs/ru.nsh	2005-05-10 15:30:44 UTC (rev 1159)
@@ -0,0 +1,39 @@
+;;  Russian language strings for MatroskaPack installer
+;;  Codepage: cp1251
+;;
+;;  Author: Maxim Ryazanov <[email protected]>
+;;  Version: 2005.05.10/2
+
+LangString SecCheckUpdates     ${LANG_RUSSIAN} "Ïðîâåðèòü íàëè÷èå áîëåå íîâîé âåðñèè?" 
+
+LangString SeccompletedName    ${LANG_RUSSIAN} "Óñòàíîâêà çàâåðøåíà" 
+LangString SecinstallName      ${LANG_RUSSIAN} "Óñòàíîâêà Matroska Pack 1.1.0 Beta 4" 
+LangString SecdescName         ${LANG_RUSSIAN} "Âûáåðèòå êîìïîíåíòû, êîòîðûå Âû õîòèòå óñòàíîâèòü" 
+LangString SecverifversionName ${LANG_RUSSIAN} "Âàøà âåðñèÿ Matroska Pack óñòàðåëà$\nÕîòèòå ëè ïîñåòèòü packs.matroska.org, ÷òîáû ñêà÷àòü áîëåå íîâóþ âåðñèþ?" 
+LangString SecrealName         ${LANG_RUSSIAN} " Âàøåé ñèñòåìå íå îáíàðóæåíà RealNetwork DLL$\nÁåç íå¸ ó âàñ íå áóäåò âîçìîæíîñòè âîñïðîèçâîäèòü RealVideo â mkv ôàéëàõ$\nÕîòèòå ëè ñêà÷àòü RealAlternative äëÿ óñòàíîâêè ýòîé dll?" 
+
+LangString SecShortHaali       ${LANG_RUSSIAN} "Îñíîâíûå íàñòðîéêè âîñïðîèçâåäåíèÿ" 
+LangString SecShortDiag        ${LANG_RUSSIAN} "Äèàãíîñòèêà âîçìîæíûõ ïðîáëåì" 
+LangString SecShortSubs        ${LANG_RUSSIAN} "Ñóáòèòðû"
+LangString SecShortIcon        ${LANG_RUSSIAN} "Íàñòðîéêà èêîíêè äëÿ ôàéëîâ matroska"
+LangString SecShortMSE         ${LANG_RUSSIAN} "Íàñòðîéêà ðàñøèðåíèÿ Windows-ïðîâîäíèêà"
+LangString SecShortUninstall   ${LANG_RUSSIAN} "Äåèíñòàëëÿöèÿ Matroska Pack" 
+
+LangString SecSecHaali         ${LANG_RUSSIAN} "DirectShow ôèëüòð, íåîáõîäèì äëÿ âîñïðîèçâåäåíèÿ$\nÂåðñèÿ: v03-05-2005"
+LangString SecSecHaaliMkv      ${LANG_RUSSIAN} "ïîääåðæêà Matroska" 
+LangString SecSecHaaliMp4      ${LANG_RUSSIAN} "ïîääåðæêà MP4 (ôîðìàò ñîâìåñòèì ñ NeroDigital)"
+LangString SecSecHaaliAvi      ${LANG_RUSSIAN} "ïîääåðæêà AVI è DIVX"
+LangString SecSecFFDShow       ${LANG_RUSSIAN} "Êîìïëåêò àóäèî/âèäåî êîäåêîâ$\n(òîëüêî äåêîäåðû)$\nÂåðñèÿ: v03-04-2005" 
+LangString SecSecVSFilter      ${LANG_RUSSIAN} "Ôèëüòð ñóáòèòðîâ$\nÂåðñèÿ: v1.0.1.2" 
+LangString SecSecGabestMPEG2   ${LANG_RUSSIAN} "Äåêîäåð MPEG2 àâòîðñòâà Gabest (íà îñíîâå libmpeg2)$\nÂåðñèÿ: v0.1.2.0" 
+LangString SecSecWavpack       ${LANG_RUSSIAN} "Áåñïîòåðüíûé/ãèáðèäíûé àóäèî êîäåê (äåêîäåð + ñïëèòòåð)$\nÂåðñèÿ: v1.0.0.287" 
+LangString SecSecTTA           ${LANG_RUSSIAN} "Áåñïîòåðüíûé àóäèî êîäåê (äåêîäåð + ñïëèòòåð)$\nÂåðñèÿ: v1.0.0.203"
+LangString SecSecMSE           ${LANG_RUSSIAN} "Èíñòðóìåíòàðèé äëÿ ðàáîòû ñ ôàéëàìè matroska â Windows-ïðîâîäíèêå$\nÂåðñèÿ: v2.8"
+LangString SecSecDiag          ${LANG_RUSSIAN} "Óòèëèòà äèàãíîñòèêè íåèñïðàâíîñòåé âîñïðîèçâåäåíèÿ$\nÂåðñèÿ: v1.0.0.59" 
+LangString SecSecMuxer         ${LANG_RUSSIAN} "DirectShow ôèëüòð, äëÿ çàïèñè âèäåî â ôîðìàòå matroska$\nÂåðñèÿ: v1.0.0.9" 
+
+
+VIAddVersionKey /LANG=${LANG_RUSSIAN} "FileVersion" "1.1.0 b4"
+VIAddVersionKey /LANG=${LANG_RUSSIAN} "FileDescription" "Matroska Pack"
+VIAddVersionKey /LANG=${LANG_RUSSIAN} "LegalCopyright" "© 2005 Matroska.org"
+VIAddVersionKey /LANG=${LANG_RUSSIAN} "Comments" "Ñîäåðæèò íåîáõîäèìûå DirectShow ôèëüòðû è óòèëèòû äëÿ âîñïðîèçâåäåíèÿ ôàéëîâ â ôîðìàòå matroska" ; "Include the necessary Directshow filters and Windows utilities to use Matroska files"

Modified: trunk/MatroskaPack/Satsuki/todo.txt
===================================================================
--- trunk/MatroskaPack/Satsuki/todo.txt	2005-05-10 08:58:43 UTC (rev 1158)
+++ trunk/MatroskaPack/Satsuki/todo.txt	2005-05-10 15:30:44 UTC (rev 1159)
@@ -1,4 +1,3 @@
-+install MSE from the original EXE
 +more languages
 +fix windows 98
-+clean uninstallation
\ No newline at end of file
++pbs with unstalling/uninstalling MSE when it's loaded in memory
\ No newline at end of file