From fad6d944fea697d922089d1df174fe79c9571fe5 Mon Sep 17 00:00:00 2001 From: joostverburg Date: Mon, 13 Jan 2003 21:01:25 +0000 Subject: [PATCH] fixes - polish temporary removed (very outdated) git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2061 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/Modern UI/Language files/Czech.nsh | 2 ++ Contrib/Modern UI/System.nsh | 16 ++++++++-------- Examples/Modern UI/MultiLanguage.nsi | 8 ++------ 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/Contrib/Modern UI/Language files/Czech.nsh b/Contrib/Modern UI/Language files/Czech.nsh index 835703a0..644bddb1 100644 --- a/Contrib/Modern UI/Language files/Czech.nsh +++ b/Contrib/Modern UI/Language files/Czech.nsh @@ -57,6 +57,8 @@ !insertmacro MUI_LANGUAGEFILE_STRING MUI_TEXT_ABORTWARNING "Opravdu chcete ukončit instalaci programu ${MUI_PRODUCT}?" + !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_CONTINUE_UNINSTALL "Klikněte na Odinstalovat pro spuštění odinstalace." + !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_TITLE "Odinstalování programu ${MUI_PRODUCT}" !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNTEXT_INTRO_SUBTITLE "Odstranění programu ${MUI_PRODUCT} z Vašeho systému." !insertmacro MUI_LANGUAGEFILE_STRING MUI_UNINNERTEXT_INTRO "Tímto odinstalujete program ${MUI_PRODUCT} z Vašeho systému." diff --git a/Contrib/Modern UI/System.nsh b/Contrib/Modern UI/System.nsh index 7a71947a..284c82c6 100644 --- a/Contrib/Modern UI/System.nsh +++ b/Contrib/Modern UI/System.nsh @@ -1709,7 +1709,12 @@ !ifndef "${INSTALLBUTTON}" ${COMMAND} "${${NAME}} ${MUI_TEXT_CONTINUE_NEXT}" !else - ${COMMAND} "${${NAME}} ${MUI_UNTEXT_CONTINUE_UNINSTALL}" + !ifdef MUI_UNTEXT_CONTINUE_UNINSTALL + ${COMMAND} "${${NAME}} ${MUI_UNTEXT_CONTINUE_UNINSTALL}" + !else + ;Modern UI 1.61 Language File compatibility + ${COMMAND} "${${NAME}}" + !endif !endif !undef "${NAME}" @@ -1820,13 +1825,8 @@ !insertmacro MUI_LANGUAGEFILE_UNLANGSTRING "MUI_UNTEXT_FINISHED_SUBTITLE" !endif - !ifdef MUI_TEXT_CONTINUE_NEXT - !undef MUI_TEXT_CONTINUE_NEXT - !endif - - !ifdef MUI_TEXT_CONTINUE_INSTALL - !undef MUI_TEXT_CONTINUE_INSTALL - !endif + !undef MUI_TEXT_CONTINUE_NEXT + !undef MUI_TEXT_CONTINUE_INSTALL !ifdef MUI_UNTEXT_CONTINUE_UNINSTALL !undef MUI_UNTEXT_CONTINUE_UNINSTALL diff --git a/Examples/Modern UI/MultiLanguage.nsi b/Examples/Modern UI/MultiLanguage.nsi index 93246306..6db34f40 100644 --- a/Examples/Modern UI/MultiLanguage.nsi +++ b/Examples/Modern UI/MultiLanguage.nsi @@ -44,7 +44,6 @@ !insertmacro MUI_LANGUAGE "Italian" !insertmacro MUI_LANGUAGE "Dutch" !insertmacro MUI_LANGUAGE "Danish" - !insertmacro MUI_LANGUAGE "Polish" !insertmacro MUI_LANGUAGE "Greek" !insertmacro MUI_LANGUAGE "Russian" !insertmacro MUI_LANGUAGE "PortugueseBR" @@ -69,9 +68,8 @@ LangString DESC_SecCopyUI ${LANG_ITALIAN} "modern.exe: Italian description" LangString DESC_SecCopyUI ${LANG_DUTCH} "modern.exe: Dutch description" LangString DESC_SecCopyUI ${LANG_DANISH} "modern.exe: Danish description" - LangString DESC_SecCopyUI ${LANG_POLISH} "modern.exe: Polish description" LangString DESC_SecCopyUI ${LANG_GREEK} "modern.exe: Greek description" - LangString DESC_SecCopyUI ${LANG_RUSSIAN} "modern.exe: Greek description" + LangString DESC_SecCopyUI ${LANG_RUSSIAN} "modern.exe: Russian description" 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" @@ -93,7 +91,6 @@ LicenseData /LANG=${LANG_ITALIAN} "${NSISDIR}\Contrib\Modern UI\License.txt" LicenseData /LANG=${LANG_DUTCH} "${NSISDIR}\Contrib\Modern UI\License.txt" LicenseData /LANG=${LANG_DANISH} "${NSISDIR}\Contrib\Modern UI\License.txt" - LicenseData /LANG=${LANG_POLISH} "${NSISDIR}\Contrib\Modern UI\License.txt" LicenseData /LANG=${LANG_GREEK} "${NSISDIR}\Contrib\Modern UI\License.txt" LicenseData /LANG=${LANG_RUSSIAN} "${NSISDIR}\Contrib\Modern UI\License.txt" LicenseData /LANG=${LANG_PORTUGUESEBR} "${NSISDIR}\Contrib\Modern UI\License.txt" @@ -154,7 +151,6 @@ Function .onInit !insertmacro MUI_LANGDLL_PUSH "Italian" !insertmacro MUI_LANGDLL_PUSH "Dutch" !insertmacro MUI_LANGDLL_PUSH "Danish" - !insertmacro MUI_LANGDLL_PUSH "Polish" !insertmacro MUI_LANGDLL_PUSH "Greek" !insertmacro MUI_LANGDLL_PUSH "Russian" !insertmacro MUI_LANGDLL_PUSH "PortugueseBR" @@ -165,7 +161,7 @@ Function .onInit !insertmacro MUI_LANGDLL_PUSH "Romanian" !insertmacro MUI_LANGDLL_PUSH "Macedonian" - Push 20F ;20 = number of languages, F = change font + Push 19F ;19 = number of languages, F = change font LangDLL::LangDialog "Installer Language" "Please select a language."