Imported Upstream version 0.6.9

28 files changed, 1237 insertions, 1126 deletions

diff --git a/setup/Readme.txt b/setup/Readme.txt
index b4b5ff1..bee160f 100644
--- a/setup/Readme.txt
+++ b/setup/Readme.txt
@@ -1,5 +1,5 @@
 smplayer-installer.nsi is the script for NSIS (Nullsoft Scriptable Install System), which allows to create

-the installer for Windows. This script requires requires NSIS 2.x available freely from http://nsis.sourceforge.net.

+the installer for Windows. This script requires requires NSIS Unicode 2.45 available freely from http://www.scratchpaper.com/home/downloads.

 It is intended to be ran one directory up from 'smplayer-build'.

 

 The SMPlayer NSIS script is set up to compile two different setups:

@@ -14,7 +14,8 @@ MakeNSISW (GUI Compiler): Tools -> Settings. Add WITH_MPLAYER in Symbol Name and
 

 Other required files:

 - 7za.exe (http://www.7zip.org)

-- inetc plugin (http://nsis.sourceforge.net/Inetc_plug-in)

+- Unicode inetc plugin (http://nsis.sourceforge.net/Inetc_plug-in)

+Also available in: ftp://ftp.berlios.de/pub/smplayer/tools/nsis/

 

 Other required defines w/ values:

 VER_MAJOR

@@ -23,4 +24,4 @@ VER_BUILD
 VER_REVISION (only if non-zero)

 

 To build v0.6.8 that includes MPlayer files:

-C:\Program Files\NSIS\makensis.exe /DWITH_MPLAYER /DVER_MAJOR=0 /DVER_MINOR=6 /DVER_BUILD=8 smplayer-installer.nsi
\ No newline at end of file
+C:\Program Files\NSIS\Unicode\makensis.exe /DWITH_MPLAYER /DVER_MAJOR=0 /DVER_MINOR=6 /DVER_BUILD=8 smplayer-installer.nsi
\ No newline at end of file
diff --git a/setup/install_smplayer.bat b/setup/install_smplayer.bat
index 31846aa..ed55e0a 100644
--- a/setup/install_smplayer.bat
+++ b/setup/install_smplayer.bat
@@ -9,8 +9,8 @@ set OUTPUT_DIR=smplayer-build
 set SMPLAYER_DIR=svn\smplayer\

 set SMPLAYER_THEMES_DIR=svn\smplayer-themes\

 

-set QT_DIR=c:\Qt\4.4.2

-set QXT_DIR=c:\libqxt

+set QT_DIR=c:\Qt\4.5.1

+set QXT_DIR=c:\development\libqxt

 set MINGW_DIR=c:\MinGW

 

 mkdir %OUTPUT_DIR%

diff --git a/setup/mplayer.codecs.win32.nsi b/setup/mplayer.codecs.win32.nsi
new file mode 100644
index 0000000..b469f1f
--- /dev/null
+++ b/setup/mplayer.codecs.win32.nsi
@@ -0,0 +1,145 @@
+; Written by redxii <redxii1234@hotmail.com>

+; Codecs installer for SMPlayer

+

+;--------------------------------

+;Compressor

+

+  SetCompressor /SOLID lzma

+  SetCompressorDictSize 32

+

+;--------------------------------

+;Defines

+

+  !define PRODUCT_VERSION "20071007"

+

+;--------------------------------

+;Include Modern UI and functions

+

+  !include MUI2.nsh

+

+;--------------------------------

+;General

+

+  ;Name and file

+  Name "MPlayer Binary Codecs ${PRODUCT_VERSION}"

+  OutFile "smplayer_codecs_${PRODUCT_VERSION}.exe"

+

+  ;Show details

+  ShowInstDetails show

+

+  ;Get installation folder from registry if available

+  InstallDirRegKey HKLM "Software\SMPlayer" "Path"

+

+  ;Vista+ XML manifest, does not affect older OSes

+  RequestExecutionLevel admin

+

+;--------------------------------

+;Variables

+

+  Var IS_ADMIN

+  Var USERNAME

+

+;--------------------------------

+;Interface Settings

+

+  !define MUI_ABORTWARNING

+  !define MUI_FINISHPAGE_NOREBOOTSUPPORT

+  !define MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange.bmp"

+

+  ;Installer/Uninstaller icons

+  !define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\orange-install.ico"

+

+;--------------------------------

+;Pages

+

+  ;Install pages

+  !insertmacro MUI_PAGE_WELCOME

+  !insertmacro MUI_PAGE_DIRECTORY

+  !insertmacro MUI_PAGE_INSTFILES

+  !insertmacro MUI_PAGE_FINISH

+

+;--------------------------------

+; Languages

+

+  !insertmacro MUI_LANGUAGE "English"

+

+;--------------------------------

+;Reserve Files

+

+  ;These files should be inserted before other files in the data block

+  ;Keep these lines before any File command

+  ;Only for solid compression (by default, solid compression is enabled for BZIP2 and LZMA)

+

+  ReserveFile "${NSISDIR}\Plugins\UserInfo.dll"

+

+;------------------------------------------------------------------------------------------------

+;Installer Sections

+

+;--------------------------------

+; Main SMPlayer files

+Section -Codecs

+

+  Delete "$INSTDIR\mplayer\codecs\*"

+

+  SetOutPath "$INSTDIR\mplayer\codecs"

+  File "codecs\*"

+

+  WriteRegDWORD HKLM Software\SMPlayer Installed_Codecs 0x1

+

+SectionEnd

+

+;--------------------------------

+;Installer Functions

+

+Function .onInit

+

+  /* Privileges Check */

+  Call CheckUserRights

+

+  ;Check for admin (mimic old Inno Setup behavior)

+  ${If} $IS_ADMIN == 0

+    MessageBox MB_OK|MB_ICONSTOP "You must be logged in as an administrator when installing this program."

+    Abort

+  ${EndIf}

+

+  ClearErrors

+  ReadRegStr $0 HKLM Software\SMPlayer "Path"

+  IfErrors 0 +2

+    MessageBox MB_OK|MB_ICONEXCLAMATION "SMPlayer installation not found. You will have to manually locate your SMPlayer installation."

+

+FunctionEnd

+

+Function .onVerifyInstDir

+

+  IfFileExists $INSTDIR\smplayer.exe PathGood

+    Abort ; if $INSTDIR is not a smplayer directory, don't let us install there

+  PathGood:

+

+FunctionEnd

+

+Function CheckUserRights

+

+  ClearErrors

+  UserInfo::GetName

+  ${If} ${Errors}

+    StrCpy $IS_ADMIN 1

+    Return

+  ${EndIf}

+

+  Pop $USERNAME

+  UserInfo::GetAccountType

+  Pop $R0

+  ${Switch} $R0

+    ${Case} "Admin"

+    ${Case} "Power"

+      StrCpy $IS_ADMIN 1

+      ${Break}

+    ${Default}

+      StrCpy $IS_ADMIN 0

+      ${Break}

+  ${EndSwitch}

+

+FunctionEnd

+

+;End Installer Sections

+;------------------------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/setup/smplayer-installer.nsi b/setup/smplayer-installer.nsi
index 73a080a..d3b1257 100644
--- a/setup/smplayer-installer.nsi
+++ b/setup/smplayer-installer.nsi
@@ -1,5 +1,5 @@
 ; Installer script for win32 SMPlayer

-; Written by redxii <redxii1234@hotmail.com>

+; Written by redxii (redxii@users.sourceforge.net)

 

 ;--------------------------------

 ;Compressor

@@ -10,78 +10,74 @@
 ;--------------------------------

 ;Additional plugin folders

 

-  !addplugindir plugins

+  !addplugindir .

 

 ;--------------------------------

-;Misc Defines

+;Defines

 

 !ifdef VER_REVISION

-  !define PRODUCT_VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUILD}.${VER_REVISION}"

-!else

-  !define PRODUCT_VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUILD}"

+  !define SMPLAYER_VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUILD}.${VER_REVISION}"

+  !define SMPLAYER_PRODUCT_VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUILD}.${VER_REVISION}"

+!else ifndef VER_REVISION

+  !define SMPLAYER_VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUILD}"

+  !define SMPLAYER_PRODUCT_VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUILD}.0"

 !endif

-  !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\SMPlayer"

 

-  ; Fallback versions

+  !define SMPLAYER_APP_PATHS_KEY "Software\Microsoft\Windows\CurrentVersion\App Paths\smplayer.exe"

+  !define SMPLAYER_DEFPROGRAMS_KEY "Software\Clients\Media\SMPlayer\Capabilities"

+  !define SMPLAYER_REG_KEY "Software\SMPlayer"

+

+  !define SMPLAYER_UNINST_EXE "uninst.exe"

+  !define SMPLAYER_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\SMPlayer"

+

+  ;Fallback versions

+  ;These can be changed in the compiler, otherwise

+  ;if not defined the values shown here will be used.

 !ifndef DEFAULT_CODECS_VERSION

   !define DEFAULT_CODECS_VERSION "windows-essential-20071007"

 !endif

 !ifndef WITH_MPLAYER

 !ifndef DEFAULT_MPLAYER_VERSION

-  !define DEFAULT_MPLAYER_VERSION "mplayer-svn-28311"

+  !define DEFAULT_MPLAYER_VERSION "mplayer-svn-28311-2"

 !endif

 !endif

 

 ;--------------------------------

-;Include Modern UI and functions

-

-  !include MUI2.nsh

-  !include Sections.nsh

-  !include Memento.nsh

-  !include WinVer.nsh

-

-;--------------------------------

 ;General

 

   ;Name and file

-  Name "SMPlayer ${PRODUCT_VERSION}"

-  BrandingText "SMPlayer for Windows v${PRODUCT_VERSION}"

+  Name "SMPlayer ${SMPLAYER_VERSION}"

+  BrandingText "SMPlayer for Windows v${SMPLAYER_VERSION}"

 !ifdef WITH_MPLAYER

-  OutFile "smplayer-${PRODUCT_VERSION}-win32.exe"

-!else

-  OutFile "smplayer-${PRODUCT_VERSION}-win32-webdl.exe"

+  OutFile "smplayer-${SMPLAYER_VERSION}-win32.exe"

+!else ifndef WITH_MPLAYER

+  OutFile "smplayer-${SMPLAYER_VERSION}-win32-webdl.exe"

 !endif

 

   ;Version tab properties

-!ifdef VER_REVISION

-  VIProductVersion "${PRODUCT_VERSION}"

-!else

-  VIProductVersion "${PRODUCT_VERSION}.0"

-!endif

+  VIProductVersion "${SMPLAYER_PRODUCT_VERSION}"

   VIAddVersionKey "ProductName" "SMPlayer"

-  VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION}"

-  VIAddVersionKey "Comments" "This installation was built with NSIS."

+  VIAddVersionKey "ProductVersion" "${SMPLAYER_VERSION}"

+  VIAddVersionKey "FileVersion" "${SMPLAYER_VERSION}"

+  VIAddVersionKey "LegalCopyright" ""

 !ifdef WITH_MPLAYER

   VIAddVersionKey "FileDescription" "SMPlayer Installer (w/ MPlayer)"

-!else

+!else ifndef WITH_MPLAYER

   VIAddVersionKey "FileDescription" "SMPlayer Installer (MPlayer Web Downloader)"

 !endif

-  VIAddVersionKey "FileVersion" "${PRODUCT_VERSION}"

-  VIAddVersionKey "LegalCopyright" ""

 

   ;Default installation folder

   InstallDir "$PROGRAMFILES\SMPlayer"

 

   ;Get installation folder from registry if available

-  InstallDirRegKey HKLM "Software\SMPlayer" "Path"

-

-  ;Show details

-  ShowInstDetails show

-  ShowUnInstDetails show

+  InstallDirRegKey HKLM "${SMPLAYER_REG_KEY}" "Path"

 

   ;Vista+ XML manifest, does not affect older OSes

   RequestExecutionLevel admin

 

+  ShowInstDetails show

+  ShowUnInstDetails show

+

 ;--------------------------------

 ;Variables

 

@@ -90,22 +86,34 @@
 !ifndef WITH_MPLAYER

   Var MPLAYER_VERSION

 !endif

+  Var PREVIOUS_VERSION

+  Var PREVIOUS_VERSION_STATE

+  Var REINSTALL_UNINSTALL

+  Var REINSTALL_UNINSTALLBUTTON

   Var USERNAME

 

 ;--------------------------------

 ;Interface Settings

 

-  !define MUI_ABORTWARNING

-  !define MUI_COMPONENTSPAGE_SMALLDESC

+  ; License page

   !define MUI_LICENSEPAGE_RADIOBUTTONS

+

+  ; Components page

+  !define MUI_COMPONENTSPAGE_SMALLDESC

+

+  ; Finish page

   !define MUI_FINISHPAGE_NOREBOOTSUPPORT

   !define MUI_FINISHPAGE_RUN $INSTDIR\smplayer.exe

   !define MUI_FINISHPAGE_RUN_NOTCHECKED

-  !define MUI_FINISHPAGE_RUN_PARAMETERS http://88.191.30.130:8050

+  ;!define MUI_FINISHPAGE_RUN_PARAMETERS http://88.191.30.130:8050

   !define MUI_FINISHPAGE_SHOWREADME $INSTDIR\Release_notes.txt

   !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED

   !define MUI_FINISHPAGE_SHOWREADME_TEXT "View Release Notes"

+

+  ; Misc

   !define MUI_WELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange.bmp"

+  !define MUI_UNWELCOMEFINISHPAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Wizard\orange-uninstall.bmp"

+  !define MUI_ABORTWARNING

 

   ;Installer/Uninstaller icons

   !define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\orange-install.ico"

@@ -113,12 +121,23 @@
 

   ;Language Selection Dialog Settings

   !define MUI_LANGDLL_REGISTRY_ROOT HKLM

-  !define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"

+  !define MUI_LANGDLL_REGISTRY_KEY "${SMPLAYER_UNINST_KEY}"

   !define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language"

 

   ;Memento Settings

   !define MEMENTO_REGISTRY_ROOT HKLM

-  !define MEMENTO_REGISTRY_KEY Software\SMPlayer

+  !define MEMENTO_REGISTRY_KEY "${SMPLAYER_REG_KEY}"

+

+;--------------------------------

+;Include Modern UI and functions

+

+  !include MUI2.nsh

+  !include FileFunc.nsh

+  !include Memento.nsh

+  !include nsDialogs.nsh

+  !include Sections.nsh

+  !include WinVer.nsh

+  !include WordFunc.nsh

 

 ;--------------------------------

 ;Pages

@@ -126,22 +145,27 @@
   ;Install pages

   !insertmacro MUI_PAGE_WELCOME

   !insertmacro MUI_PAGE_LICENSE "smplayer-build\Copying.txt"

+  Page custom PageReinstall PageLeaveReinstall

+  !define MUI_PAGE_CUSTOMFUNCTION_PRE PageComponentsPre

   !insertmacro MUI_PAGE_COMPONENTS

+  !define MUI_PAGE_CUSTOMFUNCTION_PRE PageDirectoryPre

   !insertmacro MUI_PAGE_DIRECTORY

+  !define MUI_PAGE_CUSTOMFUNCTION_SHOW PageInstfilesShow

   !insertmacro MUI_PAGE_INSTFILES

   !insertmacro MUI_PAGE_FINISH

 

   ;Uninstall pages

+  !define MUI_PAGE_CUSTOMFUNCTION_PRE un.ConfirmPagePre

   !insertmacro MUI_UNPAGE_CONFIRM

   !insertmacro MUI_UNPAGE_INSTFILES

+  !define MUI_PAGE_CUSTOMFUNCTION_PRE un.FinishPagePre

+  !insertmacro MUI_UNPAGE_FINISH

 

 ;--------------------------------

-; Languages

+;Languages

 

   !insertmacro MUI_LANGUAGE "Basque"

   !insertmacro MUI_LANGUAGE "Catalan"

-  !insertmacro MUI_LANGUAGE "SimpChinese"

-  !insertmacro MUI_LANGUAGE "TradChinese"

   !insertmacro MUI_LANGUAGE "Czech"

   !insertmacro MUI_LANGUAGE "Danish"

   !insertmacro MUI_LANGUAGE "Dutch"

@@ -152,7 +176,6 @@
   !insertmacro MUI_LANGUAGE "Hebrew"

   !insertmacro MUI_LANGUAGE "Hungarian"

   !insertmacro MUI_LANGUAGE "Italian"

-  !insertmacro MUI_LANGUAGE "Japanese"

   !insertmacro MUI_LANGUAGE "Norwegian"

   !insertmacro MUI_LANGUAGE "Polish"

   !insertmacro MUI_LANGUAGE "Portuguese"

@@ -161,31 +184,27 @@
   !insertmacro MUI_LANGUAGE "Slovenian"

   !insertmacro MUI_LANGUAGE "Spanish"

 

-;--------------------------------

-; Translations for setup

-

-  !include "translations\basque.nsh"

-  !include "translations\catalan.nsh"

-  !include "translations\chinese-simp.nsh"

-  !include "translations\chinese-trad.nsh"

-  !include "translations\czech.nsh"

-  !include "translations\danish.nsh"

-  !include "translations\dutch.nsh"

-  !include "translations\english.nsh"

-  !include "translations\finnish.nsh"

-  !include "translations\french.nsh"

-  !include "translations\german.nsh"

-  !include "translations\hebrew.nsh"

-  !include "translations\hungarian.nsh"

-  !include "translations\italian.nsh"

-  !include "translations\japanese.nsh"

-  !include "translations\norwegian.nsh"

-  !include "translations\polish.nsh"

-  !include "translations\portuguese.nsh"

-  !include "translations\russian.nsh"

-  !include "translations\slovak.nsh"

-  !include "translations\slovenian.nsh"

-  !include "translations\spanish.nsh"

+; Custom translations for setup

+

+  !insertmacro LANGFILE_INCLUDE "svn\smplayer\setup\translations\basque.nsh"

+  !insertmacro LANGFILE_INCLUDE "svn\smplayer\setup\translations\catalan.nsh"

+  !insertmacro LANGFILE_INCLUDE "svn\smplayer\setup\translations\czech.nsh"

+  !insertmacro LANGFILE_INCLUDE "svn\smplayer\setup\translations\danish.nsh"

+  !insertmacro LANGFILE_INCLUDE "svn\smplayer\setup\translations\dutch.nsh"

+  !insertmacro LANGFILE_INCLUDE "svn\smplayer\setup\translations\english.nsh"

+  !insertmacro LANGFILE_INCLUDE "svn\smplayer\setup\translations\finnish.nsh"

+  !insertmacro LANGFILE_INCLUDE "svn\smplayer\setup\translations\french.nsh"

+  !insertmacro LANGFILE_INCLUDE "svn\smplayer\setup\translations\german.nsh"

+  !insertmacro LANGFILE_INCLUDE "svn\smplayer\setup\translations\hebrew.nsh"

+  !insertmacro LANGFILE_INCLUDE "svn\smplayer\setup\translations\hungarian.nsh"

+  !insertmacro LANGFILE_INCLUDE "svn\smplayer\setup\translations\italian.nsh"

+  !insertmacro LANGFILE_INCLUDE "svn\smplayer\setup\translations\norwegian.nsh"

+  !insertmacro LANGFILE_INCLUDE "svn\smplayer\setup\translations\polish.nsh"

+  !insertmacro LANGFILE_INCLUDE "svn\smplayer\setup\translations\portuguese.nsh"

+  !insertmacro LANGFILE_INCLUDE "svn\smplayer\setup\translations\russian.nsh"

+  !insertmacro LANGFILE_INCLUDE "svn\smplayer\setup\translations\slovak.nsh"

+  !insertmacro LANGFILE_INCLUDE "svn\smplayer\setup\translations\slovenian.nsh"

+  !insertmacro LANGFILE_INCLUDE "svn\smplayer\setup\translations\spanish.nsh"

 

 ;--------------------------------

 ;Reserve Files

@@ -200,43 +219,52 @@
 ;--------------------------------

 ;Installer Types

 

-  InstType "Recommended"

-  InstType "Minimum"

+  InstType "Typical"

+  InstType "Compact"

   InstType "Full"

 

-;------------------------------------------------------------------------------------------------

+;--------------------------------

 ;Installer Sections

 

 ;--------------------------------

-; Main SMPlayer files

+;Main SMPlayer files

 Section SMPlayer SMPlayer

 

   SectionIn 1 2 3 RO

   SetOutPath "$INSTDIR"

   File "smplayer-build\*"

-  File /r "smplayer-build\docs"

-  File /r "smplayer-build\imageformats"

-  File /r "smplayer-build\shortcuts"

+

+  ;SMPlayer docs

+  SetOutPath "$INSTDIR\docs"

+  File /r "smplayer-build\docs\*.*"

+

+  ;Qt imageformats

+  SetOutPath "$INSTDIR\imageformats"

+  File /r "smplayer-build\imageformats\*.*"

+

+  ;SMPlayer key shortcuts

+  SetOutPath "$INSTDIR\shortcuts"

+  File /r "smplayer-build\shortcuts\*.*"

+

+  SetOutPath "$PLUGINSDIR"

+  File 7za.exe

 

   ;Initialize to 0 if don't exist (based on error flag)

   ClearErrors

-  ReadRegDWORD $R0 HKLM Software\SMPlayer Installed_MPlayer

+  ReadRegDWORD $R0 HKLM "${SMPLAYER_REG_KEY}" Installed_MPlayer

   ${If} ${Errors}

-    WriteRegDWORD HKLM Software\SMPlayer Installed_MPlayer 0x0

+    WriteRegDWORD HKLM "${SMPLAYER_REG_KEY}" Installed_MPlayer 0x0

   ${EndIf}

   ClearErrors

-  ReadRegDWORD $R0 HKLM Software\SMPlayer Installed_Codecs

+  ReadRegDWORD $R0 HKLM "${SMPLAYER_REG_KEY}" Installed_Codecs

   ${If} ${Errors}

-    WriteRegDWORD HKLM Software\SMPlayer Installed_Codecs 0x0

+    WriteRegDWORD HKLM "${SMPLAYER_REG_KEY}" Installed_Codecs 0x0

   ${EndIf}

 

-  SetOutPath "$PLUGINSDIR"

-  File 7za.exe

-

 SectionEnd

 

 ;--------------------------------

-; Desktop shortcut

+;Desktop shortcut

 ${MementoSection} "Desktop Shortcut" DesktopIcon

   SectionIn 1 3

 

@@ -247,7 +275,7 @@ ${MementoSection} "Desktop Shortcut" DesktopIcon
 ${MementoSectionEnd}

 

 ;--------------------------------

-; Start menu shortcuts

+;Start menu shortcuts

 ${MementoSection} "Start Menu Shortcut" StartMenuIcon

   SectionIn 1 3

 

@@ -256,83 +284,68 @@ ${MementoSection} "Start Menu Shortcut" StartMenuIcon
   CreateDirectory "$SMPROGRAMS\SMPlayer"

   CreateShortCut "$SMPROGRAMS\SMPlayer\SMPlayer.lnk" "$INSTDIR\smplayer.exe"

   WriteINIStr    "$SMPROGRAMS\SMPlayer\SMPlayer on the Web.url" "InternetShortcut" "URL" "http://smplayer.sf.net"

-  CreateShortCut "$SMPROGRAMS\SMPlayer\Uninstall SMPlayer.lnk" "$INSTDIR\uninst.exe"

+  CreateShortCut "$SMPROGRAMS\SMPlayer\Uninstall SMPlayer.lnk" "$INSTDIR\${SMPLAYER_UNINST_EXE}"

 

 ${MementoSectionEnd}

 

 ;--------------------------------

-; MPlayer Components

+;MPlayer & MPlayer Codecs

 SectionGroup /e "MPlayer Components"

 

-;--------------------------------

-; MPlayer

 !ifdef WITH_MPLAYER

   Section MPlayer MPlayer

     SectionIn 1 2 3 RO

 

-    SetOutPath "$INSTDIR"

-    File /r "smplayer-build\mplayer"

+    SetOutPath "$INSTDIR\mplayer"

+    File /r "smplayer-build\mplayer\*.*"

 

-    WriteRegDWORD HKLM Software\SMPlayer Installed_MPlayer 0x1

+    WriteRegDWORD HKLM "${SMPLAYER_REG_KEY}" Installed_MPlayer 0x1

 

   SectionEnd

-!else

+!else ifndef WITH_MPLAYER

   Section MPlayer MPlayer

     SectionIn 1 2 3 RO

-    AddSize 15300

-

-    ReadRegDWORD $0 HKLM Software\SMPlayer Installed_MPlayer

-

-    IntCmp $0 1 mplayerInstalled mplayerNotInstalled

-      mplayerInstalled:

-        MessageBox MB_YESNO $(MPLAYER_IS_INSTALLED) /SD IDNO IDYES mplayerNotInstalled IDNO done

-      mplayerNotInstalled:

-        ${IfNot} ${FileExists} "$PLUGINSDIR\version-info"

-          Call getVerInfo

-        ${EndIf}

+    AddSize 16800

 

-        IfFileExists "$PLUGINSDIR\version-info" 0 noVerInfo

-          ClearErrors

-          ReadINIStr $MPLAYER_VERSION "$PLUGINSDIR\version-info" smplayer mplayer

+    Call GetVerInfo

 

-          IfErrors 0 done_ver_info

-            DetailPrint $(VERINFO_IS_MISSING)

-            ;Default Value if version-info exists but version string is missing from version-info

-            StrCpy $MPLAYER_VERSION ${DEFAULT_MPLAYER_VERSION}

-            Goto done_ver_info

+    ;Read from version-info

+    ;If it was unable to download, set version to that defined in DEFAULT_MPLAYER_VERSION

+    ${If} ${FileExists} "$PLUGINSDIR\version-info"

+      ReadINIStr $MPLAYER_VERSION "$PLUGINSDIR\version-info" smplayer mplayer

+    ${Else}

+      StrCpy $MPLAYER_VERSION ${DEFAULT_MPLAYER_VERSION}

+    ${EndIf}

 

-        noVerInfo:

-          ;Default Value if version-info doesn't exist

-          StrCpy $MPLAYER_VERSION ${DEFAULT_MPLAYER_VERSION}

+    retry_mplayer:

 

-    done_ver_info:

+    DetailPrint $(MPLAYER_IS_DOWNLOADING)

+    inetc::get /timeout 30000 /resume "" /caption $(MPLAYER_IS_DOWNLOADING) /banner "Downloading $MPLAYER_VERSION.7z" \

+    "http://downloads.sourceforge.net/smplayer/$MPLAYER_VERSION.7z?big_mirror=0" \

+    "$PLUGINSDIR\$MPLAYER_VERSION.7z"

+    Pop $R0

+    StrCmp $R0 OK 0 check_mplayer

 

-      DetailPrint $(MPLAYER_IS_DOWNLOADING)

-      inetc::get /timeout 30000 /resume "" /caption $(MPLAYER_IS_DOWNLOADING) /banner "Downloading $MPLAYER_VERSION.7z" \

-      "http://downloads.sourceforge.net/smplayer/$MPLAYER_VERSION.7z?big_mirror=0" \

-      "$PLUGINSDIR\$MPLAYER_VERSION.7z"

-      Pop $R0

-      StrCmp $R0 OK 0 check_mplayer

+    ;Extract

+    nsExec::Exec '"$PLUGINSDIR\7za.exe" x "$PLUGINSDIR\$MPLAYER_VERSION.7z" -y -o"$PLUGINSDIR"'

 

-      ;Extract

-      nsExec::Exec '"$PLUGINSDIR\7za.exe" x "$PLUGINSDIR\$MPLAYER_VERSION.7z" -y -o"$PLUGINSDIR"'

-

-      ;Copy

-      CreateDirectory "$INSTDIR\mplayer"

-      CopyFiles /SILENT "$PLUGINSDIR\$MPLAYER_VERSION\*" "$INSTDIR\mplayer"

+    ;Copy

+    CreateDirectory "$INSTDIR\mplayer"

+    CopyFiles /SILENT "$PLUGINSDIR\$MPLAYER_VERSION\*" "$INSTDIR\mplayer"

 

     check_mplayer:

-      ;This label does not necessarily mean there was a download error, so check first

-      ${If} $R0 != "OK"

-        DetailPrint "$(MPLAYER_DL_FAILED) $R0."

-      ${EndIf}

-

-      IfFileExists "$INSTDIR\mplayer\mplayer.exe" mplayerInstSuccess mplayerInstFailed

-        mplayerInstSuccess:

-          WriteRegDWORD HKLM Software\SMPlayer Installed_MPlayer 0x1

-          Goto done

-        mplayerInstFailed:

-          Abort $(MPLAYER_INST_FAILED)

+    ;This label does not necessarily mean there was a download error, so check first

+    ${If} $R0 != "OK"

+      DetailPrint $(MPLAYER_DL_FAILED)

+    ${EndIf}

+

+    IfFileExists "$INSTDIR\mplayer\mplayer.exe" mplayerInstSuccess mplayerInstFailed

+      mplayerInstSuccess:

+        WriteRegDWORD HKLM "${SMPLAYER_REG_KEY}" Installed_MPlayer 0x1

+        Goto done

+      mplayerInstFailed:

+        MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION $(MPLAYER_DL_RETRY) /SD IDCANCEL IDRETRY retry_mplayer

+        Abort $(MPLAYER_INST_FAILED)

 

     done:

 

@@ -340,65 +353,52 @@ SectionGroup /e "MPlayer Components"
 !endif

 

 ;--------------------------------

-; Binary codecs

-  Section /o "Optional Codecs" Codecs

+;MPlayer codecs

+  Section /o "Binary Codecs" Codecs

     SectionIn 3

     AddSize 22300

 

-    ReadRegDWORD $1 HKLM Software\SMPlayer Installed_Codecs

-

-    IntCmp $1 1 mplayerCodecsInstalled mplayerCodecsNotInstalled

-      mplayerCodecsInstalled:

-        MessageBox MB_YESNO $(CODECS_IS_INSTALLED) /SD IDNO IDYES mplayerCodecsNotInstalled IDNO done

-      mplayerCodecsNotInstalled:

-        ${IfNot} ${FileExists} "$PLUGINSDIR\version-info"

-          Call getVerInfo

-        ${EndIf}

-

-        IfFileExists "$PLUGINSDIR\version-info" 0 noVerInfo

-          ClearErrors

-          ReadINIStr $CODEC_VERSION "$PLUGINSDIR\version-info" smplayer mplayercodecs

+    Call GetVerInfo

 

-          IfErrors 0 done_ver_info

-            DetailPrint $(VERINFO_IS_MISSING)

-            ;Default Value if version-info exists but version string is missing from version-info

-            StrCpy $CODEC_VERSION ${DEFAULT_CODECS_VERSION}

-            Goto done_ver_info

+    ;Read from version-info

+    ;If it was unable to download, set version to that defined in DEFAULT_CODECS_VERSION

+    ${If} ${FileExists} "$PLUGINSDIR\version-info"

+      ReadINIStr $CODEC_VERSION "$PLUGINSDIR\version-info" smplayer mplayercodecs

+    ${Else}

+      StrCpy $CODEC_VERSION ${DEFAULT_CODECS_VERSION}

+    ${EndIf}

 

-        noVerInfo:

-          ;Default Value if version-info doesn't exist

-          StrCpy $CODEC_VERSION ${DEFAULT_CODECS_VERSION}

+    retry_codecs:

 

-    done_ver_info:

+    DetailPrint $(CODECS_IS_DOWNLOADING)

+    inetc::get /timeout 30000 /resume "" /caption $(CODECS_IS_DOWNLOADING) /banner "Downloading $CODEC_VERSION.zip" \

+    "http://www.mplayerhq.hu/MPlayer/releases/codecs/$CODEC_VERSION.zip" \

+    "$PLUGINSDIR\$CODEC_VERSION.zip"

+    Pop $R0

+    StrCmp $R0 OK 0 check_codecs

 

-      DetailPrint $(CODECS_IS_DOWNLOADING)

-      inetc::get /timeout 30000 /resume "" /caption $(CODECS_IS_DOWNLOADING) /banner "Downloading $CODEC_VERSION.zip" \

-      "http://www.mplayerhq.hu/MPlayer/releases/codecs/$CODEC_VERSION.zip" \

-      "$PLUGINSDIR\$CODEC_VERSION.zip"

-      Pop $R0

-      StrCmp $R0 OK 0 check_codecs

+    ;Extract

+    nsExec::Exec '"$PLUGINSDIR\7za.exe" x "$PLUGINSDIR\$CODEC_VERSION.zip" -y -o"$PLUGINSDIR"'

 

-      ;Extract

-      nsExec::Exec '"$PLUGINSDIR\7za.exe" x "$PLUGINSDIR\$CODEC_VERSION.zip" -y -o"$PLUGINSDIR"'

-

-      ;Copy

-      CreateDirectory "$INSTDIR\mplayer\codecs"

-      CopyFiles /SILENT "$PLUGINSDIR\$CODEC_VERSION\*" "$INSTDIR\mplayer\codecs"

+    ;Copy

+    CreateDirectory "$INSTDIR\mplayer\codecs"

+    CopyFiles /SILENT "$PLUGINSDIR\$CODEC_VERSION\*" "$INSTDIR\mplayer\codecs"

 

     check_codecs:

-      ;This label does not necessarily mean there was a download error, so check first

-      ${If} $R0 != "OK"

-        DetailPrint "$(CODECS_DL_FAILED) $R0."

-      ${EndIf}

-

-      IfFileExists "$INSTDIR\mplayer\codecs\*.dll" codecsInstSuccess codecsInstFailed

-        codecsInstSuccess:

-          WriteRegDWORD HKLM Software\SMPlayer Installed_Codecs 0x1

-          Goto done

-        codecsInstFailed:

-          DetailPrint $(CODECS_INST_FAILED)

-          WriteRegDWORD HKLM Software\SMPlayer Installed_Codecs 0x0

-          Sleep 5000

+    ;This label does not necessarily mean there was a download error, so check first

+    ${If} $R0 != "OK"

+      DetailPrint $(CODECS_DL_FAILED)

+    ${EndIf}

+

+    IfFileExists "$INSTDIR\mplayer\codecs\*.dll" codecsInstSuccess codecsInstFailed

+      codecsInstSuccess:

+        WriteRegDWORD HKLM "${SMPLAYER_REG_KEY}" Installed_Codecs 0x1

+        Goto done

+      codecsInstFailed:

+        MessageBox MB_RETRYCANCEL|MB_ICONEXCLAMATION $(CODECS_DL_RETRY) /SD IDCANCEL IDRETRY retry_codecs

+        DetailPrint $(CODECS_INST_FAILED)

+        WriteRegDWORD HKLM "${SMPLAYER_REG_KEY}" Installed_Codecs 0x0

+        Sleep 5000

 

     done:

 

@@ -407,112 +407,104 @@ SectionGroup /e "MPlayer Components"
 SectionGroupEnd

 

 ;--------------------------------

-; Icon Themes

+;Icon themes

 ${MementoSection} "Icon Themes" Themes

 

   SectionIn 1 3

-  SetOutPath "$INSTDIR"

-  File /r "smplayer-build\themes"

+  SetOutPath "$INSTDIR\themes"

+  File /r "smplayer-build\themes\*.*"

 

 ${MementoSectionEnd}

 

 ;--------------------------------

-; Translations

+;Translations

 ${MementoSection} Translations Translations

 

   SectionIn 1 3

-  SetOutPath "$INSTDIR"

-  File /r "smplayer-build\translations"

+  SetOutPath "$INSTDIR\translations"

+  File /r "smplayer-build\translations\*.*"

 

 ${MementoSectionEnd}

 

+;--------------------------------

+;Install/Uninstall information

 Section -Post

 

   ;Uninstall file

-  WriteUninstaller "$INSTDIR\uninst.exe"

+  WriteUninstaller "$INSTDIR\${SMPLAYER_UNINST_EXE}"

 

-  ;Store installed path

-  WriteRegStr HKLM "Software\SMPlayer" "Path" "$INSTDIR"

-  WriteRegStr HKLM "Software\SMPlayer" "Version" "${PRODUCT_VERSION}"

+  ;Store installed path & version

+  WriteRegStr HKLM "${SMPLAYER_REG_KEY}" "Path" "$INSTDIR"

+  WriteRegStr HKLM "${SMPLAYER_REG_KEY}" "Version" "${SMPLAYER_VERSION}"

 

+  ;Allows user to use 'start smplayer.exe'

+  WriteRegStr HKLM "${SMPLAYER_APP_PATHS_KEY}" "" "$INSTDIR\smplayer.exe"

+

+  ;Registry entries needed for Default Programs in Vista & later

   ${If} ${AtLeastWinVista}

-    Call defaultProgramsReg

+    Call DefaultProgramsReg

   ${EndIf}

 

   ;Registry Uninstall information

-  WriteRegStr HKLM "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"

-  WriteRegStr HKLM "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\smplayer.exe"

-  WriteRegStr HKLM "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"

-  WriteRegStr HKLM "${PRODUCT_UNINST_KEY}" "HelpLink" "http://smplayer.sourceforge.net/forums"

-  WriteRegStr HKLM "${PRODUCT_UNINST_KEY}" "Publisher" "RVM"

-  WriteRegStr HKLM "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"

-  WriteRegStr HKLM "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "http://smplayer.sf.net"

-  WriteRegStr HKLM "${PRODUCT_UNINST_KEY}" "URLUpdateInfo" "http://smplayer.sf.net"

-  WriteRegDWORD HKLM "${PRODUCT_UNINST_KEY}" "NoModify" "1"

-  WriteRegDWORD HKLM "${PRODUCT_UNINST_KEY}" "NoRepair" "1"

+  WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "DisplayName" "$(^Name)"

+  WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "DisplayIcon" "$INSTDIR\smplayer.exe"

+  WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "DisplayVersion" "${SMPLAYER_VERSION}"

+  WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "HelpLink" "http://smplayer.berlios.de/forum"

+  WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "Publisher" "RVM"

+  WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "UninstallString" "$INSTDIR\${SMPLAYER_UNINST_EXE}"

+  WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "URLInfoAbout" "http://smplayer.sf.net"

+  WriteRegStr HKLM "${SMPLAYER_UNINST_KEY}" "URLUpdateInfo" "http://smplayer.sf.net"

+  WriteRegDWORD HKLM "${SMPLAYER_UNINST_KEY}" "NoModify" "1"

+  WriteRegDWORD HKLM "${SMPLAYER_UNINST_KEY}" "NoRepair" "1"

 

 SectionEnd

 

 ${MementoSectionDone}

 

 ;--------------------------------

-; Section descriptions

+;Section descriptions

 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN

   !insertmacro MUI_DESCRIPTION_TEXT ${SMPlayer} "SMPlayer, shared libraries, and documentation."

   !insertmacro MUI_DESCRIPTION_TEXT ${DesktopIcon} "Creates a shortcut on the desktop."

   !insertmacro MUI_DESCRIPTION_TEXT ${StartMenuIcon} "Creates start menu shortcuts."

 !ifdef WITH_MPLAYER

   !insertmacro MUI_DESCRIPTION_TEXT ${MPlayer} "The engine behind SMPlayer, required for playback."

-!else

-  !insertmacro MUI_DESCRIPTION_TEXT ${MPlayer} "Downloads/installs mplayer; requires an active internet connection. Required for playback."

+!else ifndef WITH_MPLAYER

+  !insertmacro MUI_DESCRIPTION_TEXT ${MPlayer} "Downloads/installs MPlayer; requires an active internet connection. Required for playback."

 !endif

-  !insertmacro MUI_DESCRIPTION_TEXT ${Codecs} "Downloads/installs optional codecs for mplayer; requires an active internet connection."

-  !insertmacro MUI_DESCRIPTION_TEXT ${Themes} "Stylish icon themes for SMPlayer."

-  !insertmacro MUI_DESCRIPTION_TEXT ${Translations} "Translations for SMPlayer."

+  !insertmacro MUI_DESCRIPTION_TEXT ${Codecs} "Downloads/installs optional binary codecs for MPlayer; requires an active internet connection."

+  !insertmacro MUI_DESCRIPTION_TEXT ${Themes} "Additional icon themes for SMPlayer."

+  !insertmacro MUI_DESCRIPTION_TEXT ${Translations} "Translations for the SMPlayer interface && help into 30+ additional languages."

 !insertmacro MUI_FUNCTION_DESCRIPTION_END

 

 ;--------------------------------

-;Installer Functions

+;Installer functions

 

 Function .onInit

 

   /* Check if setup is already running */

-  System::Call 'kernel32::CreateMutexA(i 0, i 0, t "MPlayerSMPlayer") i .r1 ?e'

+  System::Call 'kernel32::CreateMutexW(i 0, i 0, t "MPlayerSMPlayer") i .r1 ?e'

   Pop $R0

 

   StrCmp $R0 0 +3

     MessageBox MB_OK|MB_ICONEXCLAMATION $(SMPLAYER_INSTALLER_IS_RUNNING)

     Abort

 

-  /* Check unsupported Windows OSes */

-  ${Unless} ${AtLeastWin2000}

-    MessageBox MB_YESNO|MB_ICONSTOP $(SMPLAYER_INSTALLER_UNSUPPORTED_OS) /SD IDNO IDYES installonoldwindows

-    Abort

-    installonoldwindows:

-  ${EndUnless}

-

   /* Privileges Check */

   Call CheckUserRights

 

-  ;Check for admin (mimic old Inno Setup behavior... non-admin installation maybe later..)

+  ;Check for admin (mimic old Inno Setup behavior)

   ${If} $IS_ADMIN == 0

     MessageBox MB_OK|MB_ICONSTOP $(SMPLAYER_INSTALLER_NO_ADMIN)

     Abort

-  ${EndIf}

-

-  /* Uninstall previous version */

-  ReadRegStr $R0 HKLM "${PRODUCT_UNINST_KEY}" "UninstallString"

-  StrCmp $R0 "" nouninst

-

-  MessageBox MB_YESNO|MB_ICONEXCLAMATION $(SMPLAYER_INSTALLER_PREV_VERSION) IDNO nouninst

-

-  ClearErrors

-  ExecWait '$R0 _?=$INSTDIR' ;Do not copy the uninstaller to a temp file

-  nouninst:

+  ${EndIf} 

 

+  /* Ask for setup language */

   !insertmacro MUI_LANGDLL_DISPLAY

 

-  ${MementoSectionRestore}

+  Call CheckPreviousVersion

+

+  Call LoadPreviousSettings

 

 FunctionEnd

 

@@ -526,7 +518,7 @@ Function .onInstFailed
 

   Call UninstallSMPlayer

 

-  Delete "$INSTDIR\uninst.exe"

+  Delete "$INSTDIR\${SMPLAYER_UNINST_EXE}"

   RMDir "$INSTDIR"

 

 FunctionEnd

@@ -544,76 +536,18 @@ Function .onSelChange
 

 FunctionEnd

 

-Function defaultProgramsReg

+Function CheckPreviousVersion

 

-  ;HKEY_CLASSES_ROOT ProgId registration

-  WriteRegStr HKCR "MPlayerFileVideo\DefaultIcon" "" '"$INSTDIR\smplayer.exe",1'

-  WriteRegStr HKCR "MPlayerFileVideo\shell\enqueue" "" "Enqueue in SMPlayer"

-  WriteRegStr HKCR "MPlayerFileVideo\shell\enqueue\command" "" '"$INSTDIR\smplayer.exe" -add-to-playlist "%1"'

-  WriteRegStr HKCR "MPlayerFileVideo\shell\open" "FriendlyAppName" "SMPlayer Media Player"

-  WriteRegStr HKCR "MPlayerFileVideo\shell\open\command" "" '"$INSTDIR\smplayer.exe" "%1"'

+  ReadRegStr $PREVIOUS_VERSION HKLM "${SMPLAYER_REG_KEY}" "Version"

 

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities" "ApplicationDescription" "SMPlayer is a complete front-end for MPlayer, from basic features like playing videos, DVDs, VCDs to more advanced features like support for MPlayer filters, edl lists, and more."

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities" "ApplicationName" "SMPlayer"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".3gp" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".ac3" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".ape" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".asf" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".avi" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".bin" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".dat" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".divx" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".dv" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".dvr-ms" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".flv" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".iso" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".m1v" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".m2v" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".m4v" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".mkv" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".mov" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".mp3" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".mp4" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".mpeg" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".mpg" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".mpv" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".mqv" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".nsv" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".ogg" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".ogm" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".ra" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".ram" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".rmvb" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".ts" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".vcd" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".vfw" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".vob" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".wav" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".wma" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\Clients\Media\SMPlayer\Capabilities\FileAssociations" ".wmv" "MPlayerFileVideo"

-  WriteRegStr HKLM "Software\RegisteredApplications" "SMPlayer" "Software\Clients\Media\SMPlayer\Capabilities"

+  ${VersionCompare} $PREVIOUS_VERSION ${SMPLAYER_VERSION} $PREVIOUS_VERSION_STATE

+  ;$PREVIOUS_VERSION_STATE=0  This installer is the same version as the installed copy

+  ;$PREVIOUS_VERSION_STATE=1  A newer version than this installer is already installed

+  ;$PREVIOUS_VERSION_STATE=2  An older version than this installer is already installed

 

 FunctionEnd

 

-Function getVerInfo

-

-  DetailPrint $(VERINFO_IS_DOWNLOADING)

-  inetc::get /timeout 30000 /resume "" /silent "http://smplayer.sourceforge.net/mplayer-version-info" \

-  "$PLUGINSDIR\version-info"

-  Pop $R0

-  StrCmp $R0 OK +2

-    DetailPrint "$(VERINFO_DL_FAILED) $R0."

-

-FunctionEnd

-

-;End Installer Sections

-;------------------------------------------------------------------------------------------------

-

-/************************************************************************************************

-************************************** Shared Functions *****************************************

-************************************************************************************************/

-!macro CheckUserRightsMacro un

-Function ${un}CheckUserRights

+Function CheckUserRights

 

   ClearErrors

   UserInfo::GetName

@@ -636,23 +570,245 @@ Function ${un}CheckUserRights
   ${EndSwitch}

 

 FunctionEnd

-!macroend

-!insertmacro CheckUserRightsMacro ""

-!insertmacro CheckUserRightsMacro "un."

 

-!macro UninstallSMPlayerMacro un

-Function ${un}UninstallSMPlayer

+Function DefaultProgramsReg

 

-  ;Delete registry keys

-  SetDetailsPrint textonly

-  DetailPrint "Deleting Registry Keys..."

-  SetDetailsPrint listonly

+  ;HKEY_CLASSES_ROOT ProgId registration

+  WriteRegStr HKCR "MPlayerFileVideo\DefaultIcon" "" '"$INSTDIR\smplayer.exe",1'

+  WriteRegStr HKCR "MPlayerFileVideo\shell\enqueue" "" "Enqueue in SMPlayer"

+  WriteRegStr HKCR "MPlayerFileVideo\shell\enqueue\command" "" '"$INSTDIR\smplayer.exe" -add-to-playlist "%1"'

+  WriteRegStr HKCR "MPlayerFileVideo\shell\open" "FriendlyAppName" "SMPlayer Media Player"

+  WriteRegStr HKCR "MPlayerFileVideo\shell\open\command" "" '"$INSTDIR\smplayer.exe" "%1"'

 

-  DeleteRegKey HKLM "${PRODUCT_UNINST_KEY}"

-  DeleteRegKey HKCR "MPlayerFileVideo"

-  DeleteRegKey HKLM "Software\Clients\Media\SMPlayer"

-  DeleteRegValue HKLM "Software\RegisteredApplications" "SMPlayer"

-  DeleteRegKey HKLM "Software\SMPlayer"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}" "ApplicationDescription" $(APPLICATION_DESCRIPTION)

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}" "ApplicationName" "SMPlayer"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".3gp" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".ac3" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".ape" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".asf" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".avi" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".bin" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".dat" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".divx" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".dv" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".dvr-ms" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".flac" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".flv" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".iso" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".m1v" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".m2t" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".m2ts" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".m2v" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".m3u" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".m3u8" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".m4v" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".mkv" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".mov" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".mp3" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".mp4" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".mpeg" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".mpg" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".mpv" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".mqv" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".nsv" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".ogg" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".ogm" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".ogv" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".pls" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".ra" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".ram" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".rec" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".rm" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".rmvb" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".swf" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".ts" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".vcd" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".vfw" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".vob" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".wav" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".wma" "MPlayerFileVideo"

+  WriteRegStr HKLM "${SMPLAYER_DEFPROGRAMS_KEY}\FileAssociations" ".wmv" "MPlayerFileVideo"

+  WriteRegStr HKLM "Software\RegisteredApplications" "SMPlayer" "${SMPLAYER_DEFPROGRAMS_KEY}"

+

+FunctionEnd

+

+Function GetVerInfo

+

+  IfFileExists "$PLUGINSDIR\version-info" end_dl_ver_info 0

+    DetailPrint $(VERINFO_IS_DOWNLOADING)

+    inetc::get /timeout 30000 /resume "" /silent "http://smplayer.sourceforge.net/mplayer-version-info" \

+    "$PLUGINSDIR\version-info"

+    Pop $R0

+    StrCmp $R0 OK +2

+      DetailPrint $(VERINFO_DL_FAILED)

+

+  end_dl_ver_info:

+

+FunctionEnd

+

+Function LoadPreviousSettings

+

+  ;MPlayer codecs section doesn't use Memento so we need to restore it manually

+  ReadRegStr $R0 HKLM "${SMPLAYER_REG_KEY}" "Installed_Codecs"

+  ${If} $R0 == 1

+    !insertmacro SelectSection ${Codecs}

+  ${EndIf}

+

+  ${MementoSectionRestore}

+

+FunctionEnd

+

+Function PageReinstall

+

+  ${If} $PREVIOUS_VERSION == ""

+    Abort

+  ${EndIf}

+

+  nsDialogs::Create /NOUNLOAD 1018

+  Pop $0

+

+  ${If} $PREVIOUS_VERSION_STATE == 2

+

+    !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install SMPlayer."

+    nsDialogs::CreateItem /NOUNLOAD STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 0 0 100% 40 "An older version of SMPlayer is installed on your system. Select the operation you want to perform and click Next to continue."

+    Pop $R0

+    nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_VCENTER}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS}|${WS_GROUP}|${WS_TABSTOP} 0 10 55 100% 30 "Upgrade SMPlayer using previous settings (recommended)"

+    Pop $REINSTALL_UNINSTALLBUTTON

+    nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_TOP}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 10 85 100% 50 "Change settings (advanced)"

+    Pop $R0

+

+    ${If} $REINSTALL_UNINSTALL == ""

+      StrCpy $REINSTALL_UNINSTALL 1

+    ${EndIf}

+

+  ${ElseIf} $PREVIOUS_VERSION_STATE == 1

+

+    !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install SMPlayer."

+    nsDialogs::CreateItem /NOUNLOAD STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 0 0 100% 40 "A newer version of SMPlayer is already installed! It is not recommended that you downgrade to an older version. Select the operation you want to perform and click Next to continue."

+    Pop $R0

+    nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_VCENTER}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS}|${WS_GROUP}|${WS_TABSTOP} 0 10 55 100% 30 "Downgrade SMPlayer using previous settings (recommended)"

+    Pop $REINSTALL_UNINSTALLBUTTON

+    nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_TOP}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 10 85 100% 50 "Change settings (advanced)"

+    Pop $R0

+

+    ${If} $REINSTALL_UNINSTALL == ""

+      StrCpy $REINSTALL_UNINSTALL 1

+    ${EndIf}

+

+  ${ElseIf} $PREVIOUS_VERSION_STATE == 0

+

+    !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose the maintenance option to perform."

+    nsDialogs::CreateItem /NOUNLOAD STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 0 0 100% 40 "SMPlayer ${SMPLAYER_VERSION} is already installed. Select the operation you want to perform and click Next to continue."

+    Pop $R0

+    nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_VCENTER}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS}|${WS_GROUP}|${WS_TABSTOP} 0 10 55 100% 30 "Add/Remove/Reinstall components"

+    Pop $R0

+    nsDialogs::CreateItem /NOUNLOAD BUTTON ${BS_AUTORADIOBUTTON}|${BS_TOP}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 10 85 100% 50 "Uninstall SMPlayer"

+    Pop $REINSTALL_UNINSTALLBUTTON

+

+    ${If} $REINSTALL_UNINSTALL == ""

+      StrCpy $REINSTALL_UNINSTALL 2

+    ${EndIf}

+

+  ${Else}

+

+    MessageBox MB_ICONSTOP "Unknown value of PREVIOUS_VERSION_STATE, aborting" /SD IDOK

+    Abort

+

+  ${EndIf}

+

+  ${If} $REINSTALL_UNINSTALL == 1

+    SendMessage $REINSTALL_UNINSTALLBUTTON ${BM_SETCHECK} 1 0

+  ${Else}

+    SendMessage $R0 ${BM_SETCHECK} 1 0

+  ${EndIf}

+

+  nsDialogs::Show

+

+FunctionEnd

+

+Function PageComponentsPre

+

+  ${If} $REINSTALL_UNINSTALL == 1

+    Abort

+  ${EndIf}

+

+FunctionEnd

+

+Function PageDirectoryPre

+

+  ${If} $REINSTALL_UNINSTALL == 1

+    Abort

+  ${EndIf}

+

+FunctionEnd

+

+Function PageInstfilesShow

+

+  ${If} $REINSTALL_UNINSTALL != ""

+    Call RunUninstaller

+    BringToFront

+  ${EndIf}

+

+FunctionEnd

+

+Function PageLeaveReinstall

+

+  SendMessage $REINSTALL_UNINSTALLBUTTON ${BM_GETCHECK} 0 0 $R0

+  ${If} $R0 == 1

+    ; Option to uninstall old version selected

+    StrCpy $REINSTALL_UNINSTALL 1

+  ${Else}

+    ; Custom up/downgrade or add/remove/reinstall

+    StrCpy $REINSTALL_UNINSTALL 2

+  ${EndIf}

+

+  ${If} $REINSTALL_UNINSTALL == 1

+    ${If} $PREVIOUS_VERSION_STATE == 0

+      Call RunUninstaller

+      Quit

+    ${Else}

+  ${EndIf}

+

+  ${EndIf}

+

+FunctionEnd

+

+Function RunUninstaller

+

+  ReadRegStr $R1 HKLM "${SMPLAYER_UNINST_KEY}" "UninstallString"

+

+  ${If} $R1 == ""

+    Return

+  ${EndIf}

+

+  ;Run uninstaller

+  HideWindow

+

+  ClearErrors

+

+  ${If} $PREVIOUS_VERSION_STATE == 0

+  ${AndIf} $REINSTALL_UNINSTALL == 1

+    ExecWait '$R1 _?=$INSTDIR'

+  ${Else}

+    ExecWait '$R1 /frominstall _?=$INSTDIR'

+  ${EndIf}

+

+  IfErrors no_remove_uninstaller

+

+  IfFileExists "$INSTDIR\${SMPLAYER_UNINST_EXE}" 0 no_remove_uninstaller

+

+    Delete "$R1"

+    RMDir $INSTDIR

+

+ no_remove_uninstaller:

+

+FunctionEnd

+

+;--------------------------------

+;Shared functions

+

+!macro UninstallSMPlayerMacro un

+Function ${un}UninstallSMPlayer

 

   ;Delete desktop and start menu shortcuts

   SetDetailsPrint textonly

@@ -661,7 +817,10 @@ Function ${un}UninstallSMPlayer
 

   SetShellVarContext all

   Delete "$DESKTOP\SMPlayer.lnk"

-  RMDir /r "$SMPROGRAMS\SMPlayer"

+  Delete "$SMPROGRAMS\SMPlayer\SMPlayer.lnk" 

+  Delete "$SMPROGRAMS\SMPlayer\SMPlayer on the Web.url"

+  Delete "$SMPROGRAMS\SMPlayer\Uninstall SMPlayer.lnk"

+  RMDir "$SMPROGRAMS\SMPlayer"

 

   ;Delete directories recursively except for main directory

   ;Do not recursively delete $INSTDIR

@@ -681,6 +840,18 @@ Function ${un}UninstallSMPlayer
   Delete "$INSTDIR\smplayer.exe"

   Delete "$INSTDIR\dxlist.exe"

 

+  ;Delete registry keys

+  SetDetailsPrint textonly

+  DetailPrint "Deleting Registry Keys..."

+  SetDetailsPrint listonly

+

+  DeleteRegKey HKLM "${SMPLAYER_REG_KEY}"

+  DeleteRegKey HKLM "${SMPLAYER_APP_PATHS_KEY}"

+  DeleteRegKey HKLM "${SMPLAYER_UNINST_KEY}"

+  DeleteRegKey HKCR "MPlayerFileVideo"

+  DeleteRegKey HKLM "Software\Clients\Media\SMPlayer"

+  DeleteRegValue HKLM "Software\RegisteredApplications" "SMPlayer"

+

   SetDetailsPrint both

 

 FunctionEnd

@@ -688,22 +859,14 @@ FunctionEnd
 !insertmacro UninstallSMPlayerMacro ""

 !insertmacro UninstallSMPlayerMacro "un."

 

-;End Shared Functions

-;------------------------------------------------------------------------------------------------

-

-/************************************************************************************************

-**************************************** Uninstaller ********************************************

-************************************************************************************************/

-

-;--------------------------------

-;UnInstaller Sections

+/*************************************** Uninstaller *******************************************/

 

 Section Uninstall

 

   ;Make sure SMPlayer is installed from where the uninstaller is being executed.

   IfFileExists $INSTDIR\smplayer.exe smplayer_installed

-    MessageBox MB_YESNO $(SMPLAYER_NOT_INSTALLED) IDYES smplayer_installed

-    Abort "Uninstall aborted by user."

+    MessageBox MB_YESNO $(SMPLAYER_NOT_INSTALLED) /SD IDNO IDYES smplayer_installed

+    Abort $(UNINSTALL_ABORTED)

 

   smplayer_installed:

 

@@ -711,23 +874,34 @@ Section Uninstall
   DetailPrint "Restoring file associations..."

   SetDetailsPrint listonly

 

+  ;Don't restore file associations if reinstalling

+  ${un.GetParameters} $R0

+  ${un.GetOptions} $R0 "/frominstall" $R1

+

+  IfErrors 0 +2

   ExecWait '"$INSTDIR\smplayer.exe" -uninstall'

 

   Call un.UninstallSMPlayer

 

-  Delete "$INSTDIR\uninst.exe"

+  Delete "$INSTDIR\${SMPLAYER_UNINST_EXE}"

   RMDir "$INSTDIR"

 

 SectionEnd

 

 ;--------------------------------

-;UnInstaller Functions

+;Required functions

+

+!insertmacro un.GetParameters

+!insertmacro un.GetOptions

+

+;--------------------------------

+;Uninstaller functions

 

 Function un.onInit

 

   Call un.CheckUserRights

 

-  ;Check for admin (mimic old Inno Setup behavior... non-admin installation maybe later..)

+  ;Check for admin (mimic old Inno Setup behavior)

   ${If} $IS_ADMIN == 0

     MessageBox MB_OK|MB_ICONSTOP $(UNINSTALL_NO_ADMIN)

     Abort

@@ -736,4 +910,50 @@ Function un.onInit
   ;Get the stored language preference

   !insertmacro MUI_UNGETLANGUAGE

 

+FunctionEnd

+

+Function un.CheckUserRights

+

+  ClearErrors

+  UserInfo::GetName

+  ${If} ${Errors}

+    StrCpy $IS_ADMIN 1

+    Return

+  ${EndIf}

+

+  Pop $USERNAME

+  UserInfo::GetAccountType

+  Pop $R0

+  ${Switch} $R0

+    ${Case} "Admin"

+    ${Case} "Power"

+      StrCpy $IS_ADMIN 1

+      ${Break}

+    ${Default}

+      StrCpy $IS_ADMIN 0

+      ${Break}

+  ${EndSwitch}

+

+FunctionEnd

+

+Function un.ConfirmPagePre

+

+  ${un.GetParameters} $R0

+

+  ${un.GetOptions} $R0 "/frominstall" $R1

+  ${Unless} ${Errors}

+    Abort

+  ${EndUnless}

+

+FunctionEnd

+

+Function un.FinishPagePre

+

+  ${un.GetParameters} $R0

+

+  ${un.GetOptions} $R0 "/frominstall" $R1

+  ${Unless} ${Errors}

+    Abort

+  ${EndUnless}

+

 FunctionEnd
\ No newline at end of file
diff --git a/setup/smplayer.iss b/setup/smplayer.iss
deleted file mode 100644
index e83b766..0000000
--- a/setup/smplayer.iss
+++ /dev/null
@@ -1,134 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.

-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

-

-[Setup]

-AppName=SMPlayer

-AppVerName=SMPlayer 0.6.6

-AppPublisher=RVM

-AppPublisherURL=http://smplayer.sf.net

-AppSupportURL=http://smplayer.sourceforge.net/forums

-AppUpdatesURL=http://smplayer.sourceforge.net/

-DefaultDirName={pf}\SMPlayer

-DefaultGroupName=SMPlayer

-LicenseFile=Copying.txt

-OutputDir=..

-OutputBaseFilename=smplayer_0.6.6_setup

-Compression=lzma

-SolidCompression=yes

-SourceDir="smplayer-build"

-

-[Languages]

-Name: "english"; MessagesFile: "compiler:Default.isl"

-Name: "basque"; MessagesFile: "compiler:Languages\Basque.isl"

-Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"

-Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl"

-Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl"

-Name: "danish"; MessagesFile: "compiler:Languages\Danish.isl"

-Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl"

-Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl"

-Name: "french"; MessagesFile: "compiler:Languages\French.isl"

-Name: "german"; MessagesFile: "compiler:Languages\German.isl"

-Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl"

-Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl"

-Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"

-Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl"

-Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl"

-Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl"

-Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"

-Name: "slovak"; MessagesFile: "compiler:Languages\Slovak.isl"

-Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl"

-Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"

-

-[Tasks]

-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}";

-

-[Types]

-Name: "full"; Description: "Full installation"

-Name: "custom"; Description: "Custom installation"; Flags: iscustom

-

-[Components]

-Name: "main"; Description: "Main Files"; Flags: fixed; Types: full custom

-Name: "themes"; Description: "Icon Themes"; Types: full custom

-;Name: "codecs"; Description: "Optional codecs"; Types: full custom

-Name: "languages"; Description: "Translations"; Types: full custom

-

-[Files]

-Source: "mplayer\*"; DestDir: "{app}\mplayer"; Flags: ignoreversion recursesubdirs createallsubdirs; Components: main

-Source: "shortcuts\*"; DestDir: "{app}\shortcuts"; Flags: ignoreversion recursesubdirs createallsubdirs; Components: main

-Source: "docs\*"; DestDir: "{app}\docs"; Flags: ignoreversion recursesubdirs createallsubdirs; Components: main

-Source: "themes\*"; DestDir: "{app}\themes"; Flags: ignoreversion recursesubdirs createallsubdirs; Components: themes

-Source: "translations\*"; DestDir: "{app}\translations"; Flags: ignoreversion recursesubdirs createallsubdirs; Components: languages

-Source: "*.dll"; DestDir: "{app}"; Components: main

-Source: "*.txt"; DestDir: "{app}"; Components: main

-Source: "Release_notes.txt"; DestDir: "{app}"; Flags: isreadme; Components: main

-Source: "smplayer.exe"; DestDir: "{app}"; Components: main

-Source: "dxlist.exe"; DestDir: "{app}"; Components: main

-; NOTE: Don't use "Flags: ignoreversion" on any shared system files

-

-[Icons]

-Name: "{group}\SMPlayer"; Filename: "{app}\smplayer.exe"

-Name: "{group}\{cm:ProgramOnTheWeb,SMPlayer}"; Filename: "http://smplayer.sf.net"

-Name: "{group}\{cm:UninstallProgram,SMPlayer}"; Filename: "{uninstallexe}"

-Name: "{commondesktop}\SMPlayer"; Filename: "{app}\smplayer.exe"; Tasks: desktopicon

-

-[Registry]

-

-;HKEY_CLASSES_ROOT ProgId registration

-Root: HKCR; SubKey: MPlayerFileVideo; Flags: uninsdeletekey

-Root: HKCR; SubKey: MPlayerFileVideo\DefaultIcon; ValueType: string; ValueName: ; ValueData: """{app}\smplayer.exe"",1"

-Root: HKCR; SubKey: MPlayerFileVideo\shell\enqueue; ValueType: string; ValueName: ; ValueData: Enqueue in SMPlayer

-Root: HKCR; SubKey: MPlayerFileVideo\shell\enqueue\command; ValueType: string; ValueName: ; ValueData: """{app}\smplayer.exe"" -add-to-playlist ""%1"""

-Root: HKCR; SubKey: MPlayerFileVideo\shell\open; ValueType: string; ValueName: FriendlyAppName; ValueData: SMPlayer Media Player

-Root: HKCR; SubKey: MPlayerFileVideo\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\smplayer.exe"" ""%1"""

-

-;Windows VISTA Default Programs associations

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer; Flags: uninsdeletekeyifempty; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities; Flags: uninsdeletekey; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities; ValueType: string; ValueName: ApplicationDescription; ValueData: SMPlayer intends to be a complete front-end for MPlayer, from basic features like playing videos, DVDs, and VCDs to more advanced features like support for MPlayer filters and more.; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities; ValueType: string; ValueName: ApplicationName; ValueData: SMPlayer; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .3gp; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .ac3; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .ape; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .asf; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .avi; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .bin; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .dat; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .divx; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .dv; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .dvr-ms; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .flv; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .iso; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .m1v; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .m2v; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .m4v; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .mkv; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .mov; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .mp3; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .mp4; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .mpeg; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .mpg; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .mpv; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .mqv; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .nsv; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .ogg; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .ogm; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .ra; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .ram; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .rmvb; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .ts; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .vcd; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .vfw; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .vob; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .wav; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .wma; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\Clients\Media\SMPlayer\Capabilities\FileAssociations; ValueType: string; ValueName: .wmv; ValueData: MPlayerFileVideo; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\RegisteredApplications; Flags: dontcreatekey; MinVersion: 0,6.0.6000

-Root: HKLM; SubKey: SOFTWARE\RegisteredApplications; ValueType: string; ValueName: SMPlayer; ValueData: SOFTWARE\Clients\Media\SMPlayer\Capabilities; Flags: uninsdeletevalue; MinVersion: 0,6.0.6000

-

-[Run]

-Filename: "{app}\smplayer.exe"; Parameters: "http://88.191.30.130:8050"; Description: "{cm:LaunchProgram,SMPlayer}"; Flags: nowait postinstall skipifsilent

-

-[UninstallRun]

-;Restore all file associations...

-Filename: "{app}\smplayer.exe"; Parameters: "-uninstall"

-

diff --git a/setup/smplayer_codecs.iss b/setup/smplayer_codecs.iss
deleted file mode 100644
index dbbe4e7..0000000
--- a/setup/smplayer_codecs.iss
+++ /dev/null
@@ -1,45 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.

-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

-

-[Setup]

-AppId=SMPlayer

-AppName=SMPlayer Extra Codecs

-AppVerName=SMPlayer Extra Codecs 20071007

-AppPublisher=RVM

-AppPublisherURL=http://smplayer.sf.net

-AppSupportURL=http://smplayer.sourceforge.net/forums

-AppUpdatesURL=http://smplayer.sourceforge.net/

-DefaultDirName={pf}\SMPlayer

-DefaultGroupName=SMPlayer

-OutputDir=..

-OutputBaseFilename=smplayer_codecs_20071007

-Compression=lzma

-SolidCompression=yes

-SourceDir="smplayer-build"

-

-[Languages]

-Name: "english"; MessagesFile: "compiler:Default.isl"

-Name: "basque"; MessagesFile: "compiler:Languages\Basque.isl"

-Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl"

-Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl"

-Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl"

-Name: "danish"; MessagesFile: "compiler:Languages\Danish.isl"

-Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl"

-Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl"

-Name: "french"; MessagesFile: "compiler:Languages\French.isl"

-Name: "german"; MessagesFile: "compiler:Languages\German.isl"

-Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl"

-Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl"

-Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl"

-Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl"

-Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl"

-Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl"

-Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl"

-Name: "slovak"; MessagesFile: "compiler:Languages\Slovak.isl"

-Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl"

-Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl"

-

-[Files]

-Source: "mplayer\codecs\*"; DestDir: "{app}\mplayer\codecs"; Flags: ignoreversion recursesubdirs createallsubdirs;

-; NOTE: Don't use "Flags: ignoreversion" on any shared system files

-

diff --git a/setup/translations/basque.nsh b/setup/translations/basque.nsh
index b668fbc..04ac56a 100644
--- a/setup/translations/basque.nsh
+++ b/setup/translations/basque.nsh
@@ -1,38 +1,40 @@
-;;

-;;  basque.nsh

-;;

-;;  Basque language strings for the Windows SMPlayer NSIS installer.

-;;  Save file with ANSI encoding

-;;

-;;  Author: 

-;;

+;Language: Basque (1069)

+;Basque language strings for the Windows SMPlayer NSIS installer.

+;

+;Save file as UTF-8 w/ BOM

+;

+

+!insertmacro LANGFILE "Basque" "Euskera"

 

 ; Startup

-LangString SMPLAYER_INSTALLER_IS_RUNNING ${LANG_BASQUE} "The installer is already running."

-LangString SMPLAYER_INSTALLER_UNSUPPORTED_OS ${LANG_BASQUE} "Unsupported operating system.$\n$(^Name) requires at least Windows 2000 and may not work correctly on your system.$\nDo you really want to continue with the installation?"

-LangString SMPLAYER_INSTALLER_NO_ADMIN ${LANG_BASQUE} "You must be logged in as an administrator when installing this program."

-LangString SMPLAYER_INSTALLER_PREV_VERSION ${LANG_BASQUE} "SMPlayer has already been installed.$\nDo you want to remove the previous version before installing $(^Name)?"

+${LangFileString} SMPLAYER_INSTALLER_IS_RUNNING "The installer is already running."

+${LangFileString} SMPLAYER_INSTALLER_NO_ADMIN "You must be logged in as an administrator when installing this program."

 

 ; Components Page

-LangString MPLAYER_CODEC_INFORMATION ${LANG_BASQUE} "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

+${LangFileString} MPLAYER_CODEC_INFORMATION "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

 

 ; MPlayer Section

-LangString MPLAYER_IS_INSTALLED ${LANG_BASQUE} "MPlayer is already installed. Re-Download?"

-LangString MPLAYER_IS_DOWNLOADING ${LANG_BASQUE} "Downloading MPlayer..."

-LangString MPLAYER_DL_FAILED ${LANG_BASQUE} "Failed to download MPlayer:"

-LangString MPLAYER_INST_FAILED ${LANG_BASQUE} "Failed to install MPlayer. MPlayer is required for playback."

+!ifndef WITH_MPLAYER

+  ${LangFileString} MPLAYER_IS_DOWNLOADING "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."

+!endif

 

 ; Codecs Section

-LangString CODECS_IS_INSTALLED ${LANG_BASQUE} "MPlayer codecs are already installed. Re-Download?"

-LangString CODECS_IS_DOWNLOADING ${LANG_BASQUE} "Downloading MPlayer codecs..."

-LangString CODECS_DL_FAILED ${LANG_BASQUE} "Failed to download MPlayer codecs:"

-LangString CODECS_INST_FAILED ${LANG_BASQUE} "Failed to install MPlayer codecs."

+${LangFileString} CODECS_IS_DOWNLOADING "Downloading MPlayer codecs..."

+${LangFileString} CODECS_DL_RETRY "MPlayer codecs were not successfully installed. Retry?"

+${LangFileString} CODECS_DL_FAILED "Failed to download MPlayer codecs: '$R0'."

+${LangFileString} CODECS_INST_FAILED "Failed to install MPlayer codecs."

 

 ; Version information

-LangString VERINFO_IS_DOWNLOADING ${LANG_BASQUE} "Downloading version information..."

-LangString VERINFO_DL_FAILED ${LANG_BASQUE} "Failed to download version info:"

-LangString VERINFO_IS_MISSING ${LANG_BASQUE} "Version file missing version information. Setup will use a default version."

+${LangFileString} VERINFO_IS_DOWNLOADING "Downloading version information..."

+${LangFileString} VERINFO_DL_FAILED "Failed to download version info: '$R0'. Using a default version."

 

 ; Uninstaller

-LangString UNINSTALL_NO_ADMIN ${LANG_BASQUE} "This installation can only be uninstalled by a user with administrator privileges."

-LangString SMPLAYER_NOT_INSTALLED ${LANG_BASQUE} "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
\ No newline at end of file
+${LangFileString} UNINSTALL_NO_ADMIN "This installation can only be uninstalled by a user with administrator privileges."

+${LangFileString} UNINSTALL_ABORTED "Uninstall aborted by user."

+${LangFileString} SMPLAYER_NOT_INSTALLED "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"

+

+; Vista & Later Default Programs Registration

+${LangFileString} APPLICATION_DESCRIPTION "SMPlayer is a complete front-end for MPlayer, from basic features like playing videos, DVDs, VCDs to more advanced features like support for MPlayer filters, edl lists, and more."
\ No newline at end of file
diff --git a/setup/translations/catalan.nsh b/setup/translations/catalan.nsh
index 311c070..3572fe7 100644
--- a/setup/translations/catalan.nsh
+++ b/setup/translations/catalan.nsh
@@ -1,38 +1,40 @@
-;;

-;;  catalan.nsh

-;;

-;;  Catalan language strings for the Windows SMPlayer NSIS installer.

-;;  Save file with ANSI encoding

-;;

-;;  Author: 

-;;

+;Language: Catalan (1027)

+;Catalan language strings for the Windows SMPlayer NSIS installer.

+;

+;Save file as UTF-8 w/ BOM

+;

+

+!insertmacro LANGFILE "Catalan" "Català"

 

 ; Startup

-LangString SMPLAYER_INSTALLER_IS_RUNNING ${LANG_CATALAN} "The installer is already running."

-LangString SMPLAYER_INSTALLER_UNSUPPORTED_OS ${LANG_CATALAN} "Unsupported operating system.$\n$(^Name) requires at least Windows 2000 and may not work correctly on your system.$\nDo you really want to continue with the installation?"

-LangString SMPLAYER_INSTALLER_NO_ADMIN ${LANG_CATALAN} "You must be logged in as an administrator when installing this program."

-LangString SMPLAYER_INSTALLER_PREV_VERSION ${LANG_CATALAN} "SMPlayer has already been installed.$\nDo you want to remove the previous version before installing $(^Name)?"

+${LangFileString} SMPLAYER_INSTALLER_IS_RUNNING "The installer is already running."

+${LangFileString} SMPLAYER_INSTALLER_NO_ADMIN "You must be logged in as an administrator when installing this program."

 

 ; Components Page

-LangString MPLAYER_CODEC_INFORMATION ${LANG_CATALAN} "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

+${LangFileString} MPLAYER_CODEC_INFORMATION "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

 

 ; MPlayer Section

-LangString MPLAYER_IS_INSTALLED ${LANG_CATALAN} "MPlayer is already installed. Re-Download?"

-LangString MPLAYER_IS_DOWNLOADING ${LANG_CATALAN} "Downloading MPlayer..."

-LangString MPLAYER_DL_FAILED ${LANG_CATALAN} "Failed to download MPlayer:"

-LangString MPLAYER_INST_FAILED ${LANG_CATALAN} "Failed to install MPlayer. MPlayer is required for playback."

+!ifndef WITH_MPLAYER

+  ${LangFileString} MPLAYER_IS_DOWNLOADING "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."

+!endif

 

 ; Codecs Section

-LangString CODECS_IS_INSTALLED ${LANG_CATALAN} "MPlayer codecs are already installed. Re-Download?"

-LangString CODECS_IS_DOWNLOADING ${LANG_CATALAN} "Downloading MPlayer codecs..."

-LangString CODECS_DL_FAILED ${LANG_CATALAN} "Failed to download MPlayer codecs:"

-LangString CODECS_INST_FAILED ${LANG_CATALAN} "Failed to install MPlayer codecs."

+${LangFileString} CODECS_IS_DOWNLOADING "Downloading MPlayer codecs..."

+${LangFileString} CODECS_DL_RETRY "MPlayer codecs were not successfully installed. Retry?"

+${LangFileString} CODECS_DL_FAILED "Failed to download MPlayer codecs: '$R0'."

+${LangFileString} CODECS_INST_FAILED "Failed to install MPlayer codecs."

 

 ; Version information

-LangString VERINFO_IS_DOWNLOADING ${LANG_CATALAN} "Downloading version information..."

-LangString VERINFO_DL_FAILED ${LANG_CATALAN} "Failed to download version info:"

-LangString VERINFO_IS_MISSING ${LANG_CATALAN} "Version file missing version information. Setup will use a default version."

+${LangFileString} VERINFO_IS_DOWNLOADING "Downloading version information..."

+${LangFileString} VERINFO_DL_FAILED "Failed to download version info: '$R0'. Using a default version."

 

 ; Uninstaller

-LangString UNINSTALL_NO_ADMIN ${LANG_CATALAN} "This installation can only be uninstalled by a user with administrator privileges."

-LangString SMPLAYER_NOT_INSTALLED ${LANG_CATALAN} "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
\ No newline at end of file
+${LangFileString} UNINSTALL_NO_ADMIN "This installation can only be uninstalled by a user with administrator privileges."

+${LangFileString} UNINSTALL_ABORTED "Uninstall aborted by user."

+${LangFileString} SMPLAYER_NOT_INSTALLED "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"

+

+; Vista & Later Default Programs Registration

+${LangFileString} APPLICATION_DESCRIPTION "SMPlayer is a complete front-end for MPlayer, from basic features like playing videos, DVDs, VCDs to more advanced features like support for MPlayer filters, edl lists, and more."
\ No newline at end of file
diff --git a/setup/translations/chinese-simp.nsh b/setup/translations/chinese-simp.nsh
deleted file mode 100644
index ce44a4a..0000000
--- a/setup/translations/chinese-simp.nsh
+++ /dev/null
@@ -1,38 +0,0 @@
-;;

-;;  chinese-simp.nsh

-;;

-;;  Chinese-Simplified language strings for the Windows SMPlayer NSIS installer.

-;;  Save file with ANSI encoding

-;;

-;;  Author:

-;;

-

-; Startup

-LangString SMPLAYER_INSTALLER_IS_RUNNING ${LANG_SIMPCHINESE} "The installer is already running."

-LangString SMPLAYER_INSTALLER_UNSUPPORTED_OS ${LANG_SIMPCHINESE} "Unsupported operating system.$\n$(^Name) requires at least Windows 2000 and may not work correctly on your system.$\nDo you really want to continue with the installation?"

-LangString SMPLAYER_INSTALLER_NO_ADMIN ${LANG_SIMPCHINESE} "You must be logged in as an administrator when installing this program."

-LangString SMPLAYER_INSTALLER_PREV_VERSION ${LANG_SIMPCHINESE} "SMPlayer has already been installed.$\nDo you want to remove the previous version before installing $(^Name)?"

-

-; Components Page

-LangString MPLAYER_CODEC_INFORMATION ${LANG_SIMPCHINESE} "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

-

-; MPlayer Section

-LangString MPLAYER_IS_INSTALLED ${LANG_SIMPCHINESE} "MPlayer is already installed. Re-Download?"

-LangString MPLAYER_IS_DOWNLOADING ${LANG_SIMPCHINESE} "Downloading MPlayer..."

-LangString MPLAYER_DL_FAILED ${LANG_SIMPCHINESE} "Failed to download MPlayer:"

-LangString MPLAYER_INST_FAILED ${LANG_SIMPCHINESE} "Failed to install MPlayer. MPlayer is required for playback."

-

-; Codecs Section

-LangString CODECS_IS_INSTALLED ${LANG_SIMPCHINESE} "MPlayer codecs are already installed. Re-Download?"

-LangString CODECS_IS_DOWNLOADING ${LANG_SIMPCHINESE} "Downloading MPlayer codecs..."

-LangString CODECS_DL_FAILED ${LANG_SIMPCHINESE} "Failed to download MPlayer codecs:"

-LangString CODECS_INST_FAILED ${LANG_SIMPCHINESE} "Failed to install MPlayer codecs."

-

-; Version information

-LangString VERINFO_IS_DOWNLOADING ${LANG_SIMPCHINESE} "Downloading version information..."

-LangString VERINFO_DL_FAILED ${LANG_SIMPCHINESE} "Failed to download version info:"

-LangString VERINFO_IS_MISSING ${LANG_SIMPCHINESE} "Version file missing version information. Setup will use a default version."

-

-; Uninstaller

-LangString UNINSTALL_NO_ADMIN ${LANG_SIMPCHINESE} "This installation can only be uninstalled by a user with administrator privileges."

-LangString SMPLAYER_NOT_INSTALLED ${LANG_SIMPCHINESE} "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
\ No newline at end of file
diff --git a/setup/translations/chinese-trad.nsh b/setup/translations/chinese-trad.nsh
deleted file mode 100644
index fa7bc2c..0000000
--- a/setup/translations/chinese-trad.nsh
+++ /dev/null
@@ -1,38 +0,0 @@
-;;

-;;  chinese-trad.nsh

-;;

-;;  Chinese-Traditional language strings for the Windows SMPlayer NSIS installer.

-;;  Save file with ANSI encoding

-;;

-;;  Author:

-;;

-

-; Startup

-LangString SMPLAYER_INSTALLER_IS_RUNNING ${LANG_TRADCHINESE} "The installer is already running."

-LangString SMPLAYER_INSTALLER_UNSUPPORTED_OS ${LANG_TRADCHINESE} "Unsupported operating system.$\n$(^Name) requires at least Windows 2000 and may not work correctly on your system.$\nDo you really want to continue with the installation?"

-LangString SMPLAYER_INSTALLER_NO_ADMIN ${LANG_TRADCHINESE} "You must be logged in as an administrator when installing this program."

-LangString SMPLAYER_INSTALLER_PREV_VERSION ${LANG_TRADCHINESE} "SMPlayer has already been installed.$\nDo you want to remove the previous version before installing $(^Name)?"

-

-; Components Page

-LangString MPLAYER_CODEC_INFORMATION ${LANG_TRADCHINESE} "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

-

-; MPlayer Section

-LangString MPLAYER_IS_INSTALLED ${LANG_TRADCHINESE} "MPlayer is already installed. Re-Download?"

-LangString MPLAYER_IS_DOWNLOADING ${LANG_TRADCHINESE} "Downloading MPlayer..."

-LangString MPLAYER_DL_FAILED ${LANG_TRADCHINESE} "Failed to download MPlayer:"

-LangString MPLAYER_INST_FAILED ${LANG_TRADCHINESE} "Failed to install MPlayer. MPlayer is required for playback."

-

-; Codecs Section

-LangString CODECS_IS_INSTALLED ${LANG_TRADCHINESE} "MPlayer codecs are already installed. Re-Download?"

-LangString CODECS_IS_DOWNLOADING ${LANG_TRADCHINESE} "Downloading MPlayer codecs..."

-LangString CODECS_DL_FAILED ${LANG_TRADCHINESE} "Failed to download MPlayer codecs:"

-LangString CODECS_INST_FAILED ${LANG_TRADCHINESE} "Failed to install MPlayer codecs."

-

-; Version information

-LangString VERINFO_IS_DOWNLOADING ${LANG_TRADCHINESE} "Downloading version information..."

-LangString VERINFO_DL_FAILED ${LANG_TRADCHINESE} "Failed to download version info:"

-LangString VERINFO_IS_MISSING ${LANG_TRADCHINESE} "Version file missing version information. Setup will use a default version."

-

-; Uninstaller

-LangString UNINSTALL_NO_ADMIN ${LANG_TRADCHINESE} "This installation can only be uninstalled by a user with administrator privileges."

-LangString SMPLAYER_NOT_INSTALLED ${LANG_TRADCHINESE} "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
\ No newline at end of file
diff --git a/setup/translations/czech.nsh b/setup/translations/czech.nsh
index ea480d0..9ba7aa8 100644
--- a/setup/translations/czech.nsh
+++ b/setup/translations/czech.nsh
@@ -1,38 +1,40 @@
-;;

-;;  czech.nsh

-;;

-;;  Czech language strings for the Windows SMPlayer NSIS installer.

-;;  Save file with ANSI encoding

-;;

-;;  Author: 

-;;

+;Language: Czech (1029)

+;Czech language strings for the Windows SMPlayer NSIS installer.

+;

+;Save file as UTF-8 w/ BOM

+;

+

+!insertmacro LANGFILE "Czech" "Čeština"

 

 ; Startup

-LangString SMPLAYER_INSTALLER_IS_RUNNING ${LANG_CZECH} "The installer is already running."

-LangString SMPLAYER_INSTALLER_UNSUPPORTED_OS ${LANG_CZECH} "Unsupported operating system.$\n$(^Name) requires at least Windows 2000 and may not work correctly on your system.$\nDo you really want to continue with the installation?"

-LangString SMPLAYER_INSTALLER_NO_ADMIN ${LANG_CZECH} "You must be logged in as an administrator when installing this program."

-LangString SMPLAYER_INSTALLER_PREV_VERSION ${LANG_CZECH} "SMPlayer has already been installed.$\nDo you want to remove the previous version before installing $(^Name)?"

+${LangFileString} SMPLAYER_INSTALLER_IS_RUNNING "Instalátor již běží."

+${LangFileString} SMPLAYER_INSTALLER_NO_ADMIN "Instalaci tohoto programu je potřeba provést s právy administrátora."

 

 ; Components Page

-LangString MPLAYER_CODEC_INFORMATION ${LANG_CZECH} "Bin�rn� kodeky podporuj� form�ty, kter� zat�m nejsou implementov�ny nativne, napr. novej�� varianty RealVideo a jin� m�lo pou��van� form�ty.$\nPro vet�inu be�n�ch form�tu nejsou potreba (DVD, MPEG-1/2/4, apod.)."

+${LangFileString} MPLAYER_CODEC_INFORMATION "Binární kodeky podporují formáty, které zatím nejsou implementovány nativně, např. novější varianty RealVideo a jiné málo používané formáty.$\nPro většinu běžných formátů nejsou potřeba (DVD, MPEG-1/2/4, apod.)."

 

 ; MPlayer Section

-LangString MPLAYER_IS_INSTALLED ${LANG_CZECH} "MPlayer je ji� nainstalov�n. St�hnout znovu?"

-LangString MPLAYER_IS_DOWNLOADING ${LANG_CZECH} "Stahuji MPlayer..."

-LangString MPLAYER_DL_FAILED ${LANG_CZECH} "Nepovedlo se st�hnout MPlayer:"

-LangString MPLAYER_INST_FAILED ${LANG_CZECH} "Nepovedlo se nainstalovat MPlayer. MPlayer je potrebn� pro prehr�v�n�."

+!ifndef WITH_MPLAYER

+  ${LangFileString} MPLAYER_IS_DOWNLOADING "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í."

+!endif

 

 ; Codecs Section

-LangString CODECS_IS_INSTALLED ${LANG_CZECH} "Kodeky MPlayeru jsou ji� nainstalov�ny. St�hnout znovu?"

-LangString CODECS_IS_DOWNLOADING ${LANG_CZECH} "Instaluji kodeky MPlayeru..."

-LangString CODECS_DL_FAILED ${LANG_CZECH} "Nepovedlo se st�hnout kodeky MPlayeru:"

-LangString CODECS_INST_FAILED ${LANG_CZECH} "Nepovedlo se nainstalovat kodeky MPlayeru."

+${LangFileString} CODECS_IS_DOWNLOADING "Instaluji kodeky MPlayeru..."

+${LangFileString} CODECS_DL_RETRY "Kodeky MPlayeru se nepovedlo nainstalovat. Zkusit znovu?"

+${LangFileString} CODECS_DL_FAILED "Nepovedlo se stáhnout kodeky MPlayeru: '$R0'."

+${LangFileString} CODECS_INST_FAILED "Nepovedlo se nainstalovat kodeky MPlayeru."

 

 ; Version information

-LangString VERINFO_IS_DOWNLOADING ${LANG_CZECH} "Stahuji informace o verz�ch..."

-LangString VERINFO_DL_FAILED ${LANG_CZECH} "Nepovedlo se st�hnout informace o verz�ch:"

-LangString VERINFO_IS_MISSING ${LANG_CZECH} "Verzovac� soubor neobsahuje spr�vn� informace. Bude pou�ita v�choz� verze."

+${LangFileString} VERINFO_IS_DOWNLOADING "Stahuji informace o verzích..."

+${LangFileString} VERINFO_DL_FAILED "Nepovedlo se stáhnout informace o verzích: '$R0'. Užita výchozí verze."

 

 ; Uninstaller

-LangString UNINSTALL_NO_ADMIN ${LANG_CZECH} "This installation can only be uninstalled by a user with administrator privileges."

-LangString SMPLAYER_NOT_INSTALLED ${LANG_CZECH} "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
\ No newline at end of file
+${LangFileString} UNINSTALL_NO_ADMIN "Odinstalaci je potřeba provést s právy administrátora."

+${LangFileString} UNINSTALL_ABORTED "Odinstalace přerušena uživatelem."

+${LangFileString} SMPLAYER_NOT_INSTALLED "V adresáři '$INSTDIR' není SMPlayer nainstalován .$\r$\nPokračovat (nedoporučeno)?"

+

+; Vista & Later Default Programs Registration

+${LangFileString} APPLICATION_DESCRIPTION "SMPlayer je kompletní frontend pro MPlayer, podporuje vše od základních funkcí jako přehrávání videí, DVD, VCD až po pokročilé funkce jako filtry MPlayeru, edl a více."
\ No newline at end of file
diff --git a/setup/translations/danish.nsh b/setup/translations/danish.nsh
index 7abe7b0..2656af5 100644
--- a/setup/translations/danish.nsh
+++ b/setup/translations/danish.nsh
@@ -1,38 +1,40 @@
-;;

-;;  danish.nsh

-;;

-;;  Danish language strings for the Windows SMPlayer NSIS installer.

-;;  Save file with ANSI encoding

-;;

-;;  Author: 

-;;

+;Language: Danish (1030)

+;Danish language strings for the Windows SMPlayer NSIS installer.

+;

+;Save file as UTF-8 w/ BOM

+;

+

+!insertmacro LANGFILE "Danish" "Dansk"

 

 ; Startup

-LangString SMPLAYER_INSTALLER_IS_RUNNING ${LANG_DANISH} "The installer is already running."

-LangString SMPLAYER_INSTALLER_UNSUPPORTED_OS ${LANG_DANISH} "Unsupported operating system.$\n$(^Name) requires at least Windows 2000 and may not work correctly on your system.$\nDo you really want to continue with the installation?"

-LangString SMPLAYER_INSTALLER_NO_ADMIN ${LANG_DANISH} "You must be logged in as an administrator when installing this program."

-LangString SMPLAYER_INSTALLER_PREV_VERSION ${LANG_DANISH} "SMPlayer has already been installed.$\nDo you want to remove the previous version before installing $(^Name)?"

+${LangFileString} SMPLAYER_INSTALLER_IS_RUNNING "The installer is already running."

+${LangFileString} SMPLAYER_INSTALLER_NO_ADMIN "You must be logged in as an administrator when installing this program."

 

 ; Components Page

-LangString MPLAYER_CODEC_INFORMATION ${LANG_DANISH} "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

+${LangFileString} MPLAYER_CODEC_INFORMATION "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

 

 ; MPlayer Section

-LangString MPLAYER_IS_INSTALLED ${LANG_DANISH} "MPlayer is already installed. Re-Download?"

-LangString MPLAYER_IS_DOWNLOADING ${LANG_DANISH} "Downloading MPlayer..."

-LangString MPLAYER_DL_FAILED ${LANG_DANISH} "Failed to download MPlayer:"

-LangString MPLAYER_INST_FAILED ${LANG_DANISH} "Failed to install MPlayer. MPlayer is required for playback."

+!ifndef WITH_MPLAYER

+  ${LangFileString} MPLAYER_IS_DOWNLOADING "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."

+!endif

 

 ; Codecs Section

-LangString CODECS_IS_INSTALLED ${LANG_DANISH} "MPlayer codecs are already installed. Re-Download?"

-LangString CODECS_IS_DOWNLOADING ${LANG_DANISH} "Downloading MPlayer codecs..."

-LangString CODECS_DL_FAILED ${LANG_DANISH} "Failed to download MPlayer codecs:"

-LangString CODECS_INST_FAILED ${LANG_DANISH} "Failed to install MPlayer codecs."

+${LangFileString} CODECS_IS_DOWNLOADING "Downloading MPlayer codecs..."

+${LangFileString} CODECS_DL_RETRY "MPlayer codecs were not successfully installed. Retry?"

+${LangFileString} CODECS_DL_FAILED "Failed to download MPlayer codecs: '$R0'."

+${LangFileString} CODECS_INST_FAILED "Failed to install MPlayer codecs."

 

 ; Version information

-LangString VERINFO_IS_DOWNLOADING ${LANG_DANISH} "Downloading version information..."

-LangString VERINFO_DL_FAILED ${LANG_DANISH} "Failed to download version info:"

-LangString VERINFO_IS_MISSING ${LANG_DANISH} "Version file missing version information. Setup will use a default version."

+${LangFileString} VERINFO_IS_DOWNLOADING "Downloading version information..."

+${LangFileString} VERINFO_DL_FAILED "Failed to download version info: '$R0'. Using a default version."

 

 ; Uninstaller

-LangString UNINSTALL_NO_ADMIN ${LANG_DANISH} "This installation can only be uninstalled by a user with administrator privileges."

-LangString SMPLAYER_NOT_INSTALLED ${LANG_DANISH} "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
\ No newline at end of file
+${LangFileString} UNINSTALL_NO_ADMIN "This installation can only be uninstalled by a user with administrator privileges."

+${LangFileString} UNINSTALL_ABORTED "Uninstall aborted by user."

+${LangFileString} SMPLAYER_NOT_INSTALLED "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"

+

+; Vista & Later Default Programs Registration

+${LangFileString} APPLICATION_DESCRIPTION "SMPlayer is a complete front-end for MPlayer, from basic features like playing videos, DVDs, VCDs to more advanced features like support for MPlayer filters, edl lists, and more."
\ No newline at end of file
diff --git a/setup/translations/dutch.nsh b/setup/translations/dutch.nsh
index 9743fc7..b6be474 100644
--- a/setup/translations/dutch.nsh
+++ b/setup/translations/dutch.nsh
@@ -1,38 +1,40 @@
-;;

-;;  dutch.nsh

-;;

-;;  Dutch language strings for the Windows SMPlayer NSIS installer.

-;;  Save file with ANSI encoding

-;;

-;;  Author: 

-;;

+;Language: Dutch (1043)

+;Dutch language strings for the Windows SMPlayer NSIS installer.

+;

+;Save file as UTF-8 w/ BOM

+;

+

+!insertmacro LANGFILE "Dutch" "Nederlands"

 

 ; Startup

-LangString SMPLAYER_INSTALLER_IS_RUNNING ${LANG_DUTCH} "The installer is already running."

-LangString SMPLAYER_INSTALLER_UNSUPPORTED_OS ${LANG_DUTCH} "Unsupported operating system.$\n$(^Name) requires at least Windows 2000 and may not work correctly on your system.$\nDo you really want to continue with the installation?"

-LangString SMPLAYER_INSTALLER_NO_ADMIN ${LANG_DUTCH} "You must be logged in as an administrator when installing this program."

-LangString SMPLAYER_INSTALLER_PREV_VERSION ${LANG_DUTCH} "SMPlayer has already been installed.$\nDo you want to remove the previous version before installing $(^Name)?"

+${LangFileString} SMPLAYER_INSTALLER_IS_RUNNING "The installer is already running."

+${LangFileString} SMPLAYER_INSTALLER_NO_ADMIN "You must be logged in as an administrator when installing this program."

 

 ; Components Page

-LangString MPLAYER_CODEC_INFORMATION ${LANG_DUTCH} "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

+${LangFileString} MPLAYER_CODEC_INFORMATION "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

 

 ; MPlayer Section

-LangString MPLAYER_IS_INSTALLED ${LANG_DUTCH} "MPlayer is already installed. Re-Download?"

-LangString MPLAYER_IS_DOWNLOADING ${LANG_DUTCH} "Downloading MPlayer..."

-LangString MPLAYER_DL_FAILED ${LANG_DUTCH} "Failed to download MPlayer:"

-LangString MPLAYER_INST_FAILED ${LANG_DUTCH} "Failed to install MPlayer. MPlayer is required for playback."

+!ifndef WITH_MPLAYER

+  ${LangFileString} MPLAYER_IS_DOWNLOADING "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."

+!endif

 

 ; Codecs Section

-LangString CODECS_IS_INSTALLED ${LANG_DUTCH} "MPlayer codecs are already installed. Re-Download?"

-LangString CODECS_IS_DOWNLOADING ${LANG_DUTCH} "Downloading MPlayer codecs..."

-LangString CODECS_DL_FAILED ${LANG_DUTCH} "Failed to download MPlayer codecs:"

-LangString CODECS_INST_FAILED ${LANG_DUTCH} "Failed to install MPlayer codecs."

+${LangFileString} CODECS_IS_DOWNLOADING "Downloading MPlayer codecs..."

+${LangFileString} CODECS_DL_RETRY "MPlayer codecs were not successfully installed. Retry?"

+${LangFileString} CODECS_DL_FAILED "Failed to download MPlayer codecs: '$R0'."

+${LangFileString} CODECS_INST_FAILED "Failed to install MPlayer codecs."

 

 ; Version information

-LangString VERINFO_IS_DOWNLOADING ${LANG_DUTCH} "Downloading version information..."

-LangString VERINFO_DL_FAILED ${LANG_DUTCH} "Failed to download version info:"

-LangString VERINFO_IS_MISSING ${LANG_DUTCH} "Version file missing version information. Setup will use a default version."

+${LangFileString} VERINFO_IS_DOWNLOADING "Downloading version information..."

+${LangFileString} VERINFO_DL_FAILED "Failed to download version info: '$R0'. Using a default version."

 

 ; Uninstaller

-LangString UNINSTALL_NO_ADMIN ${LANG_DUTCH} "This installation can only be uninstalled by a user with administrator privileges."

-LangString SMPLAYER_NOT_INSTALLED ${LANG_DUTCH} "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
\ No newline at end of file
+${LangFileString} UNINSTALL_NO_ADMIN "This installation can only be uninstalled by a user with administrator privileges."

+${LangFileString} UNINSTALL_ABORTED "Uninstall aborted by user."

+${LangFileString} SMPLAYER_NOT_INSTALLED "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"

+

+; Vista & Later Default Programs Registration

+${LangFileString} APPLICATION_DESCRIPTION "SMPlayer is a complete front-end for MPlayer, from basic features like playing videos, DVDs, VCDs to more advanced features like support for MPlayer filters, edl lists, and more."
\ No newline at end of file
diff --git a/setup/translations/english.nsh b/setup/translations/english.nsh
index f835a2a..88f35f7 100644
--- a/setup/translations/english.nsh
+++ b/setup/translations/english.nsh
@@ -1,38 +1,40 @@
-;;

-;;  english.nsh

-;;

-;;  English language strings for the Windows SMPlayer NSIS installer.

-;;  Save file with ANSI encoding

-;;

-;;  Author: redxii

-;;

+;Language: English (1033)

+;English language strings for the Windows SMPlayer NSIS installer.

+;

+;Save file as UTF-8 w/ BOM

+;

+

+!insertmacro LANGFILE "English" "English"

 

 ; Startup

-LangString SMPLAYER_INSTALLER_IS_RUNNING ${LANG_ENGLISH} "The installer is already running."

-LangString SMPLAYER_INSTALLER_UNSUPPORTED_OS ${LANG_ENGLISH} "Unsupported operating system.$\n$(^Name) requires at least Windows 2000 and may not work correctly on your system.$\nDo you really want to continue with the installation?"

-LangString SMPLAYER_INSTALLER_NO_ADMIN ${LANG_ENGLISH} "You must be logged in as an administrator when installing this program."

-LangString SMPLAYER_INSTALLER_PREV_VERSION ${LANG_ENGLISH} "SMPlayer has already been installed.$\nDo you want to remove the previous version before installing $(^Name)?"

+${LangFileString} SMPLAYER_INSTALLER_IS_RUNNING "The installer is already running."

+${LangFileString} SMPLAYER_INSTALLER_NO_ADMIN "You must be logged in as an administrator when installing this program."

 

 ; Components Page

-LangString MPLAYER_CODEC_INFORMATION ${LANG_ENGLISH} "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

+${LangFileString} MPLAYER_CODEC_INFORMATION "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

 

 ; MPlayer Section

-LangString MPLAYER_IS_INSTALLED ${LANG_ENGLISH} "MPlayer is already installed. Re-Download?"

-LangString MPLAYER_IS_DOWNLOADING ${LANG_ENGLISH} "Downloading MPlayer..."

-LangString MPLAYER_DL_FAILED ${LANG_ENGLISH} "Failed to download MPlayer:"

-LangString MPLAYER_INST_FAILED ${LANG_ENGLISH} "Failed to install MPlayer. MPlayer is required for playback."

+!ifndef WITH_MPLAYER

+  ${LangFileString} MPLAYER_IS_DOWNLOADING "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."

+!endif

 

 ; Codecs Section

-LangString CODECS_IS_INSTALLED ${LANG_ENGLISH} "MPlayer codecs are already installed. Re-Download?"

-LangString CODECS_IS_DOWNLOADING ${LANG_ENGLISH} "Downloading MPlayer codecs..."

-LangString CODECS_DL_FAILED ${LANG_ENGLISH} "Failed to download MPlayer codecs:"

-LangString CODECS_INST_FAILED ${LANG_ENGLISH} "Failed to install MPlayer codecs."

+${LangFileString} CODECS_IS_DOWNLOADING "Downloading MPlayer codecs..."

+${LangFileString} CODECS_DL_RETRY "MPlayer codecs were not successfully installed. Retry?"

+${LangFileString} CODECS_DL_FAILED "Failed to download MPlayer codecs: '$R0'."

+${LangFileString} CODECS_INST_FAILED "Failed to install MPlayer codecs."

 

 ; Version information

-LangString VERINFO_IS_DOWNLOADING ${LANG_ENGLISH} "Downloading version information..."

-LangString VERINFO_DL_FAILED ${LANG_ENGLISH} "Failed to download version info:"

-LangString VERINFO_IS_MISSING ${LANG_ENGLISH} "Version file missing version information. Setup will use a default version."

+${LangFileString} VERINFO_IS_DOWNLOADING "Downloading version information..."

+${LangFileString} VERINFO_DL_FAILED "Failed to download version info: '$R0'. Using a default version."

 

 ; Uninstaller

-LangString UNINSTALL_NO_ADMIN ${LANG_ENGLISH} "This installation can only be uninstalled by a user with administrator privileges."

-LangString SMPLAYER_NOT_INSTALLED ${LANG_ENGLISH} "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
\ No newline at end of file
+${LangFileString} UNINSTALL_NO_ADMIN "This installation can only be uninstalled by a user with administrator privileges."

+${LangFileString} UNINSTALL_ABORTED "Uninstall aborted by user."

+${LangFileString} SMPLAYER_NOT_INSTALLED "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"

+

+; Vista & Later Default Programs Registration

+${LangFileString} APPLICATION_DESCRIPTION "SMPlayer is a complete front-end for MPlayer, from basic features like playing videos, DVDs, VCDs to more advanced features like support for MPlayer filters, edl lists, and more."
\ No newline at end of file
diff --git a/setup/translations/finnish.nsh b/setup/translations/finnish.nsh
index c780820..1e5984d 100644
--- a/setup/translations/finnish.nsh
+++ b/setup/translations/finnish.nsh
@@ -1,38 +1,40 @@
-;;

-;;  finnish.nsh

-;;

-;;  Finnish language strings for the Windows SMPlayer NSIS installer.

-;;  Save file with ANSI encoding

-;;

-;;  Author: 

-;;

+;Language: Finnish (1035)

+;Finnish language strings for the Windows SMPlayer NSIS installer.

+;

+;Save file as UTF-8 w/ BOM

+;

+

+!insertmacro LANGFILE "Finnish" "Suomi"

 

 ; Startup

-LangString SMPLAYER_INSTALLER_IS_RUNNING ${LANG_FINNISH} "The installer is already running."

-LangString SMPLAYER_INSTALLER_UNSUPPORTED_OS ${LANG_FINNISH} "Unsupported operating system.$\n$(^Name) requires at least Windows 2000 and may not work correctly on your system.$\nDo you really want to continue with the installation?"

-LangString SMPLAYER_INSTALLER_NO_ADMIN ${LANG_FINNISH} "You must be logged in as an administrator when installing this program."

-LangString SMPLAYER_INSTALLER_PREV_VERSION ${LANG_FINNISH} "SMPlayer has already been installed.$\nDo you want to remove the previous version before installing $(^Name)?"

+${LangFileString} SMPLAYER_INSTALLER_IS_RUNNING "The installer is already running."

+${LangFileString} SMPLAYER_INSTALLER_NO_ADMIN "You must be logged in as an administrator when installing this program."

 

 ; Components Page

-LangString MPLAYER_CODEC_INFORMATION ${LANG_FINNISH} "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

+${LangFileString} MPLAYER_CODEC_INFORMATION "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

 

 ; MPlayer Section

-LangString MPLAYER_IS_INSTALLED ${LANG_FINNISH} "MPlayer is already installed. Re-Download?"

-LangString MPLAYER_IS_DOWNLOADING ${LANG_FINNISH} "Downloading MPlayer..."

-LangString MPLAYER_DL_FAILED ${LANG_FINNISH} "Failed to download MPlayer:"

-LangString MPLAYER_INST_FAILED ${LANG_FINNISH} "Failed to install MPlayer. MPlayer is required for playback."

+!ifndef WITH_MPLAYER

+  ${LangFileString} MPLAYER_IS_DOWNLOADING "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."

+!endif

 

 ; Codecs Section

-LangString CODECS_IS_INSTALLED ${LANG_FINNISH} "MPlayer codecs are already installed. Re-Download?"

-LangString CODECS_IS_DOWNLOADING ${LANG_FINNISH} "Downloading MPlayer codecs..."

-LangString CODECS_DL_FAILED ${LANG_FINNISH} "Failed to download MPlayer codecs:"

-LangString CODECS_INST_FAILED ${LANG_FINNISH} "Failed to install MPlayer codecs."

+${LangFileString} CODECS_IS_DOWNLOADING "Downloading MPlayer codecs..."

+${LangFileString} CODECS_DL_RETRY "MPlayer codecs were not successfully installed. Retry?"

+${LangFileString} CODECS_DL_FAILED "Failed to download MPlayer codecs: '$R0'."

+${LangFileString} CODECS_INST_FAILED "Failed to install MPlayer codecs."

 

 ; Version information

-LangString VERINFO_IS_DOWNLOADING ${LANG_FINNISH} "Downloading version information..."

-LangString VERINFO_DL_FAILED ${LANG_FINNISH} "Failed to download version info:"

-LangString VERINFO_IS_MISSING ${LANG_FINNISH} "Version file missing version information. Setup will use a default version."

+${LangFileString} VERINFO_IS_DOWNLOADING "Downloading version information..."

+${LangFileString} VERINFO_DL_FAILED "Failed to download version info: '$R0'. Using a default version."

 

 ; Uninstaller

-LangString UNINSTALL_NO_ADMIN ${LANG_FINNISH} "This installation can only be uninstalled by a user with administrator privileges."

-LangString SMPLAYER_NOT_INSTALLED ${LANG_FINNISH} "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
\ No newline at end of file
+${LangFileString} UNINSTALL_NO_ADMIN "This installation can only be uninstalled by a user with administrator privileges."

+${LangFileString} UNINSTALL_ABORTED "Uninstall aborted by user."

+${LangFileString} SMPLAYER_NOT_INSTALLED "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"

+

+; Vista & Later Default Programs Registration

+${LangFileString} APPLICATION_DESCRIPTION "SMPlayer is a complete front-end for MPlayer, from basic features like playing videos, DVDs, VCDs to more advanced features like support for MPlayer filters, edl lists, and more."
\ No newline at end of file
diff --git a/setup/translations/french.nsh b/setup/translations/french.nsh
index cc7f4c5..4a3466b 100644
--- a/setup/translations/french.nsh
+++ b/setup/translations/french.nsh
@@ -1,38 +1,40 @@
-;;

-;;  french.nsh

-;;

-;;  French language strings for the Windows SMPlayer NSIS installer.

-;;  Save file with ANSI encoding

-;;

-;;  Author: 

-;;

+;Language: French (1036)

+;French language strings for the Windows SMPlayer NSIS installer.

+;

+;Save file as UTF-8 w/ BOM

+;

+

+!insertmacro LANGFILE "French" "Français"

 

 ; Startup

-LangString SMPLAYER_INSTALLER_IS_RUNNING ${LANG_FRENCH} "The installer is already running."

-LangString SMPLAYER_INSTALLER_UNSUPPORTED_OS ${LANG_FRENCH} "Unsupported operating system.$\n$(^Name) requires at least Windows 2000 and may not work correctly on your system.$\nDo you really want to continue with the installation?"

-LangString SMPLAYER_INSTALLER_NO_ADMIN ${LANG_FRENCH} "You must be logged in as an administrator when installing this program."

-LangString SMPLAYER_INSTALLER_PREV_VERSION ${LANG_FRENCH} "SMPlayer has already been installed.$\nDo you want to remove the previous version before installing $(^Name)?"

+${LangFileString} SMPLAYER_INSTALLER_IS_RUNNING "The installer is already running."

+${LangFileString} SMPLAYER_INSTALLER_NO_ADMIN "You must be logged in as an administrator when installing this program."

 

 ; Components Page

-LangString MPLAYER_CODEC_INFORMATION ${LANG_FRENCH} "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

+${LangFileString} MPLAYER_CODEC_INFORMATION "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

 

 ; MPlayer Section

-LangString MPLAYER_IS_INSTALLED ${LANG_FRENCH} "MPlayer is already installed. Re-Download?"

-LangString MPLAYER_IS_DOWNLOADING ${LANG_FRENCH} "Downloading MPlayer..."

-LangString MPLAYER_DL_FAILED ${LANG_FRENCH} "Failed to download MPlayer:"

-LangString MPLAYER_INST_FAILED ${LANG_FRENCH} "Failed to install MPlayer. MPlayer is required for playback."

+!ifndef WITH_MPLAYER

+  ${LangFileString} MPLAYER_IS_DOWNLOADING "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."

+!endif

 

 ; Codecs Section

-LangString CODECS_IS_INSTALLED ${LANG_FRENCH} "MPlayer codecs are already installed. Re-Download?"

-LangString CODECS_IS_DOWNLOADING ${LANG_FRENCH} "Downloading MPlayer codecs..."

-LangString CODECS_DL_FAILED ${LANG_FRENCH} "Failed to download MPlayer codecs:"

-LangString CODECS_INST_FAILED ${LANG_FRENCH} "Failed to install MPlayer codecs."

+${LangFileString} CODECS_IS_DOWNLOADING "Downloading MPlayer codecs..."

+${LangFileString} CODECS_DL_RETRY "MPlayer codecs were not successfully installed. Retry?"

+${LangFileString} CODECS_DL_FAILED "Failed to download MPlayer codecs: '$R0'."

+${LangFileString} CODECS_INST_FAILED "Failed to install MPlayer codecs."

 

 ; Version information

-LangString VERINFO_IS_DOWNLOADING ${LANG_FRENCH} "Downloading version information..."

-LangString VERINFO_DL_FAILED ${LANG_FRENCH} "Failed to download version info:"

-LangString VERINFO_IS_MISSING ${LANG_FRENCH} "Version file missing version information. Setup will use a default version."

+${LangFileString} VERINFO_IS_DOWNLOADING "Downloading version information..."

+${LangFileString} VERINFO_DL_FAILED "Failed to download version info: '$R0'. Using a default version."

 

 ; Uninstaller

-LangString UNINSTALL_NO_ADMIN ${LANG_FRENCH} "This installation can only be uninstalled by a user with administrator privileges."

-LangString SMPLAYER_NOT_INSTALLED ${LANG_FRENCH} "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
\ No newline at end of file
+${LangFileString} UNINSTALL_NO_ADMIN "This installation can only be uninstalled by a user with administrator privileges."

+${LangFileString} UNINSTALL_ABORTED "Uninstall aborted by user."

+${LangFileString} SMPLAYER_NOT_INSTALLED "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"

+

+; Vista & Later Default Programs Registration

+${LangFileString} APPLICATION_DESCRIPTION "SMPlayer is a complete front-end for MPlayer, from basic features like playing videos, DVDs, VCDs to more advanced features like support for MPlayer filters, edl lists, and more."
\ No newline at end of file
diff --git a/setup/translations/german.nsh b/setup/translations/german.nsh
index 526c846..fa97298 100644
--- a/setup/translations/german.nsh
+++ b/setup/translations/german.nsh
@@ -1,38 +1,40 @@
-;;

-;;  german.nsh

-;;

-;;  German language strings for the Windows SMPlayer NSIS installer.

-;;  Save file with ANSI encoding

-;;

-;;  Author: 

-;;

+;Language: German (1031)

+;German language strings for the Windows SMPlayer NSIS installer.

+;

+;Save file as UTF-8 w/ BOM

+;

+

+!insertmacro LANGFILE "German" "Deutsch"

 

 ; Startup

-LangString SMPLAYER_INSTALLER_IS_RUNNING ${LANG_GERMAN} "Installationsprogramm l�uft bereits."

-LangString SMPLAYER_INSTALLER_UNSUPPORTED_OS ${LANG_GERMAN} "Nicht unterst�tztes Betriebssystem.$\n$(^Name) ben�tigt mindestens Windows 2000 und funktioniert m�glicherweise nicht korrekt auf diesem System.$\nDie Installation wirklich fortsetzen?"

-LangString SMPLAYER_INSTALLER_NO_ADMIN ${LANG_GERMAN} "Administratorrechte sind n�tig um dieses Programm zu installieren."

-LangString SMPLAYER_INSTALLER_PREV_VERSION ${LANG_GERMAN} "SMPlayer ist bereits installiert.$\nVor der Installtion die vorherige Version l�schen $(^Name)?"

+${LangFileString} SMPLAYER_INSTALLER_IS_RUNNING "Installationsprogramm läuft bereits."

+${LangFileString} SMPLAYER_INSTALLER_NO_ADMIN "Administratorrechte sind nötig um dieses Programm zu installieren."

 

 ; Components Page

-LangString MPLAYER_CODEC_INFORMATION ${LANG_GERMAN} "Bin�re Codec-Pakete werden eingesetzt f�r Codecs, die noch nicht nativ implementiert sind, wie neuere Varianten von RealVideo und viele ungew�hnliche Formate.$\nAchtung, nicht notwendig um die g�ngisten Formate wiederzugeben, wie DVD, MPEG-1/2/4 , etc."

+${LangFileString} MPLAYER_CODEC_INFORMATION "Binäre Codec-Pakete werden eingesetzt für Codecs, die noch nicht nativ implementiert sind, wie neuere Varianten von RealVideo und viele ungewöhnliche Formate.$\nAchtung, nicht notwendig um die gängisten Formate wiederzugeben, wie DVD, MPEG-1/2/4 , etc."

 

 ; MPlayer Section

-LangString MPLAYER_IS_INSTALLED ${LANG_GERMAN} "MPlayer ist bereits installiert. Erneut herunterladen?"

-LangString MPLAYER_IS_DOWNLOADING ${LANG_GERMAN} "Lade MPlayer herunter..."

-LangString MPLAYER_DL_FAILED ${LANG_GERMAN} "Fehler beim Herunterladen von MPlayer:"

-LangString MPLAYER_INST_FAILED ${LANG_GERMAN} "Fehler beim Installieren von MPlayer. MPlayer ist erforderlich f�r die Wiedergabe."

+!ifndef WITH_MPLAYER

+  ${LangFileString} MPLAYER_IS_DOWNLOADING "Lade MPlayer herunter..."

+  ${LangFileString} MPLAYER_DL_RETRY "MPlayer wurde nicht erfolgreich installiert. Wiederholung?"

+  ${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."

+!endif

 

 ; Codecs Section

-LangString CODECS_IS_INSTALLED ${LANG_GERMAN} "MPlayer-Codecs sind bereits installiert. Erneut herunterladen?"

-LangString CODECS_IS_DOWNLOADING ${LANG_GERMAN} "Lade MPlayer Codecs runter..."

-LangString CODECS_DL_FAILED ${LANG_GERMAN} "Fehler beim Herunterladen der MPlayer Codecs:"

-LangString CODECS_INST_FAILED ${LANG_GERMAN} "Fehler beim Installieren der MPlayer Codecs."

+${LangFileString} CODECS_IS_DOWNLOADING "Lade MPlayer Codecs runter..."

+${LangFileString} CODECS_DL_RETRY "MPlayer-Codecs wurden nicht erfolgreich installiert.. Wiederholung?"

+${LangFileString} CODECS_DL_FAILED "Fehler beim Herunterladen der MPlayer Codecs: '$R0'."

+${LangFileString} CODECS_INST_FAILED "Fehler beim Installieren der MPlayer Codecs."

 

 ; Version information

-LangString VERINFO_IS_DOWNLOADING ${LANG_GERMAN} "Lade Informationen der Version runter..."

-LangString VERINFO_DL_FAILED ${LANG_GERMAN} "Fehler beim Herunterladen der Versionsinfo:"

-LangString VERINFO_IS_MISSING ${LANG_GERMAN} "Versionsdatei fehlen Informationen �ber die Version. Setup nimmt Standardversion."

+${LangFileString} VERINFO_IS_DOWNLOADING "Lade Informationen der Version runter..."

+${LangFileString} VERINFO_DL_FAILED "Fehler beim Herunterladen der Versionsinfo: '$R0'. Standard-Version wird genommen."

 

 ; Uninstaller

-LangString UNINSTALL_NO_ADMIN ${LANG_GERMAN} "Administratorrechte sind n�tig um dieses Programm zu deinstallieren."

-LangString SMPLAYER_NOT_INSTALLED ${LANG_GERMAN} "Es scheint, das SMPlayer nicht in dem Verzeichnis installiert ist '$INSTDIR'.$\r$\nTrotzdem fortfahren (nicht empfohlen)?"

+${LangFileString} UNINSTALL_NO_ADMIN "Administratorrechte sind nötig um dieses Programm zu deinstallieren."

+${LangFileString} UNINSTALL_ABORTED "Deinstallieren vom Benutzer abgebrochen."

+${LangFileString} SMPLAYER_NOT_INSTALLED "Es scheint, das SMPlayer nicht in dem Verzeichnis installiert ist '$INSTDIR'.$\r$\nTrotzdem fortfahren (nicht empfohlen)?"

+

+; Vista & Later Default Programs Registration

+${LangFileString} APPLICATION_DESCRIPTION "SMPlayer ist ein komplettes Front-End für MPlayer, von grundlegenden Funktionen, wie das Abspielen von Videos, DVDs, VCDs, bis zu erweiterten Funktionen wie die Unterstützung für MPlayer Filter, edl-Listen und vieles mehr.."
diff --git a/setup/translations/hebrew.nsh b/setup/translations/hebrew.nsh
index a4dcf6b..a43844c 100644
--- a/setup/translations/hebrew.nsh
+++ b/setup/translations/hebrew.nsh
@@ -1,38 +1,40 @@
-;;

-;;  Hebrew.nsh

-;;

-;;  Hebrew language strings for the Windows SMPlayer NSIS installer.

-;;  Save file with ANSI encoding

-;;

-;;  Author: 

-;;

+;Language: Hebrew (1037)

+;Hebrew language strings for the Windows SMPlayer NSIS installer.

+;

+;Save file as UTF-8 w/ BOM

+;

+

+!insertmacro LANGFILE "Hebrew" "עברית"

 

 ; Startup

-LangString SMPLAYER_INSTALLER_IS_RUNNING ${LANG_HEBREW} "The installer is already running."

-LangString SMPLAYER_INSTALLER_UNSUPPORTED_OS ${LANG_HEBREW} "Unsupported operating system.$\n$(^Name) requires at least Windows 2000 and may not work correctly on your system.$\nDo you really want to continue with the installation?"

-LangString SMPLAYER_INSTALLER_NO_ADMIN ${LANG_HEBREW} "You must be logged in as an administrator when installing this program."

-LangString SMPLAYER_INSTALLER_PREV_VERSION ${LANG_HEBREW} "SMPlayer has already been installed.$\nDo you want to remove the previous version before installing $(^Name)?"

+${LangFileString} SMPLAYER_INSTALLER_IS_RUNNING "The installer is already running."

+${LangFileString} SMPLAYER_INSTALLER_NO_ADMIN "You must be logged in as an administrator when installing this program."

 

 ; Components Page

-LangString MPLAYER_CODEC_INFORMATION ${LANG_HEBREW} "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

+${LangFileString} MPLAYER_CODEC_INFORMATION "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

 

 ; MPlayer Section

-LangString MPLAYER_IS_INSTALLED ${LANG_HEBREW} "MPlayer is already installed. Re-Download?"

-LangString MPLAYER_IS_DOWNLOADING ${LANG_HEBREW} "Downloading MPlayer..."

-LangString MPLAYER_DL_FAILED ${LANG_HEBREW} "Failed to download MPlayer:"

-LangString MPLAYER_INST_FAILED ${LANG_HEBREW} "Failed to install MPlayer. MPlayer is required for playback."

+!ifndef WITH_MPLAYER

+  ${LangFileString} MPLAYER_IS_DOWNLOADING "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."

+!endif

 

 ; Codecs Section

-LangString CODECS_IS_INSTALLED ${LANG_HEBREW} "MPlayer codecs are already installed. Re-Download?"

-LangString CODECS_IS_DOWNLOADING ${LANG_HEBREW} "Downloading MPlayer codecs..."

-LangString CODECS_DL_FAILED ${LANG_HEBREW} "Failed to download MPlayer codecs:"

-LangString CODECS_INST_FAILED ${LANG_HEBREW} "Failed to install MPlayer codecs."

+${LangFileString} CODECS_IS_DOWNLOADING "Downloading MPlayer codecs..."

+${LangFileString} CODECS_DL_RETRY "MPlayer codecs were not successfully installed. Retry?"

+${LangFileString} CODECS_DL_FAILED "Failed to download MPlayer codecs: '$R0'."

+${LangFileString} CODECS_INST_FAILED "Failed to install MPlayer codecs."

 

 ; Version information

-LangString VERINFO_IS_DOWNLOADING ${LANG_HEBREW} "Downloading version information..."

-LangString VERINFO_DL_FAILED ${LANG_HEBREW} "Failed to download version info:"

-LangString VERINFO_IS_MISSING ${LANG_HEBREW} "Version file missing version information. Setup will use a default version."

+${LangFileString} VERINFO_IS_DOWNLOADING "Downloading version information..."

+${LangFileString} VERINFO_DL_FAILED "Failed to download version info: '$R0'. Using a default version."

 

 ; Uninstaller

-LangString UNINSTALL_NO_ADMIN ${LANG_HEBREW} "This installation can only be uninstalled by a user with administrator privileges."

-LangString SMPLAYER_NOT_INSTALLED ${LANG_HEBREW} "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
\ No newline at end of file
+${LangFileString} UNINSTALL_NO_ADMIN "This installation can only be uninstalled by a user with administrator privileges."

+${LangFileString} UNINSTALL_ABORTED "Uninstall aborted by user."

+${LangFileString} SMPLAYER_NOT_INSTALLED "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"

+

+; Vista & Later Default Programs Registration

+${LangFileString} APPLICATION_DESCRIPTION "SMPlayer is a complete front-end for MPlayer, from basic features like playing videos, DVDs, VCDs to more advanced features like support for MPlayer filters, edl lists, and more."
\ No newline at end of file
diff --git a/setup/translations/hungarian.nsh b/setup/translations/hungarian.nsh
index 7e33618..4afc958 100644
--- a/setup/translations/hungarian.nsh
+++ b/setup/translations/hungarian.nsh
@@ -1,38 +1,40 @@
-;;

-;;  hungarian.nsh

-;;

-;;  Hungarian language strings for the Windows SMPlayer NSIS installer.

-;;  Save file with ANSI encoding

-;;

-;;  Author: 

-;;

+;Language: Hungarian (1038)

+;Hungarian language strings for the Windows SMPlayer NSIS installer.

+;

+;Save file as UTF-8 w/ BOM

+;

+

+!insertmacro LANGFILE "Hungarian" "Magyar"

 

 ; Startup

-LangString SMPLAYER_INSTALLER_IS_RUNNING ${LANG_HUNGARIAN} "A telep�to m�r fut."

-LangString SMPLAYER_INSTALLER_UNSUPPORTED_OS ${LANG_HUNGARIAN} "Nem t�mogatott oper�ci�s rendszer.$\n$(^Name) legal�bb Windows 2000-et ig�nyel �s lehet hogy nem fog megfeleloen muk�dni a rendszer�n.$\nBiztosan folytatni akarja a telep�t�st?"

-LangString SMPLAYER_INSTALLER_NO_ADMIN ${LANG_HUNGARIAN} "Rendszergazdak�nt kell bejelentkeznie a program telep�t�s�hez."

-LangString SMPLAYER_INSTALLER_PREV_VERSION ${LANG_HUNGARIAN} "Az SMPlayer m�r telep�tve van.$\nEl akarja t�vol�tani az elozo verzi�t $(^Name) telep�t�se elott?"

+${LangFileString} SMPLAYER_INSTALLER_IS_RUNNING "A telepítő már fut."

+${LangFileString} SMPLAYER_INSTALLER_NO_ADMIN "Rendszergazdaként kell bejelentkeznie a program telepítéséhez."

 

 ; Components Page

-LangString MPLAYER_CODEC_INFORMATION ${LANG_HUNGARIAN} "A bin�ris kodek csomagok t�mogat�st ny�jtanak nat�van m�g nem t�mogatott kodekekhez, mint pl. az �jabb RealVideo vari�nsok �s sok ritka form�tum.$\nNem sz�ks�gesek a legt�bb gyakori form�tum lej�tsz�s�hoz, mint a DVD-k, MPEG-1/2/4, stb."

+${LangFileString} MPLAYER_CODEC_INFORMATION "A bináris kodek csomagok támogatást nyújtanak natívan még nem támogatott kodekekhez, mint pl. az újabb RealVideo variánsok és sok ritka formátum.$\nNem szükségesek a legtöbb gyakori formátum lejátszásához, mint a DVD-k, MPEG-1/2/4, stb."

 

 ; MPlayer Section

-LangString MPLAYER_IS_INSTALLED ${LANG_HUNGARIAN} "Az MPlayer m�r telep�tve van. �jra let�ltsem?"

-LangString MPLAYER_IS_DOWNLOADING ${LANG_HUNGARIAN} "Az MPlayer let�lt�se..."

-LangString MPLAYER_DL_FAILED ${LANG_HUNGARIAN} "Az MPlayer let�lt�se nem siker�lt:"

-LangString MPLAYER_INST_FAILED ${LANG_HUNGARIAN} "Az MPlayer telep�t�se nem siker�lt. Az MPlayerre sz�ks�g van a lej�tsz�shoz."

+!ifndef WITH_MPLAYER

+  ${LangFileString} MPLAYER_IS_DOWNLOADING "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."

+!endif

 

 ; Codecs Section

-LangString CODECS_IS_INSTALLED ${LANG_HUNGARIAN} "Az MPlayer kodekek m�r telep�tve vannak. �jra let�ltsem?"

-LangString CODECS_IS_DOWNLOADING ${LANG_HUNGARIAN} "MPlayer kodekek let�lt�se..."

-LangString CODECS_DL_FAILED ${LANG_HUNGARIAN} "Az MPlayer kodekek let�lt�se nem siker�lt:"

-LangString CODECS_INST_FAILED ${LANG_HUNGARIAN} "Az MPlayer kodekek telep�t�se nem siker�lt."

+${LangFileString} CODECS_IS_DOWNLOADING "MPlayer kodekek letöltése..."

+${LangFileString} CODECS_DL_RETRY "Az MPlayer kodekek telepítése nem sikerült. Újra próbáljam?"

+${LangFileString} CODECS_DL_FAILED "Az MPlayer kodekek letöltése nem sikerült: '$R0'."

+${LangFileString} CODECS_INST_FAILED "Az MPlayer kodekek telepítése nem sikerült."

 

 ; Version information

-LangString VERINFO_IS_DOWNLOADING ${LANG_HUNGARIAN} "Verzi� inform�ci� let�lt�se..."

-LangString VERINFO_DL_FAILED ${LANG_HUNGARIAN} "Verzi� inform�ci� let�lt�se nem siker�lt:"

-LangString VERINFO_IS_MISSING ${LANG_HUNGARIAN} "A verzi� f�jlb�l hi�nyzik a verzi� inform�ci�. A telep�t� egy alap�rtelmezett verzi�t fog haszn�lni."

+${LangFileString} VERINFO_IS_DOWNLOADING "Verzió információ letöltése..."

+${LangFileString} VERINFO_DL_FAILED "Verzió információ letöltése nem sikerült: '$R0'. Alapértelmezett verzió használata."

 

 ; Uninstaller

-LangString UNINSTALL_NO_ADMIN ${LANG_HUNGARIAN} "A telep�t�s elt�vol�t�shoz rendszergazdai jogosults�gok sz�ks�gesek."

-LangString SMPLAYER_NOT_INSTALLED ${LANG_HUNGARIAN} "Nem �gy n�z ki, mintha az SMPlayer ebbe a k�nyvt�rba lett volna telep�tve: '$INSTDIR'.$\r$\nM�gis folytassam (nem aj�nlott)?"
\ No newline at end of file
+${LangFileString} UNINSTALL_NO_ADMIN "A program eltávolításához rendszergazda jogosultság szükséges."

+${LangFileString} UNINSTALL_ABORTED "Az eltávolítást a felhasználó megszakította."

+${LangFileString} SMPLAYER_NOT_INSTALLED "Nem úgy néz ki, mint ha az SMPlayer ebbe a könyvtárba lett volna telepítve: '$INSTDIR'.$\r$\nMégis folytassam (nem ajánlott)?"

+

+; Vista & Later Default Programs Registration

+${LangFileString} APPLICATION_DESCRIPTION "Az SMPlayer egy komplett felület az MPlayerhez, mindent támogat az alap funkcióktól kezdve, mint a videók, DVDk, VCDk lejátszása, haladó funkciókig, mint az MPlayer szűrők, edl listák és még sok más."

diff --git a/setup/translations/italian.nsh b/setup/translations/italian.nsh
index a107b41..74c55d7 100644
--- a/setup/translations/italian.nsh
+++ b/setup/translations/italian.nsh
@@ -1,38 +1,40 @@
-;;

-;;  italian.nsh

-;;

-;;  Italian language strings for the Windows SMPlayer NSIS installer.

-;;  Save file with ANSI encoding

-;;

-;;  Author: 

-;;

+;Language: Italian (1040)

+;Italian language strings for the Windows SMPlayer NSIS installer.

+;

+;Save file as UTF-8 w/ BOM

+;

+

+!insertmacro LANGFILE "Italian" "Italiano"

 

 ; Startup

-LangString SMPLAYER_INSTALLER_IS_RUNNING ${LANG_ITALIAN} "Il programma di installazione � gi� in esecuzione."

-LangString SMPLAYER_INSTALLER_UNSUPPORTED_OS ${LANG_ITALIAN} "Sistema operativo non supportato.$\n$(^Name) richiede come minimo Windows 2000 e potrebbe non funzionare correttamente sul tuo sistema.$\nVuoi continuare ugualmente l'installazione?"

-LangString SMPLAYER_INSTALLER_NO_ADMIN ${LANG_ITALIAN} "Devi essere autenticato come amministratore per installare questo programma."

-LangString SMPLAYER_INSTALLER_PREV_VERSION ${LANG_ITALIAN} "SMPlayer � gi� stato installato.$\nVuoi rimuovere la versione precedente prima dell'installazione di $(^Name)?"

+${LangFileString} SMPLAYER_INSTALLER_IS_RUNNING "Il programma di installazione è già in esecuzione."

+${LangFileString} SMPLAYER_INSTALLER_NO_ADMIN "Devi essere autenticato come amministratore per installare questo programma."

 

 ; Components Page

-LangString MPLAYER_CODEC_INFORMATION ${LANG_ITALIAN} "I pacchetti di codec binari forniscono il supporto per i codec che non sono stati ancora implementati nativamente, per esempio per le varianti di RealVideo e anche un sacco di formati poco utilizzati.$\nNota che non sono richiesti per riprodurre i formati pi� comuni come DVD, MPEG-1/2/4, ecc."

+${LangFileString} MPLAYER_CODEC_INFORMATION "I pacchetti di codec binari forniscono il supporto per i codec che non sono stati ancora implementati nativamente, per esempio per le varianti di RealVideo e anche un sacco di formati poco utilizzati.$\nNota che non sono richiesti per riprodurre i formati più comuni come DVD, MPEG-1/2/4, ecc."

 

 ; MPlayer Section

-LangString MPLAYER_IS_INSTALLED ${LANG_ITALIAN} "MPlayer � gi� stato installato. Ri-scarico?"

-LangString MPLAYER_IS_DOWNLOADING ${LANG_ITALIAN} "Sto scaricando MPlayer..."

-LangString MPLAYER_DL_FAILED ${LANG_ITALIAN} "Scaricamento di MPlayer fallito:"

-LangString MPLAYER_INST_FAILED ${LANG_ITALIAN} "Installazione di MPlayer fallita. MPlayer � un componente necessario per la riproduzione multimediale."

+!ifndef WITH_MPLAYER

+  ${LangFileString} MPLAYER_IS_DOWNLOADING "Sto scaricando MPlayer..."

+  ${LangFileString} MPLAYER_DL_RETRY "MPlayer was not successfully installed. Retry?"

+  ${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."

+!endif

 

 ; Codecs Section

-LangString CODECS_IS_INSTALLED ${LANG_ITALIAN} "I codec di MPlayer sono gi� stati installati. Ri-scarico?"

-LangString CODECS_IS_DOWNLOADING ${LANG_ITALIAN} "Sto scaricando i codec di MPlayer..."

-LangString CODECS_DL_FAILED ${LANG_ITALIAN} "Scaricamento dei codec di MPlayer fallito:"

-LangString CODECS_INST_FAILED ${LANG_ITALIAN} "Installazione dei codec di MPlayer fallita."

+${LangFileString} CODECS_IS_DOWNLOADING "Sto scaricando i codec di MPlayer..."

+${LangFileString} CODECS_DL_RETRY "MPlayer codecs were not successfully installed. Retry?"

+${LangFileString} CODECS_DL_FAILED "Scaricamento dei codec di MPlayer fallito: '$R0'."

+${LangFileString} CODECS_INST_FAILED "Installazione dei codec di MPlayer fallita."

 

 ; Version information

-LangString VERINFO_IS_DOWNLOADING ${LANG_ITALIAN} "Sto scaricando le informazioni di versione..."

-LangString VERINFO_DL_FAILED ${LANG_ITALIAN} "Scaricamento delle informazioni di versione fallito:"

-LangString VERINFO_IS_MISSING ${LANG_ITALIAN} "Il file di versione non contiene informazioni di versione. Verr� utilizzata una versione predefinita."

+${LangFileString} VERINFO_IS_DOWNLOADING "Sto scaricando le informazioni di versione..."

+${LangFileString} VERINFO_DL_FAILED "Scaricamento delle informazioni di versione fallito: '$R0'. Using a default version."

 

 ; Uninstaller

-LangString UNINSTALL_NO_ADMIN ${LANG_ITALIAN} "La disinstallazione pu� essere effettuata solo da un utente con permessi amministrativi."

-LangString SMPLAYER_NOT_INSTALLED ${LANG_ITALIAN} "Sembra che SMPlayer non sia installato nel direttorio '$INSTDIR'.$\r$\nContinua comunque (non raccomandato)?"

+${LangFileString} UNINSTALL_NO_ADMIN "La disinstallazione può essere effettuata solo da un utente con permessi amministrativi."

+${LangFileString} UNINSTALL_ABORTED "Uninstall aborted by user."

+${LangFileString} SMPLAYER_NOT_INSTALLED "Sembra che SMPlayer non sia installato nel direttorio '$INSTDIR'.$\r$\nContinua comunque (non raccomandato)?"

+

+; Vista & Later Default Programs Registration

+${LangFileString} APPLICATION_DESCRIPTION "SMPlayer is a complete front-end for MPlayer, from basic features like playing videos, DVDs, VCDs to more advanced features like support for MPlayer filters, edl lists, and more."
\ No newline at end of file
diff --git a/setup/translations/japanese.nsh b/setup/translations/japanese.nsh
deleted file mode 100644
index 57ad0e5..0000000
--- a/setup/translations/japanese.nsh
+++ /dev/null
@@ -1,38 +0,0 @@
-;;

-;;  japanese.nsh

-;;

-;;  Japanese language strings for the Windows SMPlayer NSIS installer.

-;;  Save file with ANSI encoding

-;;

-;;  Author:

-;;

-

-; Startup

-LangString SMPLAYER_INSTALLER_IS_RUNNING ${LANG_JAPANESE} "The installer is already running."

-LangString SMPLAYER_INSTALLER_UNSUPPORTED_OS ${LANG_JAPANESE} "Unsupported operating system.$\n$(^Name) requires at least Windows 2000 and may not work correctly on your system.$\nDo you really want to continue with the installation?"

-LangString SMPLAYER_INSTALLER_NO_ADMIN ${LANG_JAPANESE} "You must be logged in as an administrator when installing this program."

-LangString SMPLAYER_INSTALLER_PREV_VERSION ${LANG_JAPANESE} "SMPlayer has already been installed.$\nDo you want to remove the previous version before installing $(^Name)?"

-

-; Components Page

-LangString MPLAYER_CODEC_INFORMATION ${LANG_JAPANESE} "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

-

-; MPlayer Section

-LangString MPLAYER_IS_INSTALLED ${LANG_JAPANESE} "MPlayer is already installed. Re-Download?"

-LangString MPLAYER_IS_DOWNLOADING ${LANG_JAPANESE} "Downloading MPlayer..."

-LangString MPLAYER_DL_FAILED ${LANG_JAPANESE} "Failed to download MPlayer:"

-LangString MPLAYER_INST_FAILED ${LANG_JAPANESE} "Failed to install MPlayer. MPlayer is required for playback."

-

-; Codecs Section

-LangString CODECS_IS_INSTALLED ${LANG_JAPANESE} "MPlayer codecs are already installed. Re-Download?"

-LangString CODECS_IS_DOWNLOADING ${LANG_JAPANESE} "Downloading MPlayer codecs..."

-LangString CODECS_DL_FAILED ${LANG_JAPANESE} "Failed to download MPlayer codecs:"

-LangString CODECS_INST_FAILED ${LANG_JAPANESE} "Failed to install MPlayer codecs."

-

-; Version information

-LangString VERINFO_IS_DOWNLOADING ${LANG_JAPANESE} "Downloading version information..."

-LangString VERINFO_DL_FAILED ${LANG_JAPANESE} "Failed to download version info:"

-LangString VERINFO_IS_MISSING ${LANG_JAPANESE} "Version file missing version information. Setup will use a default version."

-

-; Uninstaller

-LangString UNINSTALL_NO_ADMIN ${LANG_JAPANESE} "This installation can only be uninstalled by a user with administrator privileges."

-LangString SMPLAYER_NOT_INSTALLED ${LANG_JAPANESE} "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
\ No newline at end of file
diff --git a/setup/translations/norwegian.nsh b/setup/translations/norwegian.nsh
index 2460af5..dbc61f6 100644
--- a/setup/translations/norwegian.nsh
+++ b/setup/translations/norwegian.nsh
@@ -1,38 +1,40 @@
-;;

-;;  norwegian.nsh

-;;

-;;  Norwegian language strings for the Windows SMPlayer NSIS installer.

-;;  Save file with ANSI encoding

-;;

-;;  Author: 

-;;

+;Language: Norwegian (2068)

+;Norwegian language strings for the Windows SMPlayer NSIS installer.

+;

+;Save file as UTF-8 w/ BOM

+;

+

+!insertmacro LANGFILE "Norwegian" "Norwegian"

 

 ; Startup

-LangString SMPLAYER_INSTALLER_IS_RUNNING ${LANG_NORWEGIAN} "The installer is already running."

-LangString SMPLAYER_INSTALLER_UNSUPPORTED_OS ${LANG_NORWEGIAN} "Unsupported operating system.$\n$(^Name) requires at least Windows 2000 and may not work correctly on your system.$\nDo you really want to continue with the installation?"

-LangString SMPLAYER_INSTALLER_NO_ADMIN ${LANG_NORWEGIAN} "You must be logged in as an administrator when installing this program."

-LangString SMPLAYER_INSTALLER_PREV_VERSION ${LANG_NORWEGIAN} "SMPlayer has already been installed.$\nDo you want to remove the previous version before installing $(^Name)?"

+${LangFileString} SMPLAYER_INSTALLER_IS_RUNNING "The installer is already running."

+${LangFileString} SMPLAYER_INSTALLER_NO_ADMIN "You must be logged in as an administrator when installing this program."

 

 ; Components Page

-LangString MPLAYER_CODEC_INFORMATION ${LANG_NORWEGIAN} "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

+${LangFileString} MPLAYER_CODEC_INFORMATION "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

 

 ; MPlayer Section

-LangString MPLAYER_IS_INSTALLED ${LANG_NORWEGIAN} "MPlayer is already installed. Re-Download?"

-LangString MPLAYER_IS_DOWNLOADING ${LANG_NORWEGIAN} "Downloading MPlayer..."

-LangString MPLAYER_DL_FAILED ${LANG_NORWEGIAN} "Failed to download MPlayer:"

-LangString MPLAYER_INST_FAILED ${LANG_NORWEGIAN} "Failed to install MPlayer. MPlayer is required for playback."

+!ifndef WITH_MPLAYER

+  ${LangFileString} MPLAYER_IS_DOWNLOADING "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."

+!endif

 

 ; Codecs Section

-LangString CODECS_IS_INSTALLED ${LANG_NORWEGIAN} "MPlayer codecs are already installed. Re-Download?"

-LangString CODECS_IS_DOWNLOADING ${LANG_NORWEGIAN} "Downloading MPlayer codecs..."

-LangString CODECS_DL_FAILED ${LANG_NORWEGIAN} "Failed to download MPlayer codecs:"

-LangString CODECS_INST_FAILED ${LANG_NORWEGIAN} "Failed to install MPlayer codecs."

+${LangFileString} CODECS_IS_DOWNLOADING "Downloading MPlayer codecs..."

+${LangFileString} CODECS_DL_RETRY "MPlayer codecs were not successfully installed. Retry?"

+${LangFileString} CODECS_DL_FAILED "Failed to download MPlayer codecs: '$R0'."

+${LangFileString} CODECS_INST_FAILED "Failed to install MPlayer codecs."

 

 ; Version information

-LangString VERINFO_IS_DOWNLOADING ${LANG_NORWEGIAN} "Downloading version information..."

-LangString VERINFO_DL_FAILED ${LANG_NORWEGIAN} "Failed to download version info:"

-LangString VERINFO_IS_MISSING ${LANG_NORWEGIAN} "Version file missing version information. Setup will use a default version."

+${LangFileString} VERINFO_IS_DOWNLOADING "Downloading version information..."

+${LangFileString} VERINFO_DL_FAILED "Failed to download version info: '$R0'. Using a default version."

 

 ; Uninstaller

-LangString UNINSTALL_NO_ADMIN ${LANG_NORWEGIAN} "This installation can only be uninstalled by a user with administrator privileges."

-LangString SMPLAYER_NOT_INSTALLED ${LANG_NORWEGIAN} "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
\ No newline at end of file
+${LangFileString} UNINSTALL_NO_ADMIN "This installation can only be uninstalled by a user with administrator privileges."

+${LangFileString} UNINSTALL_ABORTED "Uninstall aborted by user."

+${LangFileString} SMPLAYER_NOT_INSTALLED "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"

+

+; Vista & Later Default Programs Registration

+${LangFileString} APPLICATION_DESCRIPTION "SMPlayer is a complete front-end for MPlayer, from basic features like playing videos, DVDs, VCDs to more advanced features like support for MPlayer filters, edl lists, and more."
\ No newline at end of file
diff --git a/setup/translations/polish.nsh b/setup/translations/polish.nsh
index 5e04ab2..75d7bd9 100644
--- a/setup/translations/polish.nsh
+++ b/setup/translations/polish.nsh
@@ -1,38 +1,40 @@
-;;

-;;  polish.nsh

-;;

-;;  Polish language strings for the Windows SMPlayer NSIS installer.

-;;  Save file with ANSI encoding

-;;

-;;  Author: 

-;;

+;Language: Polish (1045)

+;Polish language strings for the Windows SMPlayer NSIS installer.

+;

+;Save file as UTF-8 w/ BOM

+;

+

+!insertmacro LANGFILE "Polish" "Polski"

 

 ; Startup

-LangString SMPLAYER_INSTALLER_IS_RUNNING ${LANG_POLISH} "The installer is already running."

-LangString SMPLAYER_INSTALLER_UNSUPPORTED_OS ${LANG_POLISH} "Unsupported operating system.$\n$(^Name) requires at least Windows 2000 and may not work correctly on your system.$\nDo you really want to continue with the installation?"

-LangString SMPLAYER_INSTALLER_NO_ADMIN ${LANG_POLISH} "You must be logged in as an administrator when installing this program."

-LangString SMPLAYER_INSTALLER_PREV_VERSION ${LANG_POLISH} "SMPlayer has already been installed.$\nDo you want to remove the previous version before installing $(^Name)?"

+${LangFileString} SMPLAYER_INSTALLER_IS_RUNNING "The installer is already running."

+${LangFileString} SMPLAYER_INSTALLER_NO_ADMIN "You must be logged in as an administrator when installing this program."

 

 ; Components Page

-LangString MPLAYER_CODEC_INFORMATION ${LANG_POLISH} "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

+${LangFileString} MPLAYER_CODEC_INFORMATION "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

 

 ; MPlayer Section

-LangString MPLAYER_IS_INSTALLED ${LANG_POLISH} "MPlayer is already installed. Re-Download?"

-LangString MPLAYER_IS_DOWNLOADING ${LANG_POLISH} "Downloading MPlayer..."

-LangString MPLAYER_DL_FAILED ${LANG_POLISH} "Failed to download MPlayer:"

-LangString MPLAYER_INST_FAILED ${LANG_POLISH} "Failed to install MPlayer. MPlayer is required for playback."

+!ifndef WITH_MPLAYER

+  ${LangFileString} MPLAYER_IS_DOWNLOADING "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."

+!endif

 

 ; Codecs Section

-LangString CODECS_IS_INSTALLED ${LANG_POLISH} "MPlayer codecs are already installed. Re-Download?"

-LangString CODECS_IS_DOWNLOADING ${LANG_POLISH} "Downloading MPlayer codecs..."

-LangString CODECS_DL_FAILED ${LANG_POLISH} "Failed to download MPlayer codecs:"

-LangString CODECS_INST_FAILED ${LANG_POLISH} "Failed to install MPlayer codecs."

+${LangFileString} CODECS_IS_DOWNLOADING "Downloading MPlayer codecs..."

+${LangFileString} CODECS_DL_RETRY "MPlayer codecs were not successfully installed. Retry?"

+${LangFileString} CODECS_DL_FAILED "Failed to download MPlayer codecs: '$R0'."

+${LangFileString} CODECS_INST_FAILED "Failed to install MPlayer codecs."

 

 ; Version information

-LangString VERINFO_IS_DOWNLOADING ${LANG_POLISH} "Downloading version information..."

-LangString VERINFO_DL_FAILED ${LANG_POLISH} "Failed to download version info:"

-LangString VERINFO_IS_MISSING ${LANG_POLISH} "Version file missing version information. Setup will use a default version."

+${LangFileString} VERINFO_IS_DOWNLOADING "Downloading version information..."

+${LangFileString} VERINFO_DL_FAILED "Failed to download version info: '$R0'. Using a default version."

 

 ; Uninstaller

-LangString UNINSTALL_NO_ADMIN ${LANG_POLISH} "This installation can only be uninstalled by a user with administrator privileges."

-LangString SMPLAYER_NOT_INSTALLED ${LANG_POLISH} "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
\ No newline at end of file
+${LangFileString} UNINSTALL_NO_ADMIN "This installation can only be uninstalled by a user with administrator privileges."

+${LangFileString} UNINSTALL_ABORTED "Uninstall aborted by user."

+${LangFileString} SMPLAYER_NOT_INSTALLED "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"

+

+; Vista & Later Default Programs Registration

+${LangFileString} APPLICATION_DESCRIPTION "SMPlayer is a complete front-end for MPlayer, from basic features like playing videos, DVDs, VCDs to more advanced features like support for MPlayer filters, edl lists, and more."
\ No newline at end of file
diff --git a/setup/translations/portuguese.nsh b/setup/translations/portuguese.nsh
index 567bf6f..23e4f8b 100644
--- a/setup/translations/portuguese.nsh
+++ b/setup/translations/portuguese.nsh
@@ -1,38 +1,40 @@
-;;

-;;  Portuguese.nsh

-;;

-;;  Portuguese language strings for the Windows SMPlayer NSIS installer.

-;;  Save file with ANSI encoding

-;;

-;;  Author: 

-;;

+;Language: Portuguese (2070)

+;Portuguese language strings for the Windows SMPlayer NSIS installer.

+;

+;Save file as UTF-8 w/ BOM

+;

+

+!insertmacro LANGFILE "Portuguese" "Português"

 

 ; Startup

-LangString SMPLAYER_INSTALLER_IS_RUNNING ${LANG_PORTUGUESE} "The installer is already running."

-LangString SMPLAYER_INSTALLER_UNSUPPORTED_OS ${LANG_PORTUGUESE} "Unsupported operating system.$\n$(^Name) requires at least Windows 2000 and may not work correctly on your system.$\nDo you really want to continue with the installation?"

-LangString SMPLAYER_INSTALLER_NO_ADMIN ${LANG_PORTUGUESE} "You must be logged in as an administrator when installing this program."

-LangString SMPLAYER_INSTALLER_PREV_VERSION ${LANG_PORTUGUESE} "SMPlayer has already been installed.$\nDo you want to remove the previous version before installing $(^Name)?"

+${LangFileString} SMPLAYER_INSTALLER_IS_RUNNING "O instalador já está em execução."

+${LangFileString} SMPLAYER_INSTALLER_NO_ADMIN "Tem que iniciar a sessão como administrador para instalar este programa."

 

 ; Components Page

-LangString MPLAYER_CODEC_INFORMATION ${LANG_PORTUGUESE} "O pacote de codecs bin�rios adiciona suporte para os codecs que ainda n�o foram implementados, tais como as novas variantes RealVideo e alguns formatos n�o usuais.$\nNote que estes n�o ser�o necess�rios para os formatos mais comuns como DVDs, MPEG-1/2/4, etc."

+${LangFileString} MPLAYER_CODEC_INFORMATION "O pacote de codecs binários adiciona suporte para os codecs que ainda não foram implementados, tais como as novas variantes RealVideo e alguns formatos não usuais.$\nNote que estes não serão necessários para os formatos mais comuns como DVDs, MPEG-1/2/4, etc."

 

 ; MPlayer Section

-LangString MPLAYER_IS_INSTALLED ${LANG_PORTUGUESE} "O MPlayer j� est� instalado. Re-Transferir?"

-LangString MPLAYER_IS_DOWNLOADING ${LANG_PORTUGUESE} "Transferindo MPlayer..."

-LangString MPLAYER_DL_FAILED ${LANG_PORTUGUESE} "Falha ao transferir MPlayer:"

-LangString MPLAYER_INST_FAILED ${LANG_PORTUGUESE} "Falha ao instalar MPlayer. O MPlayer � necess�rio para reproduzir."

+!ifndef WITH_MPLAYER

+  ${LangFileString} MPLAYER_IS_DOWNLOADING "Transferindo MPlayer..."

+  ${LangFileString} MPLAYER_DL_RETRY "MPlayer não foi correctamente instalado. Tentar novamente?"

+  ${LangFileString} MPLAYER_DL_FAILED "Falha ao transferir MPlayer: '$R0'."

+  ${LangFileString} MPLAYER_INST_FAILED "Falha ao instalar MPlayer. O MPlayer é necessário para reproduzir."

+!endif

 

 ; Codecs Section

-LangString CODECS_IS_INSTALLED ${LANG_PORTUGUESE} "Os codecs MPlayer j� est�o instalados. Re-Transferir?"

-LangString CODECS_IS_DOWNLOADING ${LANG_PORTUGUESE} "Transferindo codecs MPlayer..."

-LangString CODECS_DL_FAILED ${LANG_PORTUGUESE} "Falha ao transferir os codecs MPlayer:"

-LangString CODECS_INST_FAILED ${LANG_PORTUGUESE} "Falha ao instalar os codecs MPlayer."

+${LangFileString} CODECS_IS_DOWNLOADING "Transferindo codecs MPlayer..."

+${LangFileString} CODECS_DL_RETRY "Os codecs MPlayer não foram correctamente instalados. Tentar novamente?"

+${LangFileString} CODECS_DL_FAILED "Falha ao transferir os codecs MPlayer: '$R0'."

+${LangFileString} CODECS_INST_FAILED "Falha ao instalar os codecs MPlayer."

 

 ; Version information

-LangString VERINFO_IS_DOWNLOADING ${LANG_PORTUGUESE} "Transferindo informa��es sobre a vers�o..."

-LangString VERINFO_DL_FAILED ${LANG_PORTUGUESE} "Falha ao transferir informa��es sobre a vers�o:"

-LangString VERINFO_IS_MISSING ${LANG_PORTUGUESE} "Informa��o sobre a vers�o em falta. A configura��o ir� utilizar a vers�o padr�o."

+${LangFileString} VERINFO_IS_DOWNLOADING "Transferindo informações sobre a versão..."

+${LangFileString} VERINFO_DL_FAILED "Falha ao transferir informações sobre a versão: '$R0'. Using a default version."

 

 ; Uninstaller

-LangString UNINSTALL_NO_ADMIN ${LANG_PORTUGUESE} "This installation can only be uninstalled by a user with administrator privileges."

-LangString SMPLAYER_NOT_INSTALLED ${LANG_PORTUGUESE} "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
\ No newline at end of file
+${LangFileString} UNINSTALL_NO_ADMIN "Esta aplicação apenas pode ser desinstalada no modo de administrador."

+${LangFileString} UNINSTALL_ABORTED "Desinstalação cancelada pelo utilizador."

+${LangFileString} SMPLAYER_NOT_INSTALLED "Parece que o SMPlayer não está instalado no directório '$INSTDIR'.$\r$\nContinuar mesmo assim (não recomendado)?"

+

+; Vista & Later Default Programs Registration

+${LangFileString} APPLICATION_DESCRIPTION "O SMPlayer é um interface gráfico para o MPlayer, com funcionalidades básicas desde a reprodução de vídeos, DVDs, VCDs bem como outras mais avançadas(suporte a filtros MPlayer, listas e mais)."
\ No newline at end of file
diff --git a/setup/translations/russian.nsh b/setup/translations/russian.nsh
index 7d6e28f..165a8bd 100644
--- a/setup/translations/russian.nsh
+++ b/setup/translations/russian.nsh
@@ -1,38 +1,40 @@
-;;

-;;  russian.nsh

-;;

-;;  Russian language strings for the Windows SMPlayer NSIS installer.

-;;  Save file with ANSI encoding

-;;

-;;  Author: 

-;;

+;Language: Russian (1049)

+;Russian language strings for the Windows SMPlayer NSIS installer.

+;

+;Save file as UTF-8 w/ BOM

+;

+

+!insertmacro LANGFILE "Russian" "Русский"

 

 ; Startup

-LangString SMPLAYER_INSTALLER_IS_RUNNING ${LANG_RUSSIAN} "The installer is already running."

-LangString SMPLAYER_INSTALLER_UNSUPPORTED_OS ${LANG_RUSSIAN} "Unsupported operating system.$\n$(^Name) requires at least Windows 2000 and may not work correctly on your system.$\nDo you really want to continue with the installation?"

-LangString SMPLAYER_INSTALLER_NO_ADMIN ${LANG_RUSSIAN} "You must be logged in as an administrator when installing this program."

-LangString SMPLAYER_INSTALLER_PREV_VERSION ${LANG_RUSSIAN} "SMPlayer has already been installed.$\nDo you want to remove the previous version before installing $(^Name)?"

+${LangFileString} SMPLAYER_INSTALLER_IS_RUNNING "Программа установки уже запущена."

+${LangFileString} SMPLAYER_INSTALLER_NO_ADMIN "You must be logged in as an administrator when installing this program."

 

 ; Components Page

-LangString MPLAYER_CODEC_INFORMATION ${LANG_RUSSIAN} "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

+${LangFileString} MPLAYER_CODEC_INFORMATION "Пакеты с бинарными кодеками добавляют поддержку кодеков, не встроенных в mplayer, например, RealVideo и других нестандартных форматов.$\nОбратите внимание, что эти кодеки не нужны для воспроизведения большинства обычных форматов вроде DVD, MPEG-1/2/4 и т.п."

 

 ; MPlayer Section

-LangString MPLAYER_IS_INSTALLED ${LANG_RUSSIAN} "MPlayer is already installed. Re-Download?"

-LangString MPLAYER_IS_DOWNLOADING ${LANG_RUSSIAN} "Downloading MPlayer..."

-LangString MPLAYER_DL_FAILED ${LANG_RUSSIAN} "Failed to download MPlayer:"

-LangString MPLAYER_INST_FAILED ${LANG_RUSSIAN} "Failed to install MPlayer. MPlayer is required for playback."

+!ifndef WITH_MPLAYER

+  ${LangFileString} MPLAYER_IS_DOWNLOADING "Загрузка MPlayer..."

+  ${LangFileString} MPLAYER_DL_RETRY "MPlayer was not successfully installed. Retry?"

+  ${LangFileString} MPLAYER_DL_FAILED "Не удалось загрузить MPlayer: '$R0'."

+  ${LangFileString} MPLAYER_INST_FAILED "Ошибка при установке MPlayer. MPlayer требуется для воспроизведения."

+!endif

 

 ; Codecs Section

-LangString CODECS_IS_INSTALLED ${LANG_RUSSIAN} "MPlayer codecs are already installed. Re-Download?"

-LangString CODECS_IS_DOWNLOADING ${LANG_RUSSIAN} "Downloading MPlayer codecs..."

-LangString CODECS_DL_FAILED ${LANG_RUSSIAN} "Failed to download MPlayer codecs:"

-LangString CODECS_INST_FAILED ${LANG_RUSSIAN} "Failed to install MPlayer codecs."

+${LangFileString} CODECS_IS_DOWNLOADING "Загрузка бинарных кодеков для MPlayer..."

+${LangFileString} CODECS_DL_RETRY "MPlayer codecs were not successfully installed. Retry?"

+${LangFileString} CODECS_DL_FAILED "Не удалось загрузить бинарные кодеки для MPlayer: '$R0'."

+${LangFileString} CODECS_INST_FAILED "Ошибка при установке бинарных кодеков для MPlayer."

 

 ; Version information

-LangString VERINFO_IS_DOWNLOADING ${LANG_RUSSIAN} "Downloading version information..."

-LangString VERINFO_DL_FAILED ${LANG_RUSSIAN} "Failed to download version info:"

-LangString VERINFO_IS_MISSING ${LANG_RUSSIAN} "Version file missing version information. Setup will use a default version."

+${LangFileString} VERINFO_IS_DOWNLOADING "Загрузка информации о версии..."

+${LangFileString} VERINFO_DL_FAILED "Не удалось загрузить информацию о версии: '$R0'. Using a default version."

 

 ; Uninstaller

-LangString UNINSTALL_NO_ADMIN ${LANG_RUSSIAN} "This installation can only be uninstalled by a user with administrator privileges."

-LangString SMPLAYER_NOT_INSTALLED ${LANG_RUSSIAN} "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
\ No newline at end of file
+${LangFileString} UNINSTALL_NO_ADMIN "This installation can only be uninstalled by a user with administrator privileges."

+${LangFileString} UNINSTALL_ABORTED "Удаление прервано пользователем."

+${LangFileString} SMPLAYER_NOT_INSTALLED "Не похоже, что SMPlayer установлен в каталог '$INSTDIR'.$\r$\nПродолжить всё равно (не рекомендуется)?"

+

+; Vista & Later Default Programs Registration

+${LangFileString} APPLICATION_DESCRIPTION "SMPlayer - полноценная оболочка для MPlayer, начиная от базовых функций вроде воспроизведения видеофайлов, DVD, VCD и заканчивая более продвинутыми вроде поддержки фильтров MPlayer, списков и т.д."
\ No newline at end of file
diff --git a/setup/translations/slovak.nsh b/setup/translations/slovak.nsh
index 4303ba5..217bde1 100644
--- a/setup/translations/slovak.nsh
+++ b/setup/translations/slovak.nsh
@@ -1,38 +1,40 @@
-;;

-;;  slovak.nsh

-;;

-;;  Slovak language strings for the Windows SMPlayer NSIS installer.

-;;  Save file with ANSI encoding

-;;

-;;  Author: 

-;;

+;Language: Slovak (1051)

+;Slovak language strings for the Windows SMPlayer NSIS installer.

+;

+;Save file as UTF-8 w/ BOM

+;

+

+!insertmacro LANGFILE "Slovak" "Slovenčina"

 

 ; Startup

-LangString SMPLAYER_INSTALLER_IS_RUNNING ${LANG_SLOVAK} "The installer is already running."

-LangString SMPLAYER_INSTALLER_UNSUPPORTED_OS ${LANG_SLOVAK} "Unsupported operating system.$\n$(^Name) requires at least Windows 2000 and may not work correctly on your system.$\nDo you really want to continue with the installation?"

-LangString SMPLAYER_INSTALLER_NO_ADMIN ${LANG_SLOVAK} "You must be logged in as an administrator when installing this program."

-LangString SMPLAYER_INSTALLER_PREV_VERSION ${LANG_SLOVAK} "SMPlayer has already been installed.$\nDo you want to remove the previous version before installing $(^Name)?"

+${LangFileString} SMPLAYER_INSTALLER_IS_RUNNING "The installer is already running."

+${LangFileString} SMPLAYER_INSTALLER_NO_ADMIN "You must be logged in as an administrator when installing this program."

 

 ; Components Page

-LangString MPLAYER_CODEC_INFORMATION ${LANG_SLOVAK} "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

+${LangFileString} MPLAYER_CODEC_INFORMATION "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

 

 ; MPlayer Section

-LangString MPLAYER_IS_INSTALLED ${LANG_SLOVAK} "MPlayer is already installed. Re-Download?"

-LangString MPLAYER_IS_DOWNLOADING ${LANG_SLOVAK} "Downloading MPlayer..."

-LangString MPLAYER_DL_FAILED ${LANG_SLOVAK} "Failed to download MPlayer:"

-LangString MPLAYER_INST_FAILED ${LANG_SLOVAK} "Failed to install MPlayer. MPlayer is required for playback."

+!ifndef WITH_MPLAYER

+  ${LangFileString} MPLAYER_IS_DOWNLOADING "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."

+!endif

 

 ; Codecs Section

-LangString CODECS_IS_INSTALLED ${LANG_SLOVAK} "MPlayer codecs are already installed. Re-Download?"

-LangString CODECS_IS_DOWNLOADING ${LANG_SLOVAK} "Downloading MPlayer codecs..."

-LangString CODECS_DL_FAILED ${LANG_SLOVAK} "Failed to download MPlayer codecs:"

-LangString CODECS_INST_FAILED ${LANG_SLOVAK} "Failed to install MPlayer codecs."

+${LangFileString} CODECS_IS_DOWNLOADING "Downloading MPlayer codecs..."

+${LangFileString} CODECS_DL_RETRY "MPlayer codecs were not successfully installed. Retry?"

+${LangFileString} CODECS_DL_FAILED "Failed to download MPlayer codecs: '$R0'."

+${LangFileString} CODECS_INST_FAILED "Failed to install MPlayer codecs."

 

 ; Version information

-LangString VERINFO_IS_DOWNLOADING ${LANG_SLOVAK} "Downloading version information..."

-LangString VERINFO_DL_FAILED ${LANG_SLOVAK} "Failed to download version info:"

-LangString VERINFO_IS_MISSING ${LANG_SLOVAK} "Version file missing version information. Setup will use a default version."

+${LangFileString} VERINFO_IS_DOWNLOADING "Downloading version information..."

+${LangFileString} VERINFO_DL_FAILED "Failed to download version info: '$R0'. Using a default version."

 

 ; Uninstaller

-LangString UNINSTALL_NO_ADMIN ${LANG_SLOVAK} "This installation can only be uninstalled by a user with administrator privileges."

-LangString SMPLAYER_NOT_INSTALLED ${LANG_SLOVAK} "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
\ No newline at end of file
+${LangFileString} UNINSTALL_NO_ADMIN "This installation can only be uninstalled by a user with administrator privileges."

+${LangFileString} UNINSTALL_ABORTED "Uninstall aborted by user."

+${LangFileString} SMPLAYER_NOT_INSTALLED "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"

+

+; Vista & Later Default Programs Registration

+${LangFileString} APPLICATION_DESCRIPTION "SMPlayer is a complete front-end for MPlayer, from basic features like playing videos, DVDs, VCDs to more advanced features like support for MPlayer filters, edl lists, and more."
\ No newline at end of file
diff --git a/setup/translations/slovenian.nsh b/setup/translations/slovenian.nsh
index 88b9454..a78f890 100644
--- a/setup/translations/slovenian.nsh
+++ b/setup/translations/slovenian.nsh
@@ -1,38 +1,40 @@
-;;

-;;  slovenian.nsh

-;;

-;;  Slovenian language strings for the Windows SMPlayer NSIS installer.

-;;  Save file with ANSI encoding

-;;

-;;  Author: 

-;;

+;Language: Slovenian (1060)

+;Slovenian language strings for the Windows SMPlayer NSIS installer.

+;

+;Save file as UTF-8 w/ BOM

+;

+

+!insertmacro LANGFILE "Slovenian" "Slovenščina"

 

 ; Startup

-LangString SMPLAYER_INSTALLER_IS_RUNNING ${LANG_SLOVENIAN} "The installer is already running."

-LangString SMPLAYER_INSTALLER_UNSUPPORTED_OS ${LANG_SLOVENIAN} "Unsupported operating system.$\n$(^Name) requires at least Windows 2000 and may not work correctly on your system.$\nDo you really want to continue with the installation?"

-LangString SMPLAYER_INSTALLER_NO_ADMIN ${LANG_SLOVENIAN} "You must be logged in as an administrator when installing this program."

-LangString SMPLAYER_INSTALLER_PREV_VERSION ${LANG_SLOVENIAN} "SMPlayer has already been installed.$\nDo you want to remove the previous version before installing $(^Name)?"

+${LangFileString} SMPLAYER_INSTALLER_IS_RUNNING "The installer is already running."

+${LangFileString} SMPLAYER_INSTALLER_NO_ADMIN "You must be logged in as an administrator when installing this program."

 

 ; Components Page

-LangString MPLAYER_CODEC_INFORMATION ${LANG_SLOVENIAN} "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

+${LangFileString} MPLAYER_CODEC_INFORMATION "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

 

 ; MPlayer Section

-LangString MPLAYER_IS_INSTALLED ${LANG_SLOVENIAN} "MPlayer is already installed. Re-Download?"

-LangString MPLAYER_IS_DOWNLOADING ${LANG_SLOVENIAN} "Downloading MPlayer..."

-LangString MPLAYER_DL_FAILED ${LANG_SLOVENIAN} "Failed to download MPlayer:"

-LangString MPLAYER_INST_FAILED ${LANG_SLOVENIAN} "Failed to install MPlayer. MPlayer is required for playback."

+!ifndef WITH_MPLAYER

+  ${LangFileString} MPLAYER_IS_DOWNLOADING "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."

+!endif

 

 ; Codecs Section

-LangString CODECS_IS_INSTALLED ${LANG_SLOVENIAN} "MPlayer codecs are already installed. Re-Download?"

-LangString CODECS_IS_DOWNLOADING ${LANG_SLOVENIAN} "Downloading MPlayer codecs..."

-LangString CODECS_DL_FAILED ${LANG_SLOVENIAN} "Failed to download MPlayer codecs:"

-LangString CODECS_INST_FAILED ${LANG_SLOVENIAN} "Failed to install MPlayer codecs."

+${LangFileString} CODECS_IS_DOWNLOADING "Downloading MPlayer codecs..."

+${LangFileString} CODECS_DL_RETRY "MPlayer codecs were not successfully installed. Retry?"

+${LangFileString} CODECS_DL_FAILED "Failed to download MPlayer codecs: '$R0'."

+${LangFileString} CODECS_INST_FAILED "Failed to install MPlayer codecs."

 

 ; Version information

-LangString VERINFO_IS_DOWNLOADING ${LANG_SLOVENIAN} "Downloading version information..."

-LangString VERINFO_DL_FAILED ${LANG_SLOVENIAN} "Failed to download version info:"

-LangString VERINFO_IS_MISSING ${LANG_SLOVENIAN} "Version file missing version information. Setup will use a default version."

+${LangFileString} VERINFO_IS_DOWNLOADING "Downloading version information..."

+${LangFileString} VERINFO_DL_FAILED "Failed to download version info: '$R0'. Using a default version."

 

 ; Uninstaller

-LangString UNINSTALL_NO_ADMIN ${LANG_SLOVENIAN} "This installation can only be uninstalled by a user with administrator privileges."

-LangString SMPLAYER_NOT_INSTALLED ${LANG_SLOVENIAN} "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
\ No newline at end of file
+${LangFileString} UNINSTALL_NO_ADMIN "This installation can only be uninstalled by a user with administrator privileges."

+${LangFileString} UNINSTALL_ABORTED "Uninstall aborted by user."

+${LangFileString} SMPLAYER_NOT_INSTALLED "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"

+

+; Vista & Later Default Programs Registration

+${LangFileString} APPLICATION_DESCRIPTION "SMPlayer is a complete front-end for MPlayer, from basic features like playing videos, DVDs, VCDs to more advanced features like support for MPlayer filters, edl lists, and more."
\ No newline at end of file
diff --git a/setup/translations/spanish.nsh b/setup/translations/spanish.nsh
index 8aab118..0177c9f 100644
--- a/setup/translations/spanish.nsh
+++ b/setup/translations/spanish.nsh
@@ -1,38 +1,40 @@
-;;

-;;  spanish.nsh

-;;

-;;  Spanish language strings for the Windows SMPlayer NSIS installer.

-;;  Save file with ANSI encoding

-;;

-;;  Author: 

-;;

+;Language: Spanish (1034)

+;Spanish language strings for the Windows SMPlayer NSIS installer.

+;

+;Save file as UTF-8 w/ BOM

+;

+

+!insertmacro LANGFILE "Spanish" "Español"

 

 ; Startup

-LangString SMPLAYER_INSTALLER_IS_RUNNING ${LANG_SPANISH} "The installer is already running."

-LangString SMPLAYER_INSTALLER_UNSUPPORTED_OS ${LANG_SPANISH} "Unsupported operating system.$\n$(^Name) requires at least Windows 2000 and may not work correctly on your system.$\nDo you really want to continue with the installation?"

-LangString SMPLAYER_INSTALLER_NO_ADMIN ${LANG_SPANISH} "You must be logged in as an administrator when installing this program."

-LangString SMPLAYER_INSTALLER_PREV_VERSION ${LANG_SPANISH} "SMPlayer has already been installed.$\nDo you want to remove the previous version before installing $(^Name)?"

+${LangFileString} SMPLAYER_INSTALLER_IS_RUNNING "La instalación ya se está ejecutando."

+${LangFileString} SMPLAYER_INSTALLER_NO_ADMIN "Debes tener permisos de administrador para instalar este programa."

 

 ; Components Page

-LangString MPLAYER_CODEC_INFORMATION ${LANG_SPANISH} "The binary codec packages add support for codecs that are not yet implemented natively, like newer RealVideo variants and a lot of uncommon formats.$\nNote that they are not necessary to play most common formats like DVDs, MPEG-1/2/4, etc."

+${LangFileString} MPLAYER_CODEC_INFORMATION "El paquete de códecs binarios añade soporte para códecs que todavía no se han implementado nativamente, como como las nuevas variantes de RealVideo y algunos formatos poco comunes.$\nTen en cuenta de que no son necesarios para reproducir los formatos más comunes como DVDs, MPEG-1/2/4, etc."

 

 ; MPlayer Section

-LangString MPLAYER_IS_INSTALLED ${LANG_SPANISH} "MPlayer is already installed. Re-Download?"

-LangString MPLAYER_IS_DOWNLOADING ${LANG_SPANISH} "Downloading MPlayer..."

-LangString MPLAYER_DL_FAILED ${LANG_SPANISH} "Failed to download MPlayer:"

-LangString MPLAYER_INST_FAILED ${LANG_SPANISH} "Failed to install MPlayer. MPlayer is required for playback."

+!ifndef WITH_MPLAYER

+  ${LangFileString} MPLAYER_IS_DOWNLOADING "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."

+!endif

 

 ; Codecs Section

-LangString CODECS_IS_INSTALLED ${LANG_SPANISH} "MPlayer codecs are already installed. Re-Download?"

-LangString CODECS_IS_DOWNLOADING ${LANG_SPANISH} "Downloading MPlayer codecs..."

-LangString CODECS_DL_FAILED ${LANG_SPANISH} "Failed to download MPlayer codecs:"

-LangString CODECS_INST_FAILED ${LANG_SPANISH} "Failed to install MPlayer codecs."

+${LangFileString} CODECS_IS_DOWNLOADING "Descargando los códecs del MPlayer..."

+${LangFileString} CODECS_DL_RETRY "Los códecs del MPlayer no se han instalado correctamente. ¿Reintentar?"

+${LangFileString} CODECS_DL_FAILED "Ha fallado la descarga de los códecs del MPlayer: '$R0'."

+${LangFileString} CODECS_INST_FAILED "Ha fallado la instalación del los códecs del MPlayer."

 

 ; Version information

-LangString VERINFO_IS_DOWNLOADING ${LANG_SPANISH} "Downloading version information..."

-LangString VERINFO_DL_FAILED ${LANG_SPANISH} "Failed to download version info:"

-LangString VERINFO_IS_MISSING ${LANG_SPANISH} "Version file missing version information. Setup will use a default version."

+${LangFileString} VERINFO_IS_DOWNLOADING "Descargando la información de la versión..."

+${LangFileString} VERINFO_DL_FAILED "Ha fallado la descarga de la información de la versión: '$R0'. Se usará la versión por defecto."

 

 ; Uninstaller

-LangString UNINSTALL_NO_ADMIN ${LANG_SPANISH} "This installation can only be uninstalled by a user with administrator privileges."

-LangString SMPLAYER_NOT_INSTALLED ${LANG_SPANISH} "It does not appear that SMPlayer is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?"
\ No newline at end of file
+${LangFileString} UNINSTALL_NO_ADMIN "Este programa sólo se puede desinstalar por un usuario con permisos de administrador."

+${LangFileString} UNINSTALL_ABORTED "Desinstalación cancelada por el usuario."

+${LangFileString} SMPLAYER_NOT_INSTALLED "No parece que el SMPlayer esté instalado en el directorio '$INSTDIR'.$\r$\n¿Continuar de todos modos (no recomendado)?"

+

+; Vista & Later Default Programs Registration

+${LangFileString} APPLICATION_DESCRIPTION "SMPlayer pretende ser un interfaz completo para MPlayer, con opciones para cosas básicas, como reproducir vídeos, DVDs y VCDs hasta opciones más avanzadas como soporte para los filtros del MPlayer y mucho más."