The branch, twofactorauth has been updated via 113a759d6a62ce7da966cb23eba9203dfd7341a9 (commit) from f135580befdc5dd364bca91c8a64e3d29dff4c88 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: nsis_template.py | 69 ++++++++++++++++++------------------------------------ 1 file changed, 23 insertions(+), 46 deletions(-) The diff of changes is: diff --git a/nsis_template.py b/nsis_template.py index 8aca767..e9db9eb 100644 --- a/nsis_template.py +++ b/nsis_template.py @@ -53,6 +53,12 @@ InstallDirRegKey HKLM "Software\\{program_name}" "Install_Dir" !include MultiUser.nsh !include MUI2.nsh +!insertmacro MULTIUSER_PAGE_INSTALLMODE +!insertmacro MUI_PAGE_LICENSE LICENSE.txt +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_COMPONENTS +!insertmacro MUI_PAGE_INSTFILES + !insertmacro MUI_LANGUAGE "English" ;first language is the default language ;!insertmacro MUI_LANGUAGE "French" !insertmacro MUI_LANGUAGE "German" @@ -111,35 +117,6 @@ InstallDirRegKey HKLM "Software\\{program_name}" "Install_Dir" ;!insertmacro MUI_LANGUAGE "Esperanto" ;!insertmacro MUI_LANGUAGE "Asturian" - -;-------------------------------- - -; Installer Language Configuration - -!include LogicLib.nsh - -var LC_MESSAGES - -; i18n strings -var REQUIRED -var DESKTOP_LINKS -var STARTMENU_LINKS -var WITHOUT_PULSEAUDIO -var GSPRINT - -; First is default -;;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\English.nlf" -;;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\Dutch.nlf" -;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\French.nlf" -;;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\German.nlf" -;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\Korean.nlf" -;;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\Russian.nlf" -;;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\Spanish.nlf" -;;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\Swedish.nlf" -;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\TradChinese.nlf" -;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\SimpChinese.nlf" -;LoadLanguageFile "${{NSISDIR}}\\Contrib\\Language files\\Slovak.nlf" - ; License data ; Not exactly translated, but it shows what's needed LicenseLangString myLicenseData ${{LANG_ENGLISH}} "LICENSE.txt" @@ -169,10 +146,25 @@ LangString Name ${{LANG_SWEDISH}} "Swedish" ;LangString Name ${{LANG_SIMPCHINESE}} "Simplified Chinese" ;LangString Name ${{LANG_SLOVAK}} "Slovak" -Function .onInit +;-------------------------------- - ;Language selection dialog +; Installer Language Configuration + +;!include LogicLib.nsh + +var LC_MESSAGES + +; i18n strings +var REQUIRED +var DESKTOP_LINKS +var STARTMENU_LINKS +var WITHOUT_PULSEAUDIO +var GSPRINT +Function .onInit + +; ;Language selection dialog +; Push "" Push ${{LANG_ENGLISH}} Push English @@ -234,7 +226,6 @@ Function .onInit !insertmacro MULTIUSER_INIT - FunctionEnd Function un.onInit @@ -245,20 +236,6 @@ FunctionEnd ;-------------------------------- -; Pages -;Page license -;Page components -;Page directory -;Page instfiles - -!insertmacro MULTIUSER_PAGE_INSTALLMODE -!insertmacro MUI_PAGE_LICENSE LICENSE.txt -!insertmacro MUI_PAGE_DIRECTORY -!insertmacro MUI_PAGE_INSTFILES - -;UninstPage uninstConfirm -;UninstPage instfiles - ;-------------------------------- ; The stuff to install hooks/post-receive -- pyhoca-gui.git (Python X2Go Client (wxPython GUI)) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "pyhoca-gui.git" (Python X2Go Client (wxPython GUI)).