removed 1.4 language file compatibility
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2049 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
bc8c080335
commit
f9de5367ee
1 changed files with 11 additions and 46 deletions
|
@ -1662,21 +1662,9 @@
|
|||
!macro MUI_LANGUAGEFILE_LANGSTRING_CONTINUE NAME INSTALLBUTTON
|
||||
|
||||
!ifndef "${INSTALLBUTTON}"
|
||||
|
||||
!ifdef MUI_TEXT_CONTINUE_NEXT
|
||||
LangString "${NAME}" 0 "${${NAME}}${MUI_TEXT_CONTINUE_NEXT}"
|
||||
!else
|
||||
LangString "${NAME}" 0 "${${NAME}}"
|
||||
!endif
|
||||
|
||||
LangString "${NAME}" 0 "${${NAME}}${MUI_TEXT_CONTINUE_NEXT}"
|
||||
!else
|
||||
|
||||
!ifdef MUI_TEXT_CONTINUE_INSTALL
|
||||
LangString "${NAME}" 0 "${${NAME}}${MUI_TEXT_CONTINUE_INSTALL}"
|
||||
!else
|
||||
LangString "${NAME}" 0 "${${NAME}}"
|
||||
!endif
|
||||
|
||||
LangString "${NAME}" 0 "${${NAME}}${MUI_TEXT_CONTINUE_INSTALL}"
|
||||
!endif
|
||||
|
||||
!undef "${NAME}"
|
||||
|
@ -1707,21 +1695,9 @@
|
|||
!macro MUI_LANGUAGEFILE_NSISCOMMAND_CONTINUE COMMAND NAME INSTALLBUTTON
|
||||
|
||||
!ifndef "${INSTALLBUTTON}"
|
||||
|
||||
!ifdef MUI_TEXT_CONTINUE_NEXT
|
||||
${COMMAND} "${${NAME}} ${MUI_TEXT_CONTINUE_NEXT}"
|
||||
!else
|
||||
${COMMAND} "${${NAME}}"
|
||||
!endif
|
||||
|
||||
${COMMAND} "${${NAME}} ${MUI_TEXT_CONTINUE_NEXT}"
|
||||
!else
|
||||
|
||||
!ifdef MUI_TEXT_CONTINUE_INSTALL
|
||||
${COMMAND} "${${NAME}} ${MUI_TEXT_CONTINUE_INSTALL}"
|
||||
!else
|
||||
${COMMAND} "${${NAME}}"
|
||||
!endif
|
||||
|
||||
${COMMAND} "${${NAME}} ${MUI_TEXT_CONTINUE_INSTALL}"
|
||||
!endif
|
||||
|
||||
!undef "${NAME}"
|
||||
|
@ -1731,28 +1707,15 @@
|
|||
!macro MUI_LANGUAGEFILE_UNNSISCOMMAND_CONTINUE COMMAND NAME INSTALLBUTTON
|
||||
|
||||
!ifndef "${INSTALLBUTTON}"
|
||||
|
||||
!ifdef MUI_TEXT_CONTINUE_NEXT
|
||||
${COMMAND} "${${NAME}} ${MUI_TEXT_CONTINUE_NEXT}"
|
||||
!else
|
||||
${COMMAND} "${${NAME}}"
|
||||
!endif
|
||||
|
||||
${COMMAND} "${${NAME}} ${MUI_TEXT_CONTINUE_NEXT}"
|
||||
!else
|
||||
|
||||
!ifdef MUI_UNTEXT_CONTINUE_UNINSTALL
|
||||
${COMMAND} "${${NAME}} ${MUI_UNTEXT_CONTINUE_UNINSTALL}"
|
||||
!else
|
||||
${COMMAND} "${${NAME}}"
|
||||
!endif
|
||||
|
||||
${COMMAND} "${${NAME}} ${MUI_UNTEXT_CONTINUE_UNINSTALL}"
|
||||
!endif
|
||||
|
||||
!undef "${NAME}"
|
||||
|
||||
!macroend
|
||||
|
||||
|
||||
!macro MUI_LANGUAGEFILE_DEFINE DEFINE NAME
|
||||
|
||||
!ifndef "${DEFINE}"
|
||||
|
@ -1814,6 +1777,7 @@
|
|||
!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_SUBTITLE"
|
||||
|
@ -1821,11 +1785,12 @@
|
|||
!ifdef MUI_FINISHPAGE
|
||||
!insertmacro MUI_LANGUAGEFILE_NSISCOMMAND_MULTIPARAMETER "MiscButtonText" "MUI_TEXT_FINISH_BUTTON" '"" "" "" "${MUI_TEXT_FINISH_BUTTON}"'
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_WINDOWTITLE"
|
||||
!ifndef MUI_TEXT_FINISH_INFO_TITLE
|
||||
!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
|
||||
!else
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_INFO_TITLE"
|
||||
!endif
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_INFO_TEXT"
|
||||
!insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_INFO_REBOOT"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue