From 5038e3119addf3fb0bc4b452b68a53ca7bd86c3d Mon Sep 17 00:00:00 2001 From: joostverburg Date: Tue, 18 Mar 2003 09:55:37 +0000 Subject: [PATCH] removed 1.61 language file compatibility git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2326 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI/System.nsh | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh index d81c4a37..9f771580 100644 --- a/Contrib/Modern UI/System.nsh +++ b/Contrib/Modern UI/System.nsh @@ -1818,12 +1818,7 @@ !ifndef "${INSTALLBUTTON}" ${COMMAND} "${${NAME}} ${MUI_TEXT_CONTINUE_NEXT}" !else - !ifdef MUI_UNTEXT_CONTINUE_UNINSTALL - ${COMMAND} "${${NAME}} ${MUI_UNTEXT_CONTINUE_UNINSTALL}" - !else - ;Modern UI 1.61 Language File compatibility - ${COMMAND} "${${NAME}}" - !endif + ${COMMAND} "${${NAME}} ${MUI_UNTEXT_CONTINUE_UNINSTALL}" !endif !undef "${NAME}" @@ -1908,23 +1903,12 @@ !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_INSTALLING_TITLE" !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_INSTALLING_SUBTITLE" - !ifdef MUI_TEXT_FINISH_INFO_TITLE - !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_TITLE" - !else - ;Modern UI 1.61 Language File compatibility - LangString "MUI_TEXT_FINISH_TITLE" 0 "${MUI_TEXT_FINISH_TITLE}" - !endif + !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_TITLE" !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_SUBTITLE" !ifdef MUI_FINISHPAGE !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND_MULTIPARAMETER "MiscButtonText" "MUI_TEXT_FINISH_BUTTON" '"" "" "" "${MUI_TEXT_FINISH_BUTTON}"' - !ifdef MUI_TEXT_FINISH_INFO_TITLE - !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_INFO_TITLE" - !else - ;Modern UI 1.61 Language File compatibility - LangString "MUI_TEXT_FINISH_INFO_TITLE" 0 "${MUI_TEXT_FINISH_TITLE}" - !undef MUI_TEXT_FINISH_TITLE - !endif + !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_INFO_TITLE" !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_INFO_TEXT" !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_INFO_REBOOT" !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_REBOOTNOW"