From ed9d2ebdafb9bcda66bb1a9e67c3960b890d70df Mon Sep 17 00:00:00 2001 From: scorpio810 Date: Fri, 21 Aug 2015 13:09:06 +0000 Subject: [PATCH] Nsis Installers : delete check box license page, move french language variables to lang_extra_fr.nsh in code page iso 8859-15 (accented characters) git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4145 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- packaging/windows/QET.nsi | 2 +- packaging/windows/QET64.nsi | 2 +- packaging/windows/lang_extra.nsh | 21 --------------------- packaging/windows/lang_extra_fr.nsh | 19 +++++++++++++++++++ 4 files changed, 21 insertions(+), 23 deletions(-) create mode 100644 packaging/windows/lang_extra_fr.nsh diff --git a/packaging/windows/QET.nsi b/packaging/windows/QET.nsi index 35cc41af7..e45acc203 100644 --- a/packaging/windows/QET.nsi +++ b/packaging/windows/QET.nsi @@ -63,7 +63,6 @@ !define MUI_ABORTWARNING !define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\XPUI-install.ico" !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\XPUI-uninstall.ico" - !define MUI_LICENSEPAGE_CHECKBOX !define MUI_WELCOMEFINISHPAGE_BITMAP ".\images\wizard.bmp" @@ -123,6 +122,7 @@ !insertmacro MUI_RESERVEFILE_LANGDLL !include lang_extra.nsh + !include lang_extra_fr.nsh diff --git a/packaging/windows/QET64.nsi b/packaging/windows/QET64.nsi index 5ed9e0c09..ca5b532e4 100644 --- a/packaging/windows/QET64.nsi +++ b/packaging/windows/QET64.nsi @@ -69,7 +69,6 @@ !define MUI_ABORTWARNING !define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\XPUI-install.ico" !define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\XPUI-uninstall.ico" - !define MUI_LICENSEPAGE_CHECKBOX !define MUI_WELCOMEFINISHPAGE_BITMAP ".\images\wizard.bmp" !define MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH @@ -127,6 +126,7 @@ !insertmacro MUI_RESERVEFILE_LANGDLL !include lang_extra.nsh + !include lang_extra_fr.nsh diff --git a/packaging/windows/lang_extra.nsh b/packaging/windows/lang_extra.nsh index 24bb78a35..5565fd98c 100644 --- a/packaging/windows/lang_extra.nsh +++ b/packaging/windows/lang_extra.nsh @@ -19,27 +19,6 @@ LangString var4 ${LANG_ENGLISH} "Examples of diagrams" - LangString wrongArch ${LANG_FRENCH} "Ce programme est pour Windows 64 bits seulement." - LangString installed ${LANG_FRENCH} "${SOFT_NAME} est deja installe. $\n$\nCliquer sur `OK` pour desinstaller l'ancienne version `Annuler` pour annuler cet upgrade." - LangString Elements ${LANG_FRENCH} "Elements" - LangString Electric ${LANG_FRENCH} "Electrique" - LangString Logic ${LANG_FRENCH} "Logique" - LangString Hydraulic ${LANG_FRENCH} "Hydraulique" - LangString Pneumatic ${LANG_FRENCH} "Pneumatique" - LangString Energy ${LANG_FRENCH} "Energie" - LangString water ${LANG_FRENCH} "Eaux" - LangString Refrigeration ${LANG_FRENCH} "Climatisation" - LangString Solar_thermal ${LANG_FRENCH} "Thermique & solaire" - LangString Lang ${LANG_FRENCH} "Langues" - LangString Titleblocks ${LANG_FRENCH} "Cartouches" - LangString Examples ${LANG_FRENCH} "Exemples" - LangString Check ${LANG_FRENCH} "Cocher pour lancer ${SOFT_NAME}" - LangString var1 ${LANG_FRENCH} "Elements de la collection officielle" - LangString var2 ${LANG_FRENCH} "Fichiers de langues" - LangString var3 ${LANG_FRENCH} "Exemples de cartouches" - LangString var4 ${LANG_FRENCH} "Exemples de schemas" - - LangString installed ${LANG_POLISH} "${SOFT_NAME} jest już zainstalowany. $\n$\nKliknij `OK` aby odinstalować poprzedniÄ… wersjÄ™ lub `Cancel` aby przerwać aktualizacjÄ™." LangString wrongArch ${LANG_POLISH} "To oprogramowanie jest przeznaczone wyÅ‚Ä…cznie dla komputerów 64 bitowych." LangString Elements ${LANG_POLISH} "Elementy" diff --git a/packaging/windows/lang_extra_fr.nsh b/packaging/windows/lang_extra_fr.nsh new file mode 100644 index 000000000..958352585 --- /dev/null +++ b/packaging/windows/lang_extra_fr.nsh @@ -0,0 +1,19 @@ + LangString wrongArch ${LANG_FRENCH} "Ce programme est pour Windows 64 bits seulement." + LangString installed ${LANG_FRENCH} "${SOFT_NAME} est déja installé. $\n$\nCliquer sur `OK` pour désinstaller l'ancienne version `Annuler` pour annuler cet upgrade." + LangString Elements ${LANG_FRENCH} "Eléments" + LangString Electric ${LANG_FRENCH} "Electrique" + LangString Logic ${LANG_FRENCH} "Logique" + LangString Hydraulic ${LANG_FRENCH} "Hydraulique" + LangString Pneumatic ${LANG_FRENCH} "Pneumatique" + LangString Energy ${LANG_FRENCH} "Energie" + LangString water ${LANG_FRENCH} "Eaux" + LangString Refrigeration ${LANG_FRENCH} "Climatisation" + LangString Solar_thermal ${LANG_FRENCH} "Thermique & solaire" + LangString Lang ${LANG_FRENCH} "Langues" + LangString Titleblocks ${LANG_FRENCH} "Cartouches" + LangString Examples ${LANG_FRENCH} "Exemples" + LangString Check ${LANG_FRENCH} "Cocher pour lancer ${SOFT_NAME}" + LangString var1 ${LANG_FRENCH} "Eléments de la collection officielle" + LangString var2 ${LANG_FRENCH} "Fichiers de langues" + LangString var3 ${LANG_FRENCH} "Exemples de cartouches" + LangString var4 ${LANG_FRENCH} "Exemples de schémas" \ No newline at end of file