From 070d9d3147ff2231b5bd90c01663fbcde1c765e3 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Mon, 25 May 2015 21:45:43 +0200 Subject: [PATCH] NSIS Installer: Fix Basque, Galician, Slovak, Turkish Not sure when this broke, but those languages could never have worked... --- admin/win/nsi/l10n/bin/l10n.sh | 1 - cmake/modules/NSIS.template.in | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/admin/win/nsi/l10n/bin/l10n.sh b/admin/win/nsi/l10n/bin/l10n.sh index 2caea80e6..c4bf8736a 100755 --- 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 77d3561cb..890fcf6e9 100644 --- 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: