Changeset 139 for smplayer/trunk/setup

Timestamp:

Dec 3, 2012, 7:05:11 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to 0.8.2

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• setup/contrib (copied) (copied from smplayer/vendor/current/setup/contrib )
• setup/contrib/smplayer.full.nsi (copied) (copied from smplayer/vendor/current/setup/contrib/smplayer.full.nsi )
• setup/license.txt (copied) (copied from smplayer/vendor/current/setup/license.txt )
• setup/sample.avi (copied) (copied from smplayer/vendor/current/setup/sample.avi )
• setup/scripts/install_smplayer.cmd (modified) (3 diffs)
• setup/scripts/make_pkgs.cmd (modified) (5 diffs)
• setup/smplayer.nsi (modified) (15 diffs)
• setup/translations/basque.nsh (modified) (3 diffs)
• setup/translations/catalan.nsh (modified) (2 diffs)
• setup/translations/croatian.nsh (modified) (2 diffs)
• setup/translations/czech.nsh (modified) (2 diffs)
• setup/translations/danish.nsh (modified) (2 diffs)
• setup/translations/dutch.nsh (modified) (2 diffs)
• setup/translations/english.nsh (modified) (2 diffs)
• setup/translations/finnish.nsh (modified) (2 diffs)
• setup/translations/french.nsh (modified) (2 diffs)
• setup/translations/german.nsh (modified) (2 diffs)
• setup/translations/hebrew.nsh (modified) (2 diffs)
• setup/translations/hungarian.nsh (modified) (2 diffs)
• setup/translations/italian.nsh (modified) (2 diffs)
• setup/translations/japanese.nsh (modified) (2 diffs)
• setup/translations/korean.nsh (modified) (2 diffs)
• setup/translations/norwegian.nsh (modified) (2 diffs)
• setup/translations/polish.nsh (modified) (2 diffs)
• setup/translations/portuguese.nsh (modified) (4 diffs)
• setup/translations/russian.nsh (modified) (2 diffs)
• setup/translations/simpchinese.nsh (modified) (3 diffs)
• setup/translations/slovak.nsh (modified) (2 diffs)
• setup/translations/slovenian.nsh (modified) (2 diffs)
• setup/translations/spanish.nsh (modified) (3 diffs)
• setup/translations/tradchinese.nsh (modified) (2 diffs)

smplayer/trunk/setup/scripts/install_smplayer.cmd

@@ -14 +14 @@
 set SMTUBE_DIR=svn\smtube
 set SMPLAYER_THEMES_DIR=svn\smplayer-themes
+set SMPLAYER_SKINS_DIR=svn\smplayer-skins
 set MPLAYER_DIR=mplayer
 set QT_DIR=C:\QtSDK\Desktop\Qt\%QTVER%\mingw
@@ -25 +26 @@
 copy %SMPLAYER_DIR%\dxlist\release\dxlist.exe %OUTPUT_DIR%
 copy %SMPLAYER_DIR%\zlib\zlib1.dll %OUTPUT_DIR%
+copy %SMPLAYER_DIR%\setup\sample.avi %OUTPUT_DIR%
 copy %SMPLAYER_DIR%\*.txt %OUTPUT_DIR%
 copy %QT_DIR%\bin\QtCore4.dll %OUTPUT_DIR%
@@ -68 +70 @@
 
 echo.
+echo ######         Skins Themes         #######
+echo.
+svn export --force %SMPLAYER_SKINS_DIR%\themes %OUTPUT_DIR%\themes
+
+echo.
 echo ######           MPlayer           #######
 echo.

smplayer/trunk/setup/scripts/make_pkgs.cmd

@@ -5 +5 @@
 echo Be sure to have a compiled portable smplayer.exe, renamed as
 echo `smplayer-portable.exe` in the same directory as this script or an
-echo alternate location you specify in this script.
+echo alternate location you specify in this script when creating the portable
+echo packages.
 echo.
 echo Configure your build environment at the beginning of this script.
 echo.
 echo 7zip command-line (http://7zip.org) is required by this script.
-echo.
-echo * Release Packages
 echo.
 echo 1 - NSIS SMPlayer Packages
@@ -17 +16 @@
 echo 3 - SMPlayer Package w/o MPlayer
 echo 4 - MPlayer Package
-echo.
-echo * Update Packages
-echo.
-echo 5 - SMPlayer SVN Update Package
-echo 6 - Qt DLL Package
 
 echo.
@@ -38 +32 @@
 set OUTPUT_DIR=%TOP_LEVEL_DIR%\output
 set PORTABLE_EXE_DIR=%TOP_LEVEL_DIR%\portable
-set QT_DIR=E:\Buildsys\Qt\%QTVER%
 
 :reask
@@ -55 +48 @@
 ) else if "%USER_CHOICE%" == "4" (
   goto mplayer
-
-) else if "%USER_CHOICE%" == "5" (
-  goto svn_updpkg
-
-) else if "%USER_CHOICE%" == "6" (
-  goto qtdlls
 
 ) else (
@@ -246 +233 @@
 goto end
 
-:svn_updpkg
-echo.
-echo ---  Creating SVN Update Package  ---
-echo.
-
-set /P SMPLAYER_SVN="SMPlayer SVN Revision: "
-if "%SMPLAYER_SVN%"=="" goto end
-
-7za a -t7z %OUTPUT_DIR%\smplayer_update_svn_r%SMPLAYER_SVN%.7z %SMPLAYER_DIR%\smplayer.exe %SMPLAYER_DIR%\translations -mx9
-
-goto end
-
-:qtdlls
-
-set /P QTVER="Qt Version: "
-if "%QTVER%"=="" goto end
-
-echo.
-echo ---  Creating Qt DLL Package  ---
-echo.
-
-mkdir imageformats
-copy %QT_DIR%\%QTVER%\plugins\imageformats\qjpeg4.dll imageformats
-7za a -t7z %OUTPUT_DIR%\qt_%QTVER%_dlls.7z %QT_DIR%\%QTVER%\bin\libgcc_s_dw2-1.dll %QT_DIR%\%QTVER%\bin\mingwm10.dll %QT_DIR%\%QTVER%\bin\QtCore4.dll %QT_DIR%\%QTVER%\bin\QtGui4.dll %QT_DIR%\%QTVER%\bin\QtNetwork4.dll %QT_DIR%\%QTVER%\bin\QtXml4.dll imageformats -mx9
-rd /s /q imageformats
-
-goto end
-
 :end
 

smplayer/trunk/setup/smplayer.nsi

@@ -1 @@
-; Installer script for win32/win64 SMPlayer
-; Written by redxii (redxii@users.sourceforge.net)
-; Tested/Developed with Unicode NSIS 2.46.5
+;Installer script for win32/win64 SMPlayer
+;Written by redxii (redxii@users.sourceforge.net)
+;Tested/Developed with Unicode NSIS 2.46.5
 
 !ifndef VER_MAJOR | VER_MINOR | VER_BUILD
@@ -62 +62 @@
   BrandingText "SMPlayer for Windows v${SMPLAYER_VERSION}"
 !ifdef WIN64
-  OutFile "output\smplayer-${SMPLAYER_VERSION}-x86_64.exe"
+  OutFile "output\smplayer-${SMPLAYER_VERSION}-x64.exe"
 !else
-  OutFile "output\smplayer-${SMPLAYER_VERSION}-x86.exe"
+  OutFile "output\smplayer-${SMPLAYER_VERSION}-win32.exe"
 !endif
 
@@ -121 +121 @@
   !define MUI_UNICON "smplayer-orange-uninstaller.ico"
 
-  ; Misc
+  ;Misc
   !define MUI_WELCOMEFINISHPAGE_BITMAP "smplayer-orange-wizard.bmp"
   !define MUI_UNWELCOMEFINISHPAGE_BITMAP "smplayer-orange-wizard-un.bmp"
   !define MUI_ABORTWARNING
 
-  ; License page
+  ;Welcome page
+  !define MUI_WELCOMEPAGE_TITLE $(WelcomePage_Title)
+  !define MUI_WELCOMEPAGE_TEXT $(WelcomePage_Text)
+
+  ;License page
   !define MUI_LICENSEPAGE_RADIOBUTTONS
 
-  ; Components page
+  ;Components page
   !define MUI_COMPONENTSPAGE_SMALLDESC
 
-  ; Finish page
+  ;Finish page
   !define MUI_FINISHPAGE_LINK "http://smplayer.sourceforge.net"
   !define MUI_FINISHPAGE_LINK_LOCATION "http://smplayer.sourceforge.net"
@@ -173 +177 @@
 
   ;Install pages
+  #Welcome
   !insertmacro MUI_PAGE_WELCOME
-  !insertmacro MUI_PAGE_LICENSE "${SMPLAYER_BUILD_DIR}\Copying.txt"
+
+  #License
+  !insertmacro MUI_PAGE_LICENSE "license.txt"
 
   #Upgrade/Reinstall
@@ -198 +205 @@
   !insertmacro MUI_UNPAGE_CONFIRM
   !insertmacro MUI_UNPAGE_INSTFILES
-  !define MUI_PAGE_CUSTOMFUNCTION_PRE un.FinishPagePre
   !insertmacro MUI_UNPAGE_FINISH
 
@@ -229 +235 @@
   !insertmacro MUI_LANGUAGE "TradChinese"
 
-; Custom translations for setup
+;Custom translations for setup
 
   !insertmacro LANGFILE_INCLUDE "translations\english.nsh"
@@ -413 +419 @@
     done:
 
-        SectionEnd
+  SectionEnd
 
 SectionGroupEnd
@@ -448 +454 @@
   ;Allows user to use 'start smplayer.exe'
   WriteRegStr HKLM "${SMPLAYER_APP_PATHS_KEY}" "" "$INSTDIR\smplayer.exe"
+  WriteRegStr HKLM "${SMPLAYER_APP_PATHS_KEY}" "Path" "$INSTDIR"
 
   ;Default Programs Registration (Vista & later)
@@ -610 +617 @@
 
   retry_runcheck:
-        FindProcDLL::FindProc "smplayer.exe"
-        IntCmp $R0 1 0 +3
-                MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION $(SMPlayer_Is_Running) /SD IDCANCEL IDRETRY retry_runcheck
-                Abort
+  FindProcDLL::FindProc "smplayer.exe"
+  IntCmp $R0 1 0 +3
+    MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION $(SMPlayer_Is_Running) /SD IDCANCEL IDRETRY retry_runcheck
+    Abort
 
 FunctionEnd
@@ -628 +635 @@
     MessageBox MB_YESNO|MB_ICONSTOP $(OS_Not_Supported) /SD IDNO IDYES installonoldwindows
     Abort
-        installonoldwindows:
+  installonoldwindows:
   ${EndIf}
 
@@ -644 +651 @@
     MessageBox MB_OK|MB_ICONSTOP $(Existing_32bitInst)
     Abort
-  
+
   SetRegView 64
 !else
@@ -655 +662 @@
       MessageBox MB_OK|MB_ICONSTOP $(Existing_64bitInst)
       Abort
-    
+
     SetRegView 32
   ${EndIf}
@@ -669 +676 @@
 
   ;Check if SMPlayer is running
-  Call RunCheck
+  ;Allow skipping check using /NORUNCHECK
+  ${GetParameters} $R0
+  ${GetOptions} $R0 "/NORUNCHECK" $R1
+  IfErrors 0 +2
+    Call RunCheck
 
   ;Check for admin on < Vista
@@ -959 +970 @@
 
   ;Check if SMPlayer is running
-  Call un.RunCheck
+  ;Allow skipping check using /NORUNCHECK
+  ${un.GetParameters} $R0
+  ${un.GetOptions} $R0 "/NORUNCHECK" $R1
+  IfErrors 0 +2
+    Call un.RunCheck
 
   ;Gets start menu folder name
@@ -979 +994 @@
 
 FunctionEnd
-
-Function un.FinishPagePre
-
-  ${un.GetParameters} $R0
-
-  ${un.GetOptionsS} $R0 "/X" $R1
-  ${Unless} ${Errors}
-    Abort
-  ${EndUnless}
-
-FunctionEnd

smplayer/trunk/setup/translations/basque.nsh

@@ -12 +12 @@
 ${LangFileString} SMPlayer_Is_Running "SMPlayerren eskabide bat lanean ari da. Mesedez irten SMPlayerretik eta saiatu berriro."
 
-${LangFileString} OS_Not_Supported "Unsupported operating system.$\nSMPlayer ${SMPLAYER_VERSION} requires at least Windows XP and may not work correctly on your system.$\nDo you really want to continue with the installation?"
+${LangFileString} OS_Not_Supported "Sistema eragile sostengu gabea.$\nSMPlayer ${SMPLAYER_VERSION} gutxienez Windows XP behar du eta ezin du zuzen lan egin zure sisteman.$\nEgitan nahi duzu ezarpenarekin jarraitzea?"
 ${LangFileString} Win64_Required "64-biteko Windows sistema eragile bat behar da software hau ezartzeko."
 ${LangFileString} Existing_32bitInst "32-biteko SMPlayer ezarpen bat dago. Lehenik 32-biteko SMPlayer kendu behar duzu."
 ${LangFileString} Existing_64bitInst "64-biteko SMPlayer ezarpen bat dago. Lehenik 64-biteko SMPlayer kendu behar duzu."
+
+; Welcome page
+${LangFileString} WelcomePage_Title "$(^NameDA) Setup"
+${LangFileString} WelcomePage_Text "Setup will guide you through the installation of $(^NameDA).$\r$\n$\r$\nIt is recommended that you close all instances of SMPlayer before starting setup. This will make it possible to update relevant program files without having to reboot your computer.$\r$\n$\r$\n$_CLICK"
 
 ; Components Page
@@ -24 +28 @@
 ${LangFileString} Section_SMPlayer_Desc "SMPlayer, elkarbanatutako liburutegiak, eta agiritza."
 
-${LangFileString} Section_DesktopShortcut "Mahigaina"
-${LangFileString} Section_DesktopShortcut_Desc "Sortu SMPlayer lasterbide bat mahigainean."
+${LangFileString} Section_DesktopShortcut "Mahaigaina"
+${LangFileString} Section_DesktopShortcut_Desc "Sortu SMPlayer lasterbide bat mahaigainean."
 
 ${LangFileString} Section_StartMenu "Hasiera Menua"
@@ -69 +73 @@
 ${LangFileString} StartBtn "Hasi"
 
-; MPlayer Section
-${LangFileString} MPlayer_DL_Msg "MPlayer jeisten..."
-${LangFileString} MPlayer_DL_Retry "MPlayer ez da ongi ezarri. Berriro saiatu?"
-${LangFileString} MPlayer_DL_Failed "Hutsegitea MPlayer: '$R0'. jeisterakoan"
-${LangFileString} MPlayer_Inst_Failed "Hutsegitea MPlayer ezartzerakoan. MPlayer beharrezkoa da irakurketarako"
-
 ; Codecs Section
 ${LangFileString} Codecs_DL_Msg "MPlayer kodekak jeisten..."

smplayer/trunk/setup/translations/catalan.nsh

@@ -16 +16 @@
 ${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
 ${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
+
+; Welcome page
+${LangFileString} WelcomePage_Title "$(^NameDA) Setup"
+${LangFileString} WelcomePage_Text "Setup will guide you through the installation of $(^NameDA).$\r$\n$\r$\nIt is recommended that you close all instances of SMPlayer before starting setup. This will make it possible to update relevant program files without having to reboot your computer.$\r$\n$\r$\n$_CLICK"
 
 ; Components Page
@@ -69 +73 @@
 ${LangFileString} StartBtn "Start"
 
-; MPlayer Section
-${LangFileString} MPlayer_DL_Msg "Downloading MPlayer..."
-${LangFileString} MPlayer_DL_Retry "MPlayer was not successfully installed. Retry?"
-${LangFileString} MPlayer_DL_Failed "Failed to download MPlayer: '$R0'."
-${LangFileString} MPlayer_Inst_Failed "Failed to install MPlayer. MPlayer is required for playback."
-
 ; Codecs Section
 ${LangFileString} Codecs_DL_Msg "Downloading MPlayer codecs..."

smplayer/trunk/setup/translations/croatian.nsh

@@ -16 +16 @@
 ${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
 ${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
+
+; Welcome page
+${LangFileString} WelcomePage_Title "$(^NameDA) Setup"
+${LangFileString} WelcomePage_Text "Setup will guide you through the installation of $(^NameDA).$\r$\n$\r$\nIt is recommended that you close all instances of SMPlayer before starting setup. This will make it possible to update relevant program files without having to reboot your computer.$\r$\n$\r$\n$_CLICK"
 
 ; Components Page
@@ -69 +73 @@
 ${LangFileString} StartBtn "Start"
 
-; MPlayer Section
-${LangFileString} MPlayer_DL_Msg "Downloading MPlayer..."
-${LangFileString} MPlayer_DL_Retry "MPlayer was not successfully installed. Retry?"
-${LangFileString} MPlayer_DL_Failed "Failed to download MPlayer: '$R0'."
-${LangFileString} MPlayer_Inst_Failed "Failed to install MPlayer. MPlayer is required for playback."
-
 ; Codecs Section
 ${LangFileString} Codecs_DL_Msg "Downloading MPlayer Codecs..."

smplayer/trunk/setup/translations/czech.nsh

@@ -16 +16 @@
 ${LangFileString} Existing_32bitInst "Máte nainstalovánu 32-bitovou verzi SMPlayeru. Musíte nejprve odinstalovat 32-bitový SMPlayer."
 ${LangFileString} Existing_64bitInst "Máte nainstalovánu 64-bitovou verzi SMPlayeru. Musíte nejprve odinstalovat 64-bitový SMPlayer."
+
+; Welcome page
+${LangFileString} WelcomePage_Title "$(^NameDA) Setup"
+${LangFileString} WelcomePage_Text "Setup will guide you through the installation of $(^NameDA).$\r$\n$\r$\nIt is recommended that you close all instances of SMPlayer before starting setup. This will make it possible to update relevant program files without having to reboot your computer.$\r$\n$\r$\n$_CLICK"
 
 ; Components Page
@@ -69 +73 @@
 ${LangFileString} StartBtn "Start"
 
-; MPlayer Section
-${LangFileString} MPlayer_DL_Msg "Stahuji MPlayer..."
-${LangFileString} MPlayer_DL_Retry "MPlayer se nepovedlo nainstalovat. Zkusit znovu?"
-${LangFileString} MPlayer_DL_Failed "Nepovedlo se stáhnout MPlayer: '$R0'."
-${LangFileString} MPlayer_Inst_Failed "Nepovedlo se nainstalovat MPlayer. MPlayer je potřebný pro přehrávání."
-
 ; Codecs Section
 ${LangFileString} Codecs_DL_Msg "Instaluji kodeky MPlayeru..."

smplayer/trunk/setup/translations/danish.nsh

@@ -16 +16 @@
 ${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
 ${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
+
+; Welcome page
+${LangFileString} WelcomePage_Title "$(^NameDA) Setup"
+${LangFileString} WelcomePage_Text "Setup will guide you through the installation of $(^NameDA).$\r$\n$\r$\nIt is recommended that you close all instances of SMPlayer before starting setup. This will make it possible to update relevant program files without having to reboot your computer.$\r$\n$\r$\n$_CLICK"
 
 ; Components Page
@@ -69 +73 @@
 ${LangFileString} StartBtn "Start"
 
-; MPlayer Section
-${LangFileString} MPlayer_DL_Msg "Downloading MPlayer..."
-${LangFileString} MPlayer_DL_Retry "MPlayer was not successfully installed. Retry?"
-${LangFileString} MPlayer_DL_Failed "Failed to download MPlayer: '$R0'."
-${LangFileString} MPlayer_Inst_Failed "Failed to install MPlayer. MPlayer is required for playback."
-
 ; Codecs Section
 ${LangFileString} Codecs_DL_Msg "Downloading MPlayer codecs..."

smplayer/trunk/setup/translations/dutch.nsh

@@ -16 +16 @@
 ${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
 ${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
+
+; Welcome page
+${LangFileString} WelcomePage_Title "$(^NameDA) Setup"
+${LangFileString} WelcomePage_Text "Setup will guide you through the installation of $(^NameDA).$\r$\n$\r$\nIt is recommended that you close all instances of SMPlayer before starting setup. This will make it possible to update relevant program files without having to reboot your computer.$\r$\n$\r$\n$_CLICK"
 
 ; Components Page
@@ -69 +73 @@
 ${LangFileString} StartBtn "Start"
 
-; MPlayer Section
-${LangFileString} MPlayer_DL_Msg "Downloading MPlayer..."
-${LangFileString} MPlayer_DL_Retry "MPlayer was not successfully installed. Retry?"
-${LangFileString} MPlayer_DL_Failed "Failed to download MPlayer: '$R0'."
-${LangFileString} MPlayer_Inst_Failed "Failed to install MPlayer. MPlayer is required for playback."
-
 ; Codecs Section
 ${LangFileString} Codecs_DL_Msg "Downloading MPlayer codecs..."

smplayer/trunk/setup/translations/english.nsh

@@ -16 +16 @@
 ${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
 ${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
+
+; Welcome page
+${LangFileString} WelcomePage_Title "$(^NameDA) Setup"
+${LangFileString} WelcomePage_Text "Setup will guide you through the installation of $(^NameDA).$\r$\n$\r$\nIt is recommended that you close all instances of SMPlayer before starting setup. This will make it possible to update relevant program files without having to reboot your computer.$\r$\n$\r$\n$_CLICK"
 
 ; Components Page
@@ -69 +73 @@
 ${LangFileString} StartBtn "Start"
 
-; MPlayer Section
-${LangFileString} MPlayer_DL_Msg "Downloading MPlayer..."
-${LangFileString} MPlayer_DL_Retry "MPlayer was not successfully installed. Retry?"
-${LangFileString} MPlayer_DL_Failed "Failed to download MPlayer: '$R0'."
-${LangFileString} MPlayer_Inst_Failed "Failed to install MPlayer. MPlayer is required for playback."
-
 ; Codecs Section
 ${LangFileString} Codecs_DL_Msg "Downloading MPlayer Codecs..."

smplayer/trunk/setup/translations/finnish.nsh

@@ -16 +16 @@
 ${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
 ${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
+
+; Welcome page
+${LangFileString} WelcomePage_Title "$(^NameDA) Setup"
+${LangFileString} WelcomePage_Text "Setup will guide you through the installation of $(^NameDA).$\r$\n$\r$\nIt is recommended that you close all instances of SMPlayer before starting setup. This will make it possible to update relevant program files without having to reboot your computer.$\r$\n$\r$\n$_CLICK"
 
 ; Components Page
@@ -69 +73 @@
 ${LangFileString} StartBtn "Start"
 
-; MPlayer Section
-${LangFileString} MPlayer_DL_Msg "Downloading MPlayer..."
-${LangFileString} MPlayer_DL_Retry "MPlayer was not successfully installed. Retry?"
-${LangFileString} MPlayer_DL_Failed "Failed to download MPlayer: '$R0'."
-${LangFileString} MPlayer_Inst_Failed "Failed to install MPlayer. MPlayer is required for playback."
-
 ; Codecs Section
 ${LangFileString} Codecs_DL_Msg "Downloading MPlayer codecs..."

smplayer/trunk/setup/translations/french.nsh

@@ -16 +16 @@
 ${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
 ${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
+
+; Welcome page
+${LangFileString} WelcomePage_Title "$(^NameDA) Setup"
+${LangFileString} WelcomePage_Text "Setup will guide you through the installation of $(^NameDA).$\r$\n$\r$\nIt is recommended that you close all instances of SMPlayer before starting setup. This will make it possible to update relevant program files without having to reboot your computer.$\r$\n$\r$\n$_CLICK"
 
 ; Components Page
@@ -69 +73 @@
 ${LangFileString} StartBtn "Start"
 
-; MPlayer Section
-${LangFileString} MPlayer_DL_Msg "Downloading MPlayer..."
-${LangFileString} MPlayer_DL_Retry "MPlayer was not successfully installed. Retry?"
-${LangFileString} MPlayer_DL_Failed "Failed to download MPlayer: '$R0'."
-${LangFileString} MPlayer_Inst_Failed "Failed to install MPlayer. MPlayer is required for playback."
-
 ; Codecs Section
 ${LangFileString} Codecs_DL_Msg "Downloading MPlayer codecs..."

smplayer/trunk/setup/translations/german.nsh

@@ -16 +16 @@
 ${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
 ${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
+
+; Welcome page
+${LangFileString} WelcomePage_Title "$(^NameDA) Setup"
+${LangFileString} WelcomePage_Text "Setup will guide you through the installation of $(^NameDA).$\r$\n$\r$\nIt is recommended that you close all instances of SMPlayer before starting setup. This will make it possible to update relevant program files without having to reboot your computer.$\r$\n$\r$\n$_CLICK"
 
 ; Components Page
@@ -69 +73 @@
 ${LangFileString} StartBtn "Start"
 
-; MPlayer Section
-${LangFileString} MPlayer_DL_Msg "MPlayer herunterladen …"
-${LangFileString} MPlayer_DL_Retry "MPlayer ist nicht erfolgreich installiert worden. Erneut versuchen?"
-${LangFileString} MPlayer_DL_Failed "Fehler beim Herunterladen von MPlayer: '$R0'."
-${LangFileString} MPlayer_Inst_Failed "Fehler beim Installieren von MPlayer. MPlayer ist erforderlich für die Wiedergabe."
-
 ; Codecs Section
 ${LangFileString} Codecs_DL_Msg "MPlayer-Codecs herunterladen …"

smplayer/trunk/setup/translations/hebrew.nsh

@@ -16 +16 @@
 ${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
 ${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
+
+; Welcome page
+${LangFileString} WelcomePage_Title "$(^NameDA) Setup"
+${LangFileString} WelcomePage_Text "Setup will guide you through the installation of $(^NameDA).$\r$\n$\r$\nIt is recommended that you close all instances of SMPlayer before starting setup. This will make it possible to update relevant program files without having to reboot your computer.$\r$\n$\r$\n$_CLICK"
 
 ; Components Page
@@ -69 +73 @@
 ${LangFileString} StartBtn "Start"
 
-; MPlayer Section
-${LangFileString} MPlayer_DL_Msg "Downloading MPlayer..."
-${LangFileString} MPlayer_DL_Retry "MPlayer was not successfully installed. Retry?"
-${LangFileString} MPlayer_DL_Failed "Failed to download MPlayer: '$R0'."
-${LangFileString} MPlayer_Inst_Failed "Failed to install MPlayer. MPlayer is required for playback."
-
 ; Codecs Section
 ${LangFileString} Codecs_DL_Msg "Downloading MPlayer codecs..."

smplayer/trunk/setup/translations/hungarian.nsh

@@ -16 +16 @@
 ${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
 ${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
+
+; Welcome page
+${LangFileString} WelcomePage_Title "$(^NameDA) Setup"
+${LangFileString} WelcomePage_Text "Setup will guide you through the installation of $(^NameDA).$\r$\n$\r$\nIt is recommended that you close all instances of SMPlayer before starting setup. This will make it possible to update relevant program files without having to reboot your computer.$\r$\n$\r$\n$_CLICK"
 
 ; Components Page
@@ -69 +73 @@
 ${LangFileString} StartBtn "Start"
 
-; MPlayer Section
-${LangFileString} MPlayer_DL_Msg "Az MPlayer letöltése..."
-${LangFileString} MPlayer_DL_Retry "Az MPlayer telepítése nem sikerült. Újra próbáljam?"
-${LangFileString} MPlayer_DL_Failed "Az MPlayer letöltése nem sikerült: '$R0'."
-${LangFileString} MPlayer_Inst_Failed "Az MPlayer telepítése nem sikerült. Az MPlayerre szükség van a lejátszáshoz."
-
 ; Codecs Section
 ${LangFileString} Codecs_DL_Msg "MPlayer kodekek letöltése..."

smplayer/trunk/setup/translations/italian.nsh

@@ -16 +16 @@
 ${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
 ${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
+
+; Welcome page
+${LangFileString} WelcomePage_Title "$(^NameDA) Setup"
+${LangFileString} WelcomePage_Text "Setup will guide you through the installation of $(^NameDA).$\r$\n$\r$\nIt is recommended that you close all instances of SMPlayer before starting setup. This will make it possible to update relevant program files without having to reboot your computer.$\r$\n$\r$\n$_CLICK"
 
 ; Components Page
@@ -69 +73 @@
 ${LangFileString} StartBtn "Start"
 
-; MPlayer Section
-${LangFileString} MPlayer_DL_Msg "Sto scaricando MPlayer..."
-${LangFileString} MPlayer_DL_Retry "MPlayer non è stato completamente installato. Riprova?"
-${LangFileString} MPlayer_DL_Failed "Scaricamento di MPlayer fallito: '$R0'."
-${LangFileString} MPlayer_Inst_Failed "Installazione di MPlayer fallita. MPlayer è un componente necessario per la riproduzione multimediale."
-
 ; Codecs Section
 ${LangFileString} Codecs_DL_Msg "Sto scaricando i codec di MPlayer..."

smplayer/trunk/setup/translations/japanese.nsh

@@ -12 +12 @@
 ${LangFileString} SMPlayer_Is_Running "SMPlayer のインスタンスが実行中です。SMPlayer を終了してやり直してください。"
 
-${LangFileString} OS_Not_Supported "Unsupported operating system.$\nSMPlayer ${SMPLAYER_VERSION} requires at least Windows XP and may not work correctly on your system.$\nDo you really want to continue with the installation?"
+${LangFileString} OS_Not_Supported "サポートされていないオペレーティング システムです。$\nSMPlayer ${SMPLAYER_VERSION} は Windows XP 以上を必要とし、お使いのシステムでは正常に動作しない可能性があります。$\n本当にインストールを続行しますか?"
 ${LangFileString} Win64_Required "このソフトウェアをインストールするには 64 ビットの Windows オペレーティング システムが必要です。"
 ${LangFileString} Existing_32bitInst "32 ビットの SMPlayer が既にインストールされています。先に 32 ビットの SMPlayer をアンインストールする必要があります。"
 ${LangFileString} Existing_64bitInst "64 ビットの SMPlayer が既にインストールされています。先に 64 ビットの SMPlayer をアンインストールする必要があります。"
+
+; Welcome page
+${LangFileString} WelcomePage_Title "$(^NameDA) のセットアップ"
+${LangFileString} WelcomePage_Text "セットアップは $(^NameDA) のインストールをご案内します。$\r$\n$\r$\nセットアップの開始前にすべての SMPlayer のインスタンスを閉じることが推奨されます。これによりお使いのコンピューターを再起動する必要なく関連するプログラム ファイルを更新することが可能になります。$\r$\n$\r$\n$_CLICK"
 
 ; Components Page
@@ -69 +73 @@
 ${LangFileString} StartBtn "開始"
 
-; MPlayer Section
-${LangFileString} MPlayer_DL_Msg "MPlayer をダウンロードしています..."
-${LangFileString} MPlayer_DL_Retry "MPlayer は正常にインストールされませんでした。再試行しますか?"
-${LangFileString} MPlayer_DL_Failed "MPlayer のダウンロードに失敗しました: '$R0'。"
-${LangFileString} MPlayer_Inst_Failed "MPlayer のインストールに失敗しました。MPlayer は再生に必要です。"
-
 ; Codecs Section
 ${LangFileString} Codecs_DL_Msg "MPlayer コーデックをダウンロードしています..."

smplayer/trunk/setup/translations/korean.nsh

@@ -16 +16 @@
 ${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
 ${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
+
+; Welcome page
+${LangFileString} WelcomePage_Title "$(^NameDA) Setup"
+${LangFileString} WelcomePage_Text "Setup will guide you through the installation of $(^NameDA).$\r$\n$\r$\nIt is recommended that you close all instances of SMPlayer before starting setup. This will make it possible to update relevant program files without having to reboot your computer.$\r$\n$\r$\n$_CLICK"
 
 ; Components Page
@@ -69 +73 @@
 ${LangFileString} StartBtn "Start"
 
-; MPlayer Section
-${LangFileString} MPlayer_DL_Msg "Downloading MPlayer..."
-${LangFileString} MPlayer_DL_Retry "MPlayer was not successfully installed. Retry?"
-${LangFileString} MPlayer_DL_Failed "Failed to download MPlayer: '$R0'."
-${LangFileString} MPlayer_Inst_Failed "Failed to install MPlayer. MPlayer is required for playback."
-
 ; Codecs Section
 ${LangFileString} Codecs_DL_Msg "Downloading MPlayer codecs..."

smplayer/trunk/setup/translations/norwegian.nsh

@@ -16 +16 @@
 ${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
 ${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
+
+; Welcome page
+${LangFileString} WelcomePage_Title "$(^NameDA) Setup"
+${LangFileString} WelcomePage_Text "Setup will guide you through the installation of $(^NameDA).$\r$\n$\r$\nIt is recommended that you close all instances of SMPlayer before starting setup. This will make it possible to update relevant program files without having to reboot your computer.$\r$\n$\r$\n$_CLICK"
 
 ; Components Page
@@ -69 +73 @@
 ${LangFileString} StartBtn "Start"
 
-; MPlayer Section
-${LangFileString} MPlayer_DL_Msg "Downloading MPlayer..."
-${LangFileString} MPlayer_DL_Retry "MPlayer was not successfully installed. Retry?"
-${LangFileString} MPlayer_DL_Failed "Failed to download MPlayer: '$R0'."
-${LangFileString} MPlayer_Inst_Failed "Failed to install MPlayer. MPlayer is required for playback."
-
 ; Codecs Section
 ${LangFileString} Codecs_DL_Msg "Downloading MPlayer codecs..."

smplayer/trunk/setup/translations/polish.nsh

@@ -16 +16 @@
 ${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
 ${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
+
+; Welcome page
+${LangFileString} WelcomePage_Title "$(^NameDA) Setup"
+${LangFileString} WelcomePage_Text "Setup will guide you through the installation of $(^NameDA).$\r$\n$\r$\nIt is recommended that you close all instances of SMPlayer before starting setup. This will make it possible to update relevant program files without having to reboot your computer.$\r$\n$\r$\n$_CLICK"
 
 ; Components Page
@@ -68 +72 @@
 ${LangFileString} StartBtn "Start"
 
-; MPlayer Section
-${LangFileString} MPlayer_DL_Msg "Pobieram MPlayera..."
-${LangFileString} MPlayer_DL_Retry "Instalacja MPlayera nie powiodła się. Ponowić próbę?"
-${LangFileString} MPlayer_DL_Failed "Nie udało się pobrać MPlayera: '$R0'."
-${LangFileString} MPlayer_Inst_Failed "Nie udało się zainstalować MPlayera. Bez MPlayera odtwarzanie filmów nie jest możliwe."
-
 ; Codecs Section
 ${LangFileString} Codecs_DL_Msg "Pobieram kodeki do MPlayera..."

smplayer/trunk/setup/translations/portuguese.nsh

@@ -12 +12 @@
 ${LangFileString} SMPlayer_Is_Running "Já existe uma instância SMPlayer em execução. Feche o SMPlayer e tente novamente."
 
-${LangFileString} OS_Not_Supported "Unsupported operating system.$\nSMPlayer ${SMPLAYER_VERSION} requires at least Windows XP and may not work correctly on your system.$\nDo you really want to continue with the installation?"
+${LangFileString} OS_Not_Supported "O sistema operativo não é suportado.$\nO SMPlayer ${SMPLAYER_VERSION} requer, pelo menos, o Windows XP para funcionar corretamente.$\nQuer mesmo continuar com a instalação?"
 ${LangFileString} Win64_Required "Para instalar esta versão, tem que possuir um sistema de 64 bits."
-${LangFileString} Existing_32bitInst "Já existe uma instalação 32 bits do SMPlayer. Tem que a desinstalar antes de uma nova instalação."
-${LangFileString} Existing_64bitInst "Já existe uma instalação 64 bits do SMPlayer. Tem que a desinstalar antes de uma nova instalação."
+${LangFileString} Existing_32bitInst "Já existe uma instalação 32 bits do SMPlayer. Tem que a desinstalar antes de efetuar uma nova instalação."
+${LangFileString} Existing_64bitInst "Já existe uma instalação 64 bits do SMPlayer. Tem que a desinstalar antes de efetuar uma nova instalação."
+
+; Welcome page
+${LangFileString} WelcomePage_Title "$(^NameDA) Setup"
+${LangFileString} WelcomePage_Text "Esta configuração irá ajuda-lo a instalar o $(^NameDA).$\r$\n$\r$\nÉ altamente recomendado o encerramento de quaisquer instâncias do SMPlayer antes de iniciar a instalação. Deste modo, será possível atualizar os ficheiros do programa sem ter que reiniciar o computador.$\r$\n$\r$\n$_CLICK"
 
 ; Components Page
@@ -55 +59 @@
 
 ${LangFileString} Reinstall_Msg1 "Você possui uma instalação do SMPlayer nesta pasta:"
-${LangFileString} Reinstall_Msg2 "Por favor, escolha o método a utilizar:"
+${LangFileString} Reinstall_Msg2 "Por favor escolha o método a utilizar:"
 ${LangFileString} Reinstall_Overwrite "Substituir ($Inst_Type) a instalação existente"
 ${LangFileString} Reinstall_Uninstall "Desinstalar (remove) a instalação existente"
@@ -68 +72 @@
 
 ${LangFileString} StartBtn "Iniciar"
-
-; MPlayer Section
-${LangFileString} MPlayer_DL_Msg "A transferir o MPlayer..."
-${LangFileString} MPlayer_DL_Retry "O MPlayer não foi instalado corretamente. Tentar novamente?"
-${LangFileString} MPlayer_DL_Failed "Falha ao transferir o MPlayer: '$R0'."
-${LangFileString} MPlayer_Inst_Failed "Falha ao instalar o MPlayer. O MPlayer é necessário para reproduzir ficheiros."
 
 ; Codecs Section
@@ -92 +90 @@
 
 ; Vista & Later Default Programs Registration
-${LangFileString} Application_Description "O SMPlayer é um interface gráfico para o MPlayer, com funções simples como a reprodução de vídeos, DVDs e VCDs bem como outras mais avançadas(suporte a filtros MPlayer, listas e mais)."
+${LangFileString} Application_Description "O SMPlayer é uma interface gráfico para o MPlayer, com funções simples como a reprodução de vídeos, DVDs e VCDs bem como outras mais avançadas(suporte a filtros MPlayer, listas e mais)."
 
 ; Misc

smplayer/trunk/setup/translations/russian.nsh

@@ -16 +16 @@
 ${LangFileString} Existing_32bitInst "Существует 32-битная установка SMPlayer. Сначала далите 32-битный SMPlayer."
 ${LangFileString} Existing_64bitInst "Существует 64-битная установка SMPlayer. Сначала далите 64-битный SMPlayer."
+
+; Welcome page
+${LangFileString} WelcomePage_Title "$(^NameDA) Setup"
+${LangFileString} WelcomePage_Text "Setup will guide you through the installation of $(^NameDA).$\r$\n$\r$\nIt is recommended that you close all instances of SMPlayer before starting setup. This will make it possible to update relevant program files without having to reboot your computer.$\r$\n$\r$\n$_CLICK"
 
 ; Components Page
@@ -69 +73 @@
 ${LangFileString} StartBtn "Старт"
 
-; MPlayer Section
-${LangFileString} MPlayer_DL_Msg "Загрузка MPlayer..."
-${LangFileString} MPlayer_DL_Retry "Не удалось успешно установить MPlayer. Попытаться ещё раз?"
-${LangFileString} MPlayer_DL_Failed "Не удалось загрузить MPlayer: '$R0'."
-${LangFileString} MPlayer_Inst_Failed "Ошибка при установке MPlayer. MPlayer требуется для воспроизведения."
-
 ; Codecs Section
 ${LangFileString} Codecs_DL_Msg "Загрузка бинарных кодеков для MPlayer..."

smplayer/trunk/setup/translations/simpchinese.nsh

@@ -8 +8 @@
 
 ; Startup
-${LangFileString} Installer_Is_Running "安装程序已经运行。"
-${LangFileString} Installer_No_Admin "安装本程序时，您必须以管理员身份登录。"
-${LangFileString} SMPlayer_Is_Running "一个 SMPlayer 实例正在运行。请退出 SMPlayer，然后再试一次。"
+${LangFileString} Installer_Is_Running "安装程序已经在运行。"
+${LangFileString} Installer_No_Admin "安装此程序时，您必须以管理员身份登录。"
+${LangFileString} SMPlayer_Is_Running "SMPlayer 的一个实例正在运行。请退出 SMPlayer，然后再试一次。"
 
-${LangFileString} OS_Not_Supported "Unsupported operating system.$\nSMPlayer ${SMPLAYER_VERSION} requires at least Windows XP and may not work correctly on your system.$\nDo you really want to continue with the installation?"
-${LangFileString} Win64_Required "安装本软件需要 64 位 Windows 操作系统。"
-${LangFileString} Existing_32bitInst "一个 SMPlayer 的 32 位安装已经存在。您必须先卸载 32 位 SMPlayer。"
-${LangFileString} Existing_64bitInst "一个 SMPlayer 的 64 位安装已经存在。您必须先卸载 64 位 SMPlayer。"
+${LangFileString} OS_Not_Supported "不支持的操作系统。$\nSMPlayer ${SMPLAYER_VERSION} 要求至少是 Windows XP，其在您的系统上可能无法正常工作。$\n您真的要继续安装吗?"
+${LangFileString} Win64_Required "安装此软件需要 64 位 Windows 操作系统。"
+${LangFileString} Existing_32bitInst "存在一个现有的 SMPlayer 32 位安装。您必须先卸载 32 位的 SMPlayer。"
+${LangFileString} Existing_64bitInst "存在一个现有的 SMPlayer 64 位安装。您必须先卸载 64 位的 SMPlayer。"
+
+; Welcome page
+${LangFileString} WelcomePage_Title "$(^NameDA) 安装程序"
+${LangFileString} WelcomePage_Text "安装程序将引导您完成 $(^NameDA) 的安装。$\r$\n$\r$\n建议您在开始安装之前关闭所有的 SMPlayer 实例。这将使它能够更新相关的程序文件，而无需重新启动您的计算机。$\r$\n$\r$\n$_CLICK"
 
 ; Components Page
@@ -35 +39 @@
 ${LangFileString} Section_MPlayerCodecs "二进制编解码器"
 !ifdef WITH_CODECS
-${LangFileString} Section_MPlayerCodecs_Desc "用于 MPlayer 的可选编解码器包。"
+${LangFileString} Section_MPlayerCodecs_Desc "适用于 MPlayer 的可选编解码器包。"
 !else ifndef WITH_CODECS
-${LangFileString} Section_MPlayerCodecs_Desc "用于 MPlayer 的可选编解码器包。(安装需要使用网络连接)"
+${LangFileString} Section_MPlayerCodecs_Desc "适用于 MPlayer 的可选编解码器包。(安装需要使用网络连接)"
 !endif
 
-${LangFileString} Section_MEncoder_Desc "MPlayer 伴侣程序，可用于编码或转换支持的音频/视频流。"
+${LangFileString} Section_MEncoder_Desc "MPlayer 的配套程序，可以用来编码或转换支持的音频/视频流。"
 
 ${LangFileString} Section_IconThemes "图标主题"
-${LangFileString} Section_IconThemes_Desc "用于 SMPlayer 的附加图标主题。"
+${LangFileString} Section_IconThemes_Desc "SMPlayer 的附加图标主题。"
 
 ${LangFileString} Section_Translations "语言"
-${LangFileString} Section_Translations_Desc "用于 SMPlayer 的语言文件 (除英语)。"
+${LangFileString} Section_Translations_Desc "SMPlayer 的语言文件。(除英语)"
 
-${LangFileString} MPlayer_Codec_Msg "二进制编解码器包可增加对新 RealVideo 变种和很多不常见格式的支持。$\n请注意，播放像 DVD, MPEG-1/2/4 这样平时常见的格式无需安装本编解码器包。"
+${LangFileString} MPlayer_Codec_Msg "二进制编解码器包可增加对新 RealVideo 变种和很多不常见格式的支持。$\n请注意，播放像 DVD、MPEG-1/2/4 这样平时常见的格式无需安装本编解码器包。"
 
 ; Upgrade/Reinstall Page
 ${LangFileString} Reinstall_Header_Text "选择安装类型"
-${LangFileString} Reinstall_Header_SubText "选择覆盖或卸载模式。"
+${LangFileString} Reinstall_Header_SubText "选择“覆盖”或“卸载”模式。"
 
-${LangFileString} Reinstall_Msg1 "您有一个已存在的 SMPlayer 安装位于以下文件夹:"
+${LangFileString} Reinstall_Msg1 "您有一个现有的 SMPlayer 安装位于以下文件夹:"
 ${LangFileString} Reinstall_Msg2 "请选择如何继续:"
 ${LangFileString} Reinstall_Overwrite "覆盖 ($Inst_Type) 现有的安装"
@@ -69 +73 @@
 ${LangFileString} StartBtn "开始"
 
-; MPlayer Section
-${LangFileString} MPlayer_DL_Msg "正在下载 MPlayer..."
-${LangFileString} MPlayer_DL_Retry "MPlayer 没有成功安装。是否重试?"
-${LangFileString} MPlayer_DL_Failed "无法下载 MPlayer: '$R0'。"
-${LangFileString} MPlayer_Inst_Failed "无法安装 MPlayer。要播放媒体文件必须安装 MPlayer。"
-
 ; Codecs Section
 ${LangFileString} Codecs_DL_Msg "正在下载 MPlayer 编解码器..."
 ${LangFileString} Codecs_DL_Retry "MPlayer 编解码器没有成功安装。是否重试?"
-${LangFileString} Codecs_DL_Failed "无法下载 MPlayer 编解码器: '$R0'。"
-${LangFileString} Codecs_Inst_Failed "无法安装 MPlayer 编解码器。"
+${LangFileString} Codecs_DL_Failed "MPlayer 编解码器下载失败: '$R0'。"
+${LangFileString} Codecs_Inst_Failed "MPlayer 编解码器安装失败。"
 
 ; Version information
 ${LangFileString} VerInfo_DL_Msg "正在下载版本信息..."
-${LangFileString} VerInfo_DL_Failed "无法下载版本信息: '$R0'。将使用默认版本。"
+${LangFileString} VerInfo_DL_Failed "版本信息下载失败: '$R0'。将使用默认版本。"
 
 ; Uninstaller
-${LangFileString} Uninstaller_No_Admin "本安装只能由具有管理员权限的用户卸载。"
+${LangFileString} Uninstaller_No_Admin "安装只能由具有管理员权限的用户卸载。"
 ${LangFileString} Uninstaller_Aborted "卸载由用户中止。"
-${LangFileString} Uninstaller_NotInstalled "没有发现 SMPlayer 被安装在目录 '$INSTDIR' 中。$\r$\n仍要继续吗? (不推荐)"
-${LangFileString} Uninstaller_64bitOnly "本安装只能在 64 位 Windows 中卸载。"
+${LangFileString} Uninstaller_NotInstalled "没有发现 SMPlayer 被安装在目录 '$INSTDIR' 中。$\r$\n仍然要继续吗? (不推荐)"
+${LangFileString} Uninstaller_64bitOnly "安装只能在 64 位 Windows 中卸载。"
 
 ; Vista & Later Default Programs Registration
-${LangFileString} Application_Description "SMPlayer 是一个从播放视频、DVD、VCD 等基本特性到支持 MPlayer 过滤器、EDL 列表等高级特性的完整 MPlayer 前端程序。"
+${LangFileString} Application_Description "SMPlayer 是一个完备的 MPlayer 前端，从像播放视频、DVD、VCD 这样的基本功能，到支持 MPlayer 过滤器、EDL 列表等更多高级功能。"
 
 ; Misc

smplayer/trunk/setup/translations/slovak.nsh

@@ -16 +16 @@
 ${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
 ${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
+
+; Welcome page
+${LangFileString} WelcomePage_Title "$(^NameDA) Setup"
+${LangFileString} WelcomePage_Text "Setup will guide you through the installation of $(^NameDA).$\r$\n$\r$\nIt is recommended that you close all instances of SMPlayer before starting setup. This will make it possible to update relevant program files without having to reboot your computer.$\r$\n$\r$\n$_CLICK"
 
 ; Components Page
@@ -69 +73 @@
 ${LangFileString} StartBtn "Start"
 
-; MPlayer Section
-${LangFileString} MPlayer_DL_Msg "Downloading MPlayer..."
-${LangFileString} MPlayer_DL_Retry "MPlayer was not successfully installed. Retry?"
-${LangFileString} MPlayer_DL_Failed "Failed to download MPlayer: '$R0'."
-${LangFileString} MPlayer_Inst_Failed "Failed to install MPlayer. MPlayer is required for playback."
-
 ; Codecs Section
 ${LangFileString} Codecs_DL_Msg "Downloading MPlayer codecs..."

smplayer/trunk/setup/translations/slovenian.nsh

@@ -16 +16 @@
 ${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
 ${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
+
+; Welcome page
+${LangFileString} WelcomePage_Title "$(^NameDA) Setup"
+${LangFileString} WelcomePage_Text "Setup will guide you through the installation of $(^NameDA).$\r$\n$\r$\nIt is recommended that you close all instances of SMPlayer before starting setup. This will make it possible to update relevant program files without having to reboot your computer.$\r$\n$\r$\n$_CLICK"
 
 ; Components Page
@@ -69 +73 @@
 ${LangFileString} StartBtn "Start"
 
-; MPlayer Section
-${LangFileString} MPlayer_DL_Msg "Downloading MPlayer..."
-${LangFileString} MPlayer_DL_Retry "MPlayer was not successfully installed. Retry?"
-${LangFileString} MPlayer_DL_Failed "Failed to download MPlayer: '$R0'."
-${LangFileString} MPlayer_Inst_Failed "Failed to install MPlayer. MPlayer is required for playback."
-
 ; Codecs Section
 ${LangFileString} Codecs_DL_Msg "Downloading MPlayer codecs..."

smplayer/trunk/setup/translations/spanish.nsh

@@ -12 +12 @@
 ${LangFileString} SMPlayer_Is_Running "SMPlayer se está ejecutando. Por favor, ciérralo e inténtalo de nuevo."
 
-${LangFileString} OS_Not_Supported "Unsupported operating system.$\nSMPlayer ${SMPLAYER_VERSION} requires at least Windows XP and may not work correctly on your system.$\nDo you really want to continue with the installation?"
+${LangFileString} OS_Not_Supported "Sistema operativo no soportado.$\nSMPlayer ${SMPLAYER_VERSION} requiere al menos Windows XP y podría no funcionar correctamente en este sistema.$\n¿Realmente quieres continuar con la instalación?"
 ${LangFileString} Win64_Required "Se necesita un Windows de 64 bits para instalar este programa."
 ${LangFileString} Existing_32bitInst "Existe una versión de 32 bits instalada. Debes desinstalarla primero."
 ${LangFileString} Existing_64bitInst "Existe una versión de 64 bits instalada. Debes desinstalarla primero."
+
+; Welcome page
+${LangFileString} WelcomePage_Title "Instalación de $(^NameDA)"
+${LangFileString} WelcomePage_Text "A continuación se procederá a la instalación de $(^NameDA).$\r$\n$\r$\nSe recomienda cerrar todos los procesos de SMPlayer antes de comenzar con la instalación. De esta manera será posible actualizar los ficheros del programa sin tener que reiniciar el ordenador.$\r$\n$\r$\n$_CLICK"
 
 ; Components Page
@@ -69 +73 @@
 ${LangFileString} StartBtn "Comenzar"
 
-; MPlayer Section
-${LangFileString} MPlayer_DL_Msg "Descargando el MPlayer..."
-${LangFileString} MPlayer_DL_Retry "El MPlayer no se ha instalado correctamente. ¿Reintentar?"
-${LangFileString} MPlayer_DL_Failed "Ha fallado la descarga del MPlayer: '$R0'."
-${LangFileString} MPlayer_Inst_Failed "Ha fallado la instalación del MPlayer. El MPlayer es imprescindible o no se podrá reproducir nada."
-
 ; Codecs Section
 ${LangFileString} Codecs_DL_Msg "Descargando los códecs del MPlayer..."
@@ -89 +87 @@
 ${LangFileString} Uninstaller_Aborted "Desinstalación cancelada por el usuario."
 ${LangFileString} Uninstaller_NotInstalled "No parece que el SMPlayer esté instalado en el directorio '$INSTDIR'.$\r$\n¿Continuar de todos modos (no recomendado)?"
-${LangFileString} Uninstaller_64bitOnly "This installation can only be uninstalled on 64-bit Windows."
+${LangFileString} Uninstaller_64bitOnly "Esta instalación sólo se puede desinstalar en Windows de 64 bits."
 
 ; Vista & Later Default Programs Registration

smplayer/trunk/setup/translations/tradchinese.nsh

@@ -16 +16 @@
 ${LangFileString} Existing_32bitInst "An existing 32-bit installation of SMPlayer exists. You must uninstall 32-bit SMPlayer first."
 ${LangFileString} Existing_64bitInst "An existing 64-bit installation of SMPlayer exists. You must uninstall 64-bit SMPlayer first."
+
+; Welcome page
+${LangFileString} WelcomePage_Title "$(^NameDA) Setup"
+${LangFileString} WelcomePage_Text "Setup will guide you through the installation of $(^NameDA).$\r$\n$\r$\nIt is recommended that you close all instances of SMPlayer before starting setup. This will make it possible to update relevant program files without having to reboot your computer.$\r$\n$\r$\n$_CLICK"
 
 ; Components Page
@@ -69 +73 @@
 ${LangFileString} StartBtn "Start"
 
-; MPlayer Section
-${LangFileString} MPlayer_DL_Msg "Downloading MPlayer..."
-${LangFileString} MPlayer_DL_Retry "MPlayer was not successfully installed. Retry?"
-${LangFileString} MPlayer_DL_Failed "Failed to download MPlayer: '$R0'."
-${LangFileString} MPlayer_Inst_Failed "Failed to install MPlayer. MPlayer is required for playback."
-
 ; Codecs Section
 ${LangFileString} Codecs_DL_Msg "Downloading MPlayer codecs..."