NSIS Installer: Fix Basque, Galician, Slovak, Turkish

Not sure when this broke, but those languages could never have worked...

diff --git a/admin/win/nsi/l10n/bin/l10n.sh b/admin/win/nsi/l10n/bin/l10n.sh
index 2caea80e617a5f070ced36f23c133d243176a674..c4bf8736a49fd0ab0274d60cef26e3802954e2e5 100755 (executable)
--- a/admin/win/nsi/l10n/bin/l10n.sh
+++ b/admin/win/nsi/l10n/bin/l10n.sh
@@ -44,7 +44,6 @@ iconv -t CP1252 -o Finnish.nsh Finnish.nsh
 iconv -t CP932 -o Japanese.nsh Japanese.nsh
 iconv -t CP1250 -o Slovak.nsh Slovak.nsh
 iconv -t CP1254 -o Turkish.nsh Turkish.nsh
-iconv -t CP1254 -o Turkish.nsh Turkish.nsh
 iconv -t CP1252 -o Norwegian.nsh Norwegian.nsh
 
 

diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in
index 77d3561cbba15da05865afeaccb78fd3345d8deb..890fcf6e985a9a14a0b14a77a8e161e76333e638 100644 (file)
--- a/cmake/modules/NSIS.template.in
+++ b/cmake/modules/NSIS.template.in
@@ -175,10 +175,10 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VERSION}"
       StrCmp $LANGUAGE ${LANG_ITALIAN} Italian 0
       StrCmp $LANGUAGE ${LANG_ESTONIAN} Estonian 0
       StrCmp $LANGUAGE ${LANG_GREEK} Greek 0
-      StrCmp $LANGUAGE ${LANG_GREEK} Basque 0
-      StrCmp $LANGUAGE ${LANG_GREEK} Galician 0
-      StrCmp $LANGUAGE ${LANG_GREEK} Slovak 0
-      StrCmp $LANGUAGE ${LANG_GREEK} Turkish 0
+      StrCmp $LANGUAGE ${LANG_BASQUE} Basque 0
+      StrCmp $LANGUAGE ${LANG_GALICIAN} Galician 0
+      StrCmp $LANGUAGE ${LANG_SLOVAC} Slovak 0
+      StrCmp $LANGUAGE ${LANG_TURKISH} Turkish 0
       StrCmp $LANGUAGE ${LANG_NORWEGIAN} Norwegian 0
       StrCmp $LANGUAGE ${LANG_PORTUGUESEBR} Brazilian EndLanguageCmp
       German: