diff --git a/Contrib/Modern UI/License.txt b/Contrib/Modern UI/License.txt index dc675404..dd099ccd 100644 --- a/Contrib/Modern UI/License.txt +++ b/Contrib/Modern UI/License.txt @@ -1,17 +1,10 @@ Copyright © 2002 Joost Verburg -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. +This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software. -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute -it freely, subject to the following restrictions: +Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions: -1. The origin of this software must not be misrepresented; - you must not claim that you wrote the original software. - If you use this software in a product, an acknowledgment in the - product documentation would be appreciated but is not required. -2. Altered versions must be plainly marked as such, - and must not be misrepresented as being the original software. +1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. + If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required. +2. Altered versions must be plainly marked as such, and must not be misrepresented as being the original software. 3. This notice may not be removed or altered from any distribution. \ No newline at end of file diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh index 90da228a..780e6610 100644 --- a/Contrib/Modern UI/System.nsh +++ b/Contrib/Modern UI/System.nsh @@ -359,6 +359,17 @@ !macroend +!macro MUI_LANGDLL_PUSH LANGUAGE + + !verbose 3 + + Push "${LANG_${LANGUAGE}}" + Push "${MUI_${LANGUAGE}_LANGNAME}" + + !verbose 4 + +!macroend + !macro MUI_STARTMENU_WRITE_BEGIN !verbose 3 @@ -1369,8 +1380,6 @@ !macro MUI_LANGUAGEFILE_BEGIN LANGUAGE - !define MUI_LANGUAGEFILE_CURRENT "${LANGUAGE}" - !ifndef "MUI_LANGUAGEFILE_${LANGUAGE}_USED" !define "MUI_LANGUAGEFILE_${LANGUAGE}_USED" @@ -1385,35 +1394,29 @@ !macroend -!macro MUI_LANGUAGEFILE_STRING STRING VALUE +!macro MUI_LANGUAGEFILE_STRING NAME VALUE - !ifndef "${STRING}" - !define "${STRING}" "${VALUE}" + !ifndef "${NAME}" + !define "${NAME}" "${VALUE}" !endif !macroend -!macro MUI_LANGUAGEFILE_LANGSTRING NAME VALUE +!macro MUI_LANGUAGEFILE_LANGSTRING NAME - LangString "${NAME}" "${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}" + LangString "${NAME}" 0 "${${NAME}}" !undef "${NAME}" !macroend -!macro MUI_LANGUAGEFILE_LANGSTRING_NOUNDEF NAME VALUE - - LangString "${NAME}" "${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}" - -!macroend - -!macro MUI_LANGUAGEFILE_LANGSTRING_CONTINUE NAME VALUE INSTALLBUTTON +!macro MUI_LANGUAGEFILE_LANGSTRING_CONTINUE NAME INSTALLBUTTON !ifndef "${INSTALLBUTTON}" !ifdef MUI_TEXT_CONTINUE_NEXT - LangString "${NAME}" "${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}${MUI_TEXT_CONTINUE_NEXT}" + LangString "${NAME}" 0 "${${NAME}}${MUI_TEXT_CONTINUE_NEXT}" !else - LangString "${NAME}" "${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}" + LangString "${NAME}" 0 "${${NAME}}" !endif !endif @@ -1421,9 +1424,9 @@ !ifndef "${INSTALLBUTTON}" !ifdef MUI_TEXT_CONTINUE_INSTALL - LangString "${NAME}" "${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}${MUI_TEXT_CONTINUE_INSTALL}" + LangString "${NAME}" 0 "${${NAME}}${MUI_TEXT_CONTINUE_INSTALL}" !else - LangString "${NAME}" "${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}" + LangString "${NAME}" 0 "${${NAME}}" !endif !endif @@ -1432,35 +1435,35 @@ !macroend -!macro MUI_LANGUAGEFILE_UNLANGSTRING NAME VALUE +!macro MUI_LANGUAGEFILE_UNLANGSTRING NAME - LangString "un.${NAME}" "${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}" + LangString "un.${NAME}" 0 "${${NAME}}" !undef "${NAME}" !macroend -!macro MUI_LANGUAGEFILE_NSISCOMMAND COMMAND NAME VALUE +!macro MUI_LANGUAGEFILE_NSISCOMMAND COMMAND NAME - "${COMMAND}" "/LANG=${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}" + "${COMMAND}" "${${NAME}}" !undef "${NAME}" !macroend -!macro MUI_LANGUAGEFILE_NSISCOMMAND_MULTIPARAMETER COMMAND NAME VALUE +!macro MUI_LANGUAGEFILE_NSISCOMMAND_MULTIPARAMETER COMMAND NAME - "${COMMAND}" "/LANG=${LANG_${MUI_LANGUAGEFILE_CURRENT}}" ${VALUE} + "${COMMAND}" "${${NAME}}" !undef "${NAME}" !macroend -!macro MUI_LANGUAGEFILE_NSISCOMMAND_CONTINUE COMMAND NAME VALUE INSTALLBUTTON +!macro MUI_LANGUAGEFILE_NSISCOMMAND_CONTINUE COMMAND NAME INSTALLBUTTON !ifndef "${INSTALLBUTTON}" !ifdef MUI_TEXT_CONTINUE_NEXT - "${COMMAND}" "/LANG=${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE} ${MUI_TEXT_CONTINUE_NEXT}" + "${COMMAND}" "${${NAME}} ${MUI_TEXT_CONTINUE_NEXT}" !else - "${COMMAND}" "/LANG=${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}" + "${COMMAND}" "${${NAME}}" !endif !endif @@ -1468,9 +1471,9 @@ !ifdef "${INSTALLBUTTON}" !ifdef MUI_TEXT_CONTINUE_INSTALL - "${COMMAND}" "/LANG=${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE} ${MUI_TEXT_CONTINUE_INSTALL}" + "${COMMAND}" "${${NAME}} ${MUI_TEXT_CONTINUE_INSTALL}" !else - "${COMMAND}" "/LANG=${LANG_${MUI_LANGUAGEFILE_CURRENT}}" "${VALUE}" + "${COMMAND}" "${${NAME}}" !endif !endif @@ -1479,10 +1482,10 @@ !macroend -!macro MUI_LANGUAGEFILE_DEFINE DEFINE NAME VALUE +!macro MUI_LANGUAGEFILE_DEFINE DEFINE NAME !ifndef "${DEFINE}" - !define "${DEFINE}" "${VALUE}" + !define "${DEFINE}" "${${NAME}}" !endif !undef "${NAME}" @@ -1490,88 +1493,88 @@ !macro MUI_LANGUAGEFILE_END - !insertmacro MUI_LANGUAGEFILE_DEFINE "MUI_${LANGUAGE}_LANGNAME" "MUI_LANGNAME" "${MUI_LANGNAME}" + !insertmacro MUI_LANGUAGEFILE_DEFINE "MUI_${LANGUAGE}_LANGNAME" "MUI_LANGNAME" - !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND Name MUI_NAME "${MUI_NAME}" + !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND Name MUI_NAME !ifdef MUI_WELCOMEPAGE - !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_WELCOME_INFO_TITLE" "${MUI_TEXT_WELCOME_INFO_TITLE}" - !insertmacro MUI_LANGUAGEFILE_LANGSTRING_CONTINUE "MUI_TEXT_WELCOME_INFO_TEXT" "${MUI_TEXT_WELCOME_INFO_TEXT}" "MUI_INSTALLBUTTON_WELCOME" + !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_WELCOME_INFO_TITLE" + !insertmacro MUI_LANGUAGEFILE_LANGSTRING_CONTINUE "MUI_TEXT_WELCOME_INFO_TEXT" "MUI_INSTALLBUTTON_WELCOME" !endif !ifdef MUI_LICENSEPAGE - !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_LICENSE_TITLE" "${MUI_TEXT_LICENSE_TITLE}" - !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_LICENSE_SUBTITLE" "${MUI_TEXT_LICENSE_SUBTITLE}" - !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND "LicenseText" "MUI_INNERTEXT_LICENSE_TOP" "${MUI_INNERTEXT_LICENSE_TOP}" - !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_LICENSE_BOTTOM" "${MUI_INNERTEXT_LICENSE_BOTTOM}" + !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_LICENSE_TITLE" + !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_LICENSE_SUBTITLE" + !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND "LicenseText" "MUI_INNERTEXT_LICENSE_TOP" + !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_LICENSE_BOTTOM" !endif !ifdef MUI_COMPONENTSPAGE - !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_COMPONENTS_TITLE" "${MUI_TEXT_COMPONENTS_TITLE}" - !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_COMPONENTS_SUBTITLE" "${MUI_TEXT_COMPONENTS_SUBTITLE}" - !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND_CONTINUE "ComponentText" "MUI_INNERTEXT_COMPONENTS_TOP" "${MUI_INNERTEXT_COMPONENTS_TOP} " "MUI_INSTALLBUTTON_COMPONENTS" - !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE" "${MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE}" - !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO" "${MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO}" + !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_COMPONENTS_TITLE" + !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_COMPONENTS_SUBTITLE" + !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND_CONTINUE "ComponentText" "MUI_INNERTEXT_COMPONENTS_TOP" "MUI_INSTALLBUTTON_COMPONENTS" + !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_COMPONENTS_DESCRIPTION_TITLE" + !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_COMPONENTS_DESCRIPTION_INFO" !endif !ifdef MUI_DIRECTORYPAGE - !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_DIRECTORY_TITLE" "${MUI_TEXT_DIRECTORY_TITLE}" - !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_DIRECTORY_SUBTITLE" "${MUI_TEXT_DIRECTORY_SUBTITLE}" - !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND_CONTINUE "DirText" "MUI_INNERTEXT_DIRECTORY_TOP" "${MUI_INNERTEXT_DIRECTORY_TOP} " "MUI_INSTALLBUTTON_DIRECTORY" - !insertmacro MUI_LANGUAGEFILE_LANGSTRING MUI_INNERTEXT_DIRECTORY_DESTINATION "${MUI_INNERTEXT_DIRECTORY_DESTINATION}" + !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_DIRECTORY_TITLE" + !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_DIRECTORY_SUBTITLE" + !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND_CONTINUE "DirText" "MUI_INNERTEXT_DIRECTORY_TOP" "MUI_INSTALLBUTTON_DIRECTORY" + !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_DIRECTORY_DESTINATION" !endif !ifdef MUI_STARTMENUPAGE - !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_STARTMENU_WINDOWTITLE" "${MUI_TEXT_STARTMENU_WINDOWTITLE}" - !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_STARTMENU_TITLE" "${MUI_TEXT_STARTMENU_TITLE}" - !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_STARTMENU_SUBTITLE" "${MUI_TEXT_STARTMENU_SUBTITLE}" - !insertmacro MUI_LANGUAGEFILE_LANGSTRING_CONTINUE "MUI_INNERTEXT_STARTMENU_TOP" "${MUI_INNERTEXT_STARTMENU_TOP} " "MUI_INSTALLBUTTON_STARTMENU" - !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_STARTMENU_CHECKBOX" "${MUI_INNERTEXT_STARTMENU_CHECKBOX}" + !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_STARTMENU_WINDOWTITLE" + !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_STARTMENU_TITLE" + !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_STARTMENU_SUBTITLE" + !insertmacro MUI_LANGUAGEFILE_LANGSTRING_CONTINUE "MUI_INNERTEXT_STARTMENU_TOP" "MUI_INSTALLBUTTON_STARTMENU" + !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_INNERTEXT_STARTMENU_CHECKBOX" !endif - !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_INSTALLING_TITLE" "${MUI_TEXT_INSTALLING_TITLE}" - !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_INSTALLING_SUBTITLE" "${MUI_TEXT_INSTALLING_SUBTITLE}" + !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" "${MUI_TEXT_FINISH_TITLE}" + !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_TITLE" !else - !insertmacro MUI_LANGUAGEFILE_LANGSTRING_NOUNDEF "MUI_TEXT_FINISH_TITLE" "${MUI_TEXT_FINISH_TITLE}" + LangString "MUI_TEXT_FINISH_TITLE" 0 "${MUI_TEXT_FINISH_TITLE}" !endif - !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_SUBTITLE" "${MUI_TEXT_FINISH_SUBTITLE}" + !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_SUBTITLE" !ifdef MUI_FINISHPAGE - !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_WINDOWTITLE" "${MUI_TEXT_FINISH_WINDOWTITLE}" - !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND_MULTIPARAMETER "MiscButtonText" "MUI_TEXT_FINISH_BUTTON" '"" "" "" "${MUI_TEXT_FINISH_BUTTON}"' + !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_FINISH_WINDOWTITLE" + !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND_MULTIPARAMETER "MiscButtonText" "MUI_TEXT_FINISH_BUTTON" '"" "" ""' !ifndef MUI_TEXT_FINISH_INFO_TITLE - !insertmacro MUI_LANGUAGEFILE_LANGSTRING_NOUNDEF MUI_TEXT_FINISH_INFO_TITLE "${MUI_TEXT_FINISH_TITLE}" + 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 "${MUI_TEXT_FINISH_INFO_TITLE}" + !insertmacro MUI_LANGUAGEFILE_LANGSTRING MUI_TEXT_FINISH_INFO_TITLE !endif - !insertmacro MUI_LANGUAGEFILE_LANGSTRING MUI_TEXT_FINISH_INFO_TEXT "${MUI_TEXT_FINISH_INFO_TEXT}" - !insertmacro MUI_LANGUAGEFILE_LANGSTRING MUI_TEXT_FINISH_INFO_REBOOT "${MUI_TEXT_FINISH_INFO_REBOOT}" - !insertmacro MUI_LANGUAGEFILE_LANGSTRING MUI_TEXT_FINISH_REBOOTNOW "${MUI_TEXT_FINISH_REBOOTNOW}" - !insertmacro MUI_LANGUAGEFILE_LANGSTRING MUI_TEXT_FINISH_REBOOTLATER "${MUI_TEXT_FINISH_REBOOTLATER}" - !insertmacro MUI_LANGUAGEFILE_LANGSTRING MUI_TEXT_FINISH_RUN "${MUI_TEXT_FINISH_RUN}" - !insertmacro MUI_LANGUAGEFILE_LANGSTRING MUI_TEXT_FINISH_SHOWREADME "${MUI_TEXT_FINISH_SHOWREADME}" + !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 + !insertmacro MUI_LANGUAGEFILE_LANGSTRING MUI_TEXT_FINISH_REBOOTLATER + !insertmacro MUI_LANGUAGEFILE_LANGSTRING MUI_TEXT_FINISH_RUN + !insertmacro MUI_LANGUAGEFILE_LANGSTRING MUI_TEXT_FINISH_SHOWREADME !endif !ifdef MUI_ABORTWARNING - !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_ABORTWARNING" "${MUI_TEXT_ABORTWARNING}" + !insertmacro MUI_LANGUAGEFILE_LANGSTRING "MUI_TEXT_ABORTWARNING" !endif !ifdef MUI_UNINSTALLER - !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_INTRO_TITLE" "${MUI_UNTEXT_INTRO_TITLE}" - !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_INTRO_SUBTITLE" "${MUI_UNTEXT_INTRO_SUBTITLE}" + !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_INTRO_TITLE" + !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_INTRO_SUBTITLE" - !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND "UninstallText" "MUI_UNINNERTEXT_INTRO" "${MUI_UNINNERTEXT_INTRO}" + !insertmacro MUI_LANGUAGEFILE_NSISCOMMAND "UninstallText" "MUI_UNINNERTEXT_INTRO" - !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_UNINSTALLING_TITLE" "${MUI_UNTEXT_UNINSTALLING_TITLE}" - !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_UNINSTALLING_SUBTITLE" "${MUI_UNTEXT_UNINSTALLING_SUBTITLE}" + !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_UNINSTALLING_TITLE" + !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_UNINSTALLING_SUBTITLE" - !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_FINISHED_TITLE" "${MUI_UNTEXT_FINISHED_TITLE}" - !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_FINISHED_SUBTITLE" "${MUI_UNTEXT_FINISHED_SUBTITLE}" + !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_FINISHED_TITLE" + !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_FINISHED_SUBTITLE" !endif !ifdef MUI_TEXT_CONTINUE_NEXT @@ -1582,8 +1585,6 @@ !undef MUI_TEXT_CONTINUE_INSTALL !endif - !undef MUI_LANGUAGEFILE_CURRENT - !macroend ;-------------------------------- diff --git a/Examples/Modern UI/MultiLanguage.nsi b/Examples/Modern UI/MultiLanguage.nsi index 44dcf91d..1c2796fc 100644 --- a/Examples/Modern UI/MultiLanguage.nsi +++ b/Examples/Modern UI/MultiLanguage.nsi @@ -32,6 +32,7 @@ !insertmacro MUI_LANGUAGE "PortugueseBR" !insertmacro MUI_LANGUAGE "Ukrainian" !insertmacro MUI_LANGUAGE "Czech" + !insertmacro MUI_LANGUAGE "Bulgarian" OutFile "MultiLanguage.exe" @@ -51,6 +52,7 @@ LicenseData /LANG=${LANG_PORTUGUESEBR} "${NSISDIR}\Contrib\Modern UI\License.txt" LicenseData /LANG=${LANG_UKRAINIAN} "${NSISDIR}\Contrib\Modern UI\License.txt" LicenseData /LANG=${LANG_CZECH} "${NSISDIR}\Contrib\Modern UI\License.txt" + LicenseData /LANG=${LANG_BULGARIAN} "${NSISDIR}\Contrib\Modern UI\License.txt" ;Component-selection page ;Titles @@ -69,6 +71,7 @@ LangString TITLE_SecCopyUI ${LANG_PORTUGUESEBR} "modern.exe" LangString TITLE_SecCopyUI ${LANG_UKRAINIAN} "modern.exe" LangString TITLE_SecCopyUI ${LANG_CZECH} "modern.exe" + LangString TITLE_SecCopyUI ${LANG_BULGARIAN} "modern.exe" ;Descriptions LangString DESC_SecCopyUI ${LANG_ENGLISH} "modern.exe: English description" @@ -86,6 +89,7 @@ LangString DESC_SecCopyUI ${LANG_PORTUGUESEBR} "modern.exe: Portuguese (Brasil) description" LangString DESC_SecCopyUI ${LANG_UKRAINIAN} "modern.exe: Ukrainian description" LangString DESC_SecCopyUI ${LANG_CZECH} "modern.exe: Czechian description" + LangString DESC_SecCopyUI ${LANG_BULGARIAN} "modern.exe: Bulgarian description" ;Folder-selection page InstallDir "$PROGRAMFILES\${MUI_PRODUCT}" @@ -121,41 +125,29 @@ Function .onInit ;Language selection + ;Font Push Tahoma Push 8 - Push ${LANG_ENGLISH} - Push "${MUI_ENGLISH_LANGNAME}" - Push ${LANG_FRENCH} - Push "${MUI_FRENCH_LANGNAME}" - Push ${LANG_GERMAN} - Push "${MUI_GERMAN_LANGNAME}" - Push ${LANG_SPANISH} - Push "${MUI_SPANISH_LANGNAME}" - Push ${LANG_TRADCHINESE} - Push "${MUI_TRADCHINESE_LANGNAME}" - Push ${LANG_SIMPCHINESE} - Push "${MUI_SIMPCHINESE_LANGNAME}" - Push ${LANG_JAPANESE} - Push "${MUI_JAPANESE_LANGNAME}" - Push ${LANG_ITALIAN} - Push "${MUI_ITALIAN_LANGNAME}" - Push ${LANG_DUTCH} - Push "${MUI_DUTCH_LANGNAME}" - Push ${LANG_POLISH} - Push "${MUI_POLISH_LANGNAME}" - Push ${LANG_GREEK} - Push "${MUI_GREEK_LANGNAME}" - Push ${LANG_RUSSIAN} - Push "${MUI_RUSSIAN_LANGNAME}" - Push ${LANG_PORTUGUESEBR} - Push "${MUI_PORTUGUESEBR_LANGNAME}" - Push ${LANG_UKRAINIAN} - Push "${MUI_UKRAINIAN_LANGNAME}" - Push ${LANG_CZECH} - Push "${MUI_CZECH_LANGNAME}" + ;Languages + !insertmacro MUI_LANGDLL_PUSH "English" + !insertmacro MUI_LANGDLL_PUSH "French" + !insertmacro MUI_LANGDLL_PUSH "German" + !insertmacro MUI_LANGDLL_PUSH "Spanish" + !insertmacro MUI_LANGDLL_PUSH "SimpChinese" + !insertmacro MUI_LANGDLL_PUSH "TradChinese" + !insertmacro MUI_LANGDLL_PUSH "Japanese" + !insertmacro MUI_LANGDLL_PUSH "Italian" + !insertmacro MUI_LANGDLL_PUSH "Dutch" + !insertmacro MUI_LANGDLL_PUSH "Polish" + !insertmacro MUI_LANGDLL_PUSH "Greek" + !insertmacro MUI_LANGDLL_PUSH "Russian" + !insertmacro MUI_LANGDLL_PUSH "PortugueseBR" + !insertmacro MUI_LANGDLL_PUSH "Ukrainian" + !insertmacro MUI_LANGDLL_PUSH "Czech" + !insertmacro MUI_LANGDLL_PUSH "Bulgarian" - Push 15F ;15 = number of languages, F = change font + Push 16F ;16 = number of languages, F = change font LangDLL::LangDialog "Installer Language" "Please select a language." @@ -195,5 +187,8 @@ SectionEnd ;Uninstaller Functions Function un.onInit + + ;Get language from registry ReadRegStr $LANGUAGE HKCU "Software\${MUI_PRODUCT}" "Installer Language" + FunctionEnd \ No newline at end of file