dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

* Georgian and Pashto are now part of default install.

Browse source 
* LANGFILE macro now takes 4 parameters, all .nsh files have been updated
* LANGFILE_INCLUDE_WITHDEFAULT will now warn if the fallback string is used
* Removed some invalid English strings in various files
* Fixed Khmer LangId
* Minor Norwegian language fixes
* Some files changed from UTF16LE to UTF8SIG


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6302 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2013-03-16 00:28:45 +00:00
parent 2fc40abca0
commit 043b4006ed
86 changed files with 185 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Contrib/Modern UI/System.nsh
View file

@ -2067,7 +2067,7 @@ Var MUI_TEMP2
;--------------------------------
;LANGUAGES
!macro MUI_LANGUAGE LANGUAGE
!macro MUI_LANGUAGE NLFID
;Include a language
@ -2076,31 +2076,19 @@ Var MUI_TEMP2
!insertmacro MUI_INSERT
LoadLanguageFile "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nlf"
LoadLanguageFile "${NSISDIR}\Contrib\Language files\${NLFID}.nlf"
;Include language file
!insertmacro LANGFILE_INCLUDE_WITHDEFAULT "${NSISDIR}\Contrib\Language files\${LANGUAGE}.nsh" "${NSISDIR}\Contrib\Language files\English.nsh"
!insertmacro LANGFILE_INCLUDE_WITHDEFAULT \
"${NSISDIR}\Contrib\Language files\${NLFID}.nsh" "${NSISDIR}\Contrib\Language files\English.nsh"
;Add language to list of languages for selection dialog
!ifndef MUI_LANGDLL_LANGUAGES
!define MUI_LANGDLL_LANGUAGES "'${LANGFILE_${LANGUAGE}_NAME}' '${LANG_${LANGUAGE}}' "
!define MUI_LANGDLL_LANGUAGES_CP "'${LANGFILE_${LANGUAGE}_NAME}' '${LANG_${LANGUAGE}}' '${LANG_${LANGUAGE}_CP}' "
!else
!ifdef MUI_LANGDLL_LANGUAGES_TEMP
!undef MUI_LANGDLL_LANGUAGES_TEMP
!endif
!define MUI_LANGDLL_LANGUAGES_TEMP "${MUI_LANGDLL_LANGUAGES}"
!undef MUI_LANGDLL_LANGUAGES
!ifdef MUI_LANGDLL_LANGUAGES_CP_TEMP
!undef MUI_LANGDLL_LANGUAGES_CP_TEMP
!endif
!define MUI_LANGDLL_LANGUAGES_CP_TEMP "${MUI_LANGDLL_LANGUAGES_CP}"
!undef MUI_LANGDLL_LANGUAGES_CP
!define MUI_LANGDLL_LANGUAGES "'${LANGFILE_${LANGUAGE}_NAME}' '${LANG_${LANGUAGE}}' ${MUI_LANGDLL_LANGUAGES_TEMP}"
!define MUI_LANGDLL_LANGUAGES_CP "'${LANGFILE_${LANGUAGE}_NAME}' '${LANG_${LANGUAGE}}' '${LANG_${LANGUAGE}_CP}' ${MUI_LANGDLL_LANGUAGES_CP_TEMP}"
!endif
;Add language to list of languages for selection dialog
!define /ifndef MUI_LANGDLL_LANGUAGES ""
!define /redef MUI_LANGDLL_LANGUAGES \
`"${LANGFILE_${NLFID}_LANGDLL}" "${LANG_${NLFID}}" ${MUI_LANGDLL_LANGUAGES}`
!define /ifndef MUI_LANGDLL_LANGUAGES_CP ""
!define /redef MUI_LANGDLL_LANGUAGES_CP \
`"${LANGFILE_${NLFID}_LANGDLL}" "${LANG_${NLFID}}" "${LANG_${NLFID}_CP}" ${MUI_LANGDLL_LANGUAGES_CP}`
!verbose pop