From 4a0244ae88ce1de92dba3c7ad799ac87651ec8e9 Mon Sep 17 00:00:00 2001 From: sledgehammer999 Date: Tue, 4 Apr 2017 00:32:40 +0300 Subject: [PATCH] Better 64-bit handling in the installer. --- .../installer-translations/afrikaans.nsi | 2 ++ .../installer-translations/albanian.nsi | 2 ++ .../windows/installer-translations/arabic.nsi | 2 ++ .../windows/installer-translations/basque.nsi | 2 ++ .../installer-translations/belarusian.nsi | 2 ++ .../installer-translations/bosnian.nsi | 2 ++ .../windows/installer-translations/breton.nsi | 2 ++ .../installer-translations/bulgarian.nsi | 2 ++ .../installer-translations/catalan.nsi | 2 ++ .../installer-translations/croatian.nsi | 2 ++ dist/windows/installer-translations/czech.nsi | 2 ++ .../windows/installer-translations/danish.nsi | 2 ++ dist/windows/installer-translations/dutch.nsi | 2 ++ .../installer-translations/english.nsi | 2 ++ .../installer-translations/esperanto.nsi | 2 ++ .../installer-translations/estonian.nsi | 2 ++ dist/windows/installer-translations/farsi.nsi | 2 ++ .../installer-translations/finnish.nsi | 2 ++ .../windows/installer-translations/french.nsi | 2 ++ .../installer-translations/galician.nsi | 2 ++ .../windows/installer-translations/german.nsi | 2 ++ dist/windows/installer-translations/greek.nsi | 2 ++ .../windows/installer-translations/hebrew.nsi | 2 ++ .../installer-translations/hungarian.nsi | 2 ++ .../installer-translations/icelandic.nsi | 2 ++ .../installer-translations/indonesian.nsi | 2 ++ dist/windows/installer-translations/irish.nsi | 2 ++ .../installer-translations/italian.nsi | 2 ++ .../installer-translations/japanese.nsi | 2 ++ .../windows/installer-translations/korean.nsi | 2 ++ .../installer-translations/kurdish.nsi | 2 ++ .../installer-translations/latvian.nsi | 2 ++ .../installer-translations/lithuanian.nsi | 2 ++ .../installer-translations/luxembourgish.nsi | 2 ++ .../installer-translations/macedonian.nsi | 2 ++ dist/windows/installer-translations/malay.nsi | 2 ++ .../installer-translations/mongolian.nsi | 2 ++ .../installer-translations/norwegian.nsi | 2 ++ .../norwegiannynorsk.nsi | 2 ++ .../windows/installer-translations/polish.nsi | 2 ++ .../installer-translations/portuguese.nsi | 2 ++ .../installer-translations/portugueseBR.nsi | 2 ++ .../installer-translations/romanian.nsi | 2 ++ .../installer-translations/russian.nsi | 2 ++ .../installer-translations/serbian.nsi | 2 ++ .../installer-translations/serbianlatin.nsi | 2 ++ .../installer-translations/simpchinese.nsi | 2 ++ .../windows/installer-translations/slovak.nsi | 2 ++ .../installer-translations/slovenian.nsi | 2 ++ .../installer-translations/spanish.nsi | 2 ++ .../spanishinternational.nsi | 2 ++ .../installer-translations/swedish.nsi | 2 ++ dist/windows/installer-translations/thai.nsi | 2 ++ .../installer-translations/tradchinese.nsi | 2 ++ .../installer-translations/turkish.nsi | 2 ++ .../installer-translations/ukrainian.nsi | 2 ++ dist/windows/installer-translations/uzbek.nsi | 2 ++ dist/windows/installer-translations/welsh.nsi | 2 ++ dist/windows/installer.nsi | 7 ++++ dist/windows/options.nsi | 35 +++++++++++++++---- 60 files changed, 152 insertions(+), 6 deletions(-) diff --git a/dist/windows/installer-translations/afrikaans.nsi b/dist/windows/installer-translations/afrikaans.nsi index 4eafc5636..54f0fb3f6 100644 --- a/dist/windows/installer-translations/afrikaans.nsi +++ b/dist/windows/installer-translations/afrikaans.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_AFRIKAANS} "A previous installation wa LangString inst_unist ${LANG_AFRIKAANS} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_AFRIKAANS} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_AFRIKAANS} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/albanian.nsi b/dist/windows/installer-translations/albanian.nsi index 158746fb3..89fb95782 100644 --- a/dist/windows/installer-translations/albanian.nsi +++ b/dist/windows/installer-translations/albanian.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_ALBANIAN} "A previous installation was LangString inst_unist ${LANG_ALBANIAN} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_ALBANIAN} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_ALBANIAN} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/arabic.nsi b/dist/windows/installer-translations/arabic.nsi index 525415a6b..c7721f7bb 100644 --- a/dist/windows/installer-translations/arabic.nsi +++ b/dist/windows/installer-translations/arabic.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_ARABIC} "A previous installation was d LangString inst_unist ${LANG_ARABIC} "جاري ازالة النسخة السابقة من البرنامج" ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_ARABIC} "تشغيل البرنامج" +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_ARABIC} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/basque.nsi b/dist/windows/installer-translations/basque.nsi index b30566456..5a0e0c49c 100644 --- a/dist/windows/installer-translations/basque.nsi +++ b/dist/windows/installer-translations/basque.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_BASQUE} "A previous installation was d LangString inst_unist ${LANG_BASQUE} "Aurreko bertsioa kentzen." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_BASQUE} "Abiarazi qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_BASQUE} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/belarusian.nsi b/dist/windows/installer-translations/belarusian.nsi index a039fba81..69bc132a2 100644 --- a/dist/windows/installer-translations/belarusian.nsi +++ b/dist/windows/installer-translations/belarusian.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_BELARUSIAN} "A previous installation w LangString inst_unist ${LANG_BELARUSIAN} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_BELARUSIAN} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_BELARUSIAN} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/bosnian.nsi b/dist/windows/installer-translations/bosnian.nsi index 10d5ab526..cbc0d4d75 100644 --- a/dist/windows/installer-translations/bosnian.nsi +++ b/dist/windows/installer-translations/bosnian.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_BOSNIAN} "A previous installation was LangString inst_unist ${LANG_BOSNIAN} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_BOSNIAN} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_BOSNIAN} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/breton.nsi b/dist/windows/installer-translations/breton.nsi index 6c808b277..641f9db94 100644 --- a/dist/windows/installer-translations/breton.nsi +++ b/dist/windows/installer-translations/breton.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_BRETON} "A previous installation was d LangString inst_unist ${LANG_BRETON} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_BRETON} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_BRETON} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/bulgarian.nsi b/dist/windows/installer-translations/bulgarian.nsi index b34cbcdf9..481c0bde3 100644 --- a/dist/windows/installer-translations/bulgarian.nsi +++ b/dist/windows/installer-translations/bulgarian.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_BULGARIAN} "A previous installation wa LangString inst_unist ${LANG_BULGARIAN} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_BULGARIAN} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_BULGARIAN} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/catalan.nsi b/dist/windows/installer-translations/catalan.nsi index 376cd7bef..e277beb35 100644 --- a/dist/windows/installer-translations/catalan.nsi +++ b/dist/windows/installer-translations/catalan.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_CATALAN} "A previous installation was LangString inst_unist ${LANG_CATALAN} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_CATALAN} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_CATALAN} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/croatian.nsi b/dist/windows/installer-translations/croatian.nsi index dcef2dccc..8b604792f 100644 --- a/dist/windows/installer-translations/croatian.nsi +++ b/dist/windows/installer-translations/croatian.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_CROATIAN} "A previous installation was LangString inst_unist ${LANG_CROATIAN} "Deinstaliraj prethodnu verziju." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_CROATIAN} "Pokreni qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_CROATIAN} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/czech.nsi b/dist/windows/installer-translations/czech.nsi index dbdb88078..b48378b0e 100644 --- a/dist/windows/installer-translations/czech.nsi +++ b/dist/windows/installer-translations/czech.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_CZECH} "A previous installation was de LangString inst_unist ${LANG_CZECH} "Odebírání předchozí verze." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_CZECH} "Spustit qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_CZECH} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/danish.nsi b/dist/windows/installer-translations/danish.nsi index 95154e35d..2d33c8cf3 100644 --- a/dist/windows/installer-translations/danish.nsi +++ b/dist/windows/installer-translations/danish.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_DANISH} "A previous installation was d LangString inst_unist ${LANG_DANISH} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_DANISH} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_DANISH} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/dutch.nsi b/dist/windows/installer-translations/dutch.nsi index 658949e7e..62042a4be 100644 --- a/dist/windows/installer-translations/dutch.nsi +++ b/dist/windows/installer-translations/dutch.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_DUTCH} "A previous installation was de LangString inst_unist ${LANG_DUTCH} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_DUTCH} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_DUTCH} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/english.nsi b/dist/windows/installer-translations/english.nsi index f2799a335..05b77ef59 100644 --- a/dist/windows/installer-translations/english.nsi +++ b/dist/windows/installer-translations/english.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/esperanto.nsi b/dist/windows/installer-translations/esperanto.nsi index adc2e1798..bf79d7ddf 100644 --- a/dist/windows/installer-translations/esperanto.nsi +++ b/dist/windows/installer-translations/esperanto.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_ESPERANTO} "A previous installation wa LangString inst_unist ${LANG_ESPERANTO} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_ESPERANTO} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_ESPERANTO} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/estonian.nsi b/dist/windows/installer-translations/estonian.nsi index 9e807ad0f..7fda8c6ba 100644 --- a/dist/windows/installer-translations/estonian.nsi +++ b/dist/windows/installer-translations/estonian.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_ESTONIAN} "A previous installation was LangString inst_unist ${LANG_ESTONIAN} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_ESTONIAN} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_ESTONIAN} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/farsi.nsi b/dist/windows/installer-translations/farsi.nsi index 7d9ce2734..ca5f0e0dc 100644 --- a/dist/windows/installer-translations/farsi.nsi +++ b/dist/windows/installer-translations/farsi.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_FARSI} "A previous installation was de LangString inst_unist ${LANG_FARSI} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_FARSI} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_FARSI} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/finnish.nsi b/dist/windows/installer-translations/finnish.nsi index 5fa4942e9..932946a54 100644 --- a/dist/windows/installer-translations/finnish.nsi +++ b/dist/windows/installer-translations/finnish.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_FINNISH} "A previous installation was LangString inst_unist ${LANG_FINNISH} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_FINNISH} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_FINNISH} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/french.nsi b/dist/windows/installer-translations/french.nsi index e9d2dd866..d0899b978 100644 --- a/dist/windows/installer-translations/french.nsi +++ b/dist/windows/installer-translations/french.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_FRENCH} "Une installation précédente LangString inst_unist ${LANG_FRENCH} "Désinstallation de la version précédente." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_FRENCH} "Lancer qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_FRENCH} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/galician.nsi b/dist/windows/installer-translations/galician.nsi index eb340949c..f63c51d2b 100644 --- a/dist/windows/installer-translations/galician.nsi +++ b/dist/windows/installer-translations/galician.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_GALICIAN} "A previous installation was LangString inst_unist ${LANG_GALICIAN} "Desinstalando a versión anterior." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_GALICIAN} "Iniciar qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_GALICIAN} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/german.nsi b/dist/windows/installer-translations/german.nsi index 046dbf4ae..fa7257bca 100644 --- a/dist/windows/installer-translations/german.nsi +++ b/dist/windows/installer-translations/german.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_GERMAN} "Eine ältere Installation wur LangString inst_unist ${LANG_GERMAN} "Vorherige Version wird deinstalliert." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_GERMAN} "Starte qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_GERMAN} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/greek.nsi b/dist/windows/installer-translations/greek.nsi index 008399152..34f171a3a 100644 --- a/dist/windows/installer-translations/greek.nsi +++ b/dist/windows/installer-translations/greek.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_GREEK} "A previous installation was de LangString inst_unist ${LANG_GREEK} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_GREEK} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_GREEK} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/hebrew.nsi b/dist/windows/installer-translations/hebrew.nsi index a2d0fc139..c8b8a89e0 100644 --- a/dist/windows/installer-translations/hebrew.nsi +++ b/dist/windows/installer-translations/hebrew.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_HEBREW} "A previous installation was d LangString inst_unist ${LANG_HEBREW} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_HEBREW} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_HEBREW} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/hungarian.nsi b/dist/windows/installer-translations/hungarian.nsi index d2c636ecb..fdd80894e 100644 --- a/dist/windows/installer-translations/hungarian.nsi +++ b/dist/windows/installer-translations/hungarian.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_HUNGARIAN} "A previous installation wa LangString inst_unist ${LANG_HUNGARIAN} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_HUNGARIAN} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_HUNGARIAN} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/icelandic.nsi b/dist/windows/installer-translations/icelandic.nsi index 69094a9b8..2dd263e0c 100644 --- a/dist/windows/installer-translations/icelandic.nsi +++ b/dist/windows/installer-translations/icelandic.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_ICELANDIC} "A previous installation wa LangString inst_unist ${LANG_ICELANDIC} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_ICELANDIC} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_ICELANDIC} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/indonesian.nsi b/dist/windows/installer-translations/indonesian.nsi index a38574a45..98fa10c4d 100644 --- a/dist/windows/installer-translations/indonesian.nsi +++ b/dist/windows/installer-translations/indonesian.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_INDONESIAN} "A previous installation w LangString inst_unist ${LANG_INDONESIAN} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_INDONESIAN} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_INDONESIAN} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/irish.nsi b/dist/windows/installer-translations/irish.nsi index 70bad066d..983d0cbdd 100644 --- a/dist/windows/installer-translations/irish.nsi +++ b/dist/windows/installer-translations/irish.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_IRISH} "A previous installation was de LangString inst_unist ${LANG_IRISH} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_IRISH} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_IRISH} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/italian.nsi b/dist/windows/installer-translations/italian.nsi index a6aa64515..1dd9a033a 100644 --- a/dist/windows/installer-translations/italian.nsi +++ b/dist/windows/installer-translations/italian.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_ITALIAN} "A previous installation was LangString inst_unist ${LANG_ITALIAN} "Disinstallazione versione precedente." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_ITALIAN} "Esegui qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_ITALIAN} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/japanese.nsi b/dist/windows/installer-translations/japanese.nsi index e7e087279..58d0302a6 100644 --- a/dist/windows/installer-translations/japanese.nsi +++ b/dist/windows/installer-translations/japanese.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_JAPANESE} "A previous installation was LangString inst_unist ${LANG_JAPANESE} "以前のバージョンをアンインストールしています。" ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_JAPANESE} "qBittorrent を起動する" +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_JAPANESE} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/korean.nsi b/dist/windows/installer-translations/korean.nsi index bf50cba55..ff40491e2 100644 --- a/dist/windows/installer-translations/korean.nsi +++ b/dist/windows/installer-translations/korean.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_KOREAN} "A previous installation was d LangString inst_unist ${LANG_KOREAN} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_KOREAN} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_KOREAN} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/kurdish.nsi b/dist/windows/installer-translations/kurdish.nsi index f2eb19abd..c3c74c3a5 100644 --- a/dist/windows/installer-translations/kurdish.nsi +++ b/dist/windows/installer-translations/kurdish.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_KURDISH} "A previous installation was LangString inst_unist ${LANG_KURDISH} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_KURDISH} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_KURDISH} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/latvian.nsi b/dist/windows/installer-translations/latvian.nsi index 82fae45ef..d2bb03174 100644 --- a/dist/windows/installer-translations/latvian.nsi +++ b/dist/windows/installer-translations/latvian.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_LATVIAN} "A previous installation was LangString inst_unist ${LANG_LATVIAN} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_LATVIAN} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_LATVIAN} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/lithuanian.nsi b/dist/windows/installer-translations/lithuanian.nsi index 64ebdccf6..8fef9159c 100644 --- a/dist/windows/installer-translations/lithuanian.nsi +++ b/dist/windows/installer-translations/lithuanian.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_LITHUANIAN} "A previous installation w LangString inst_unist ${LANG_LITHUANIAN} "Šalinu ankstesnę versiją." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_LITHUANIAN} "Paleisti qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_LITHUANIAN} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/luxembourgish.nsi b/dist/windows/installer-translations/luxembourgish.nsi index 27f5fddde..b1adf2870 100644 --- a/dist/windows/installer-translations/luxembourgish.nsi +++ b/dist/windows/installer-translations/luxembourgish.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_LUXEMBOURGISH} "A previous installatio LangString inst_unist ${LANG_LUXEMBOURGISH} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_LUXEMBOURGISH} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_LUXEMBOURGISH} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/macedonian.nsi b/dist/windows/installer-translations/macedonian.nsi index 699a154ef..36dda8150 100644 --- a/dist/windows/installer-translations/macedonian.nsi +++ b/dist/windows/installer-translations/macedonian.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_MACEDONIAN} "A previous installation w LangString inst_unist ${LANG_MACEDONIAN} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_MACEDONIAN} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_MACEDONIAN} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/malay.nsi b/dist/windows/installer-translations/malay.nsi index 95d2e4d1a..acbabc653 100644 --- a/dist/windows/installer-translations/malay.nsi +++ b/dist/windows/installer-translations/malay.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_MALAY} "A previous installation was de LangString inst_unist ${LANG_MALAY} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_MALAY} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_MALAY} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/mongolian.nsi b/dist/windows/installer-translations/mongolian.nsi index bbc366483..6e0e9d57f 100644 --- a/dist/windows/installer-translations/mongolian.nsi +++ b/dist/windows/installer-translations/mongolian.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_MONGOLIAN} "A previous installation wa LangString inst_unist ${LANG_MONGOLIAN} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_MONGOLIAN} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_MONGOLIAN} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/norwegian.nsi b/dist/windows/installer-translations/norwegian.nsi index 9faf6d911..18a8cc080 100644 --- a/dist/windows/installer-translations/norwegian.nsi +++ b/dist/windows/installer-translations/norwegian.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_NORWEGIAN} "A previous installation wa LangString inst_unist ${LANG_NORWEGIAN} "Avinstallerer forrige versjon." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_NORWEGIAN} "Sett i gang qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_NORWEGIAN} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/norwegiannynorsk.nsi b/dist/windows/installer-translations/norwegiannynorsk.nsi index 33f657b1e..cc27e43fb 100644 --- a/dist/windows/installer-translations/norwegiannynorsk.nsi +++ b/dist/windows/installer-translations/norwegiannynorsk.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_NORWEGIANNYNORSK} "A previous installa LangString inst_unist ${LANG_NORWEGIANNYNORSK} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_NORWEGIANNYNORSK} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_NORWEGIANNYNORSK} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/polish.nsi b/dist/windows/installer-translations/polish.nsi index 7470dc667..171738c18 100644 --- a/dist/windows/installer-translations/polish.nsi +++ b/dist/windows/installer-translations/polish.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_POLISH} "A previous installation was d LangString inst_unist ${LANG_POLISH} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_POLISH} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_POLISH} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/portuguese.nsi b/dist/windows/installer-translations/portuguese.nsi index ee73f86c2..f6e7ab394 100644 --- a/dist/windows/installer-translations/portuguese.nsi +++ b/dist/windows/installer-translations/portuguese.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_PORTUGUESE} "Uma antiga instalação f LangString inst_unist ${LANG_PORTUGUESE} "A desinstalar versão anterior." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_PORTUGUESE} "Iniciar qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_PORTUGUESE} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/portugueseBR.nsi b/dist/windows/installer-translations/portugueseBR.nsi index 4e91210e7..083aba26c 100644 --- a/dist/windows/installer-translations/portugueseBR.nsi +++ b/dist/windows/installer-translations/portugueseBR.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_PORTUGUESEBR} "Uma instalação anteri LangString inst_unist ${LANG_PORTUGUESEBR} "Desinstalando versão anterior." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_PORTUGUESEBR} "Executar qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_PORTUGUESEBR} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/romanian.nsi b/dist/windows/installer-translations/romanian.nsi index 3560ebbc8..a0ec4cd54 100644 --- a/dist/windows/installer-translations/romanian.nsi +++ b/dist/windows/installer-translations/romanian.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_ROMANIAN} "A previous installation was LangString inst_unist ${LANG_ROMANIAN} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_ROMANIAN} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_ROMANIAN} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/russian.nsi b/dist/windows/installer-translations/russian.nsi index 139992ebe..ca8561d67 100644 --- a/dist/windows/installer-translations/russian.nsi +++ b/dist/windows/installer-translations/russian.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_RUSSIAN} "Обнаружена пре LangString inst_unist ${LANG_RUSSIAN} "Деинсталлируем старую версию." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_RUSSIAN} "Запустить qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_RUSSIAN} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/serbian.nsi b/dist/windows/installer-translations/serbian.nsi index d17c214a3..6e2f5e4e6 100644 --- a/dist/windows/installer-translations/serbian.nsi +++ b/dist/windows/installer-translations/serbian.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_SERBIAN} "A previous installation was LangString inst_unist ${LANG_SERBIAN} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_SERBIAN} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_SERBIAN} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/serbianlatin.nsi b/dist/windows/installer-translations/serbianlatin.nsi index 5470944cc..637a69c82 100644 --- a/dist/windows/installer-translations/serbianlatin.nsi +++ b/dist/windows/installer-translations/serbianlatin.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_SERBIANLATIN} "A previous installation LangString inst_unist ${LANG_SERBIANLATIN} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_SERBIANLATIN} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_SERBIANLATIN} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/simpchinese.nsi b/dist/windows/installer-translations/simpchinese.nsi index 7e41ea642..4be3396f6 100644 --- a/dist/windows/installer-translations/simpchinese.nsi +++ b/dist/windows/installer-translations/simpchinese.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_SIMPCHINESE} "A previous installation LangString inst_unist ${LANG_SIMPCHINESE} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_SIMPCHINESE} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_SIMPCHINESE} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/slovak.nsi b/dist/windows/installer-translations/slovak.nsi index 13ad79652..9e43420ae 100644 --- a/dist/windows/installer-translations/slovak.nsi +++ b/dist/windows/installer-translations/slovak.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_SLOVAK} "A previous installation was d LangString inst_unist ${LANG_SLOVAK} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_SLOVAK} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_SLOVAK} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/slovenian.nsi b/dist/windows/installer-translations/slovenian.nsi index b53dd93eb..824afd33b 100644 --- a/dist/windows/installer-translations/slovenian.nsi +++ b/dist/windows/installer-translations/slovenian.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_SLOVENIAN} "A previous installation wa LangString inst_unist ${LANG_SLOVENIAN} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_SLOVENIAN} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_SLOVENIAN} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/spanish.nsi b/dist/windows/installer-translations/spanish.nsi index 205e4db50..1df625ed4 100644 --- a/dist/windows/installer-translations/spanish.nsi +++ b/dist/windows/installer-translations/spanish.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_SPANISH} "Se detectó una instalación LangString inst_unist ${LANG_SPANISH} "Desinstalando la versión anterior." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_SPANISH} "Iniciar qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_SPANISH} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/spanishinternational.nsi b/dist/windows/installer-translations/spanishinternational.nsi index 08119c6c7..acf081eae 100644 --- a/dist/windows/installer-translations/spanishinternational.nsi +++ b/dist/windows/installer-translations/spanishinternational.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_SPANISHINTERNATIONAL} "Se detectó una LangString inst_unist ${LANG_SPANISHINTERNATIONAL} "Desinstalando la versión anterior." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_SPANISHINTERNATIONAL} "Iniciar qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_SPANISHINTERNATIONAL} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/swedish.nsi b/dist/windows/installer-translations/swedish.nsi index 2ccd6ddee..1be763f98 100644 --- a/dist/windows/installer-translations/swedish.nsi +++ b/dist/windows/installer-translations/swedish.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_SWEDISH} "A previous installation was LangString inst_unist ${LANG_SWEDISH} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_SWEDISH} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_SWEDISH} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/thai.nsi b/dist/windows/installer-translations/thai.nsi index 25437c7fa..0b42d9d8b 100644 --- a/dist/windows/installer-translations/thai.nsi +++ b/dist/windows/installer-translations/thai.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_THAI} "A previous installation was det LangString inst_unist ${LANG_THAI} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_THAI} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_THAI} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/tradchinese.nsi b/dist/windows/installer-translations/tradchinese.nsi index 6820cea82..fd10a6dab 100644 --- a/dist/windows/installer-translations/tradchinese.nsi +++ b/dist/windows/installer-translations/tradchinese.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_TRADCHINESE} "A previous installation LangString inst_unist ${LANG_TRADCHINESE} "正在移除先前版本" ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_TRADCHINESE} "啟動 qBittorrent" +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_TRADCHINESE} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/turkish.nsi b/dist/windows/installer-translations/turkish.nsi index db0e90517..f15376c1f 100644 --- a/dist/windows/installer-translations/turkish.nsi +++ b/dist/windows/installer-translations/turkish.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_TURKISH} "Önceki bir kurulum algılan LangString inst_unist ${LANG_TURKISH} "Önceki sürüm kaldırılıyor." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_TURKISH} "qBittorrent'i çalıştır." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_TURKISH} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/ukrainian.nsi b/dist/windows/installer-translations/ukrainian.nsi index 99e5782ed..09b42a9d5 100644 --- a/dist/windows/installer-translations/ukrainian.nsi +++ b/dist/windows/installer-translations/ukrainian.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_UKRAINIAN} "A previous installation wa LangString inst_unist ${LANG_UKRAINIAN} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_UKRAINIAN} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_UKRAINIAN} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/uzbek.nsi b/dist/windows/installer-translations/uzbek.nsi index bc54ce6b1..807bf88b6 100644 --- a/dist/windows/installer-translations/uzbek.nsi +++ b/dist/windows/installer-translations/uzbek.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_UZBEK} "A previous installation was de LangString inst_unist ${LANG_UZBEK} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_UZBEK} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_UZBEK} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer-translations/welsh.nsi b/dist/windows/installer-translations/welsh.nsi index 5cb5d10e0..3b09b1b60 100644 --- a/dist/windows/installer-translations/welsh.nsi +++ b/dist/windows/installer-translations/welsh.nsi @@ -22,6 +22,8 @@ LangString inst_uninstall_question ${LANG_WELSH} "A previous installation was de LangString inst_unist ${LANG_WELSH} "Uninstalling previous version." ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent." LangString launch_qbt ${LANG_WELSH} "Launch qBittorrent." +;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions." +LangString inst_requires_64bit ${LANG_WELSH} "This installer works only in 64-bit Windows versions." ;------------------------------------ diff --git a/dist/windows/installer.nsi b/dist/windows/installer.nsi index aa75f5fb0..eef4b1e36 100644 --- a/dist/windows/installer.nsi +++ b/dist/windows/installer.nsi @@ -196,6 +196,13 @@ Function .onInit !insertmacro Init "installer" !insertmacro MUI_LANGDLL_DISPLAY + !ifdef APP64BIT + ${IfNot} ${RunningX64} + MessageBox MB_OK|MB_ICONEXCLAMATION $(inst_requires_64bit) + Abort + ${EndIf} + !endif + ;Search if qBittorrent is already installed. FindFirst $0 $1 "$INSTDIR\uninst.exe" FindClose $0 diff --git a/dist/windows/options.nsi b/dist/windows/options.nsi index 86776ef67..e036d0c74 100644 --- a/dist/windows/options.nsi +++ b/dist/windows/options.nsi @@ -8,9 +8,15 @@ SetCompressor /SOLID LZMA SetCompressorDictSize 64 XPStyle on +;Uncomment when packaging 64bit qbittorrent +;!define APP64BIT + !include "MUI.nsh" !include "UAC.nsh" !include "FileFunc.nsh" +!ifdef APP64BIT +!include "x64.nsh" +!endif ;For the file association !define SHCNE_ASSOCCHANGED 0x8000000 @@ -20,16 +26,26 @@ XPStyle on !define CSIDL_APPDATA '0x1A' ;Application Data path !define CSIDL_LOCALAPPDATA '0x1C' ;Local Application Data path +; Program specific !define PROG_VERSION "3.4.0" + !define MUI_FINISHPAGE_RUN !define MUI_FINISHPAGE_RUN_FUNCTION PageFinishRun !define MUI_FINISHPAGE_RUN_TEXT $(launch_qbt) -; The name of the installer -Name "qBittorrent ${PROG_VERSION}" +!ifndef APP64BIT + ; The name of the installer + Name "qBittorrent ${PROG_VERSION}" + + ; The file to write + OutFile "qbittorrent_${PROG_VERSION}_setup.exe" +!else + ; The name of the installer + Name "qBittorrent ${PROG_VERSION} x64" -; The file to write -OutFile "qbittorrent_${PROG_VERSION}_setup.exe" + ; The file to write + OutFile "qbittorrent_${PROG_VERSION}_x64_setup.exe" +!endif ;Installer Version Information VIAddVersionKey "ProductName" "qBittorrent" @@ -40,8 +56,15 @@ VIAddVersionKey "FileVersion" "${PROG_VERSION}" VIProductVersion "${PROG_VERSION}.0" -; The default installation directory -InstallDir $PROGRAMFILES\qBittorrent +; The default installation directory. It changes depending if we install in the 64bit dir or not. +; A caveat of this is if a user has installed a 32bit version and then runs the 64bit installer +; (which in turn launches the 32bit uninstaller first) the value will still point to the 32bit location. +; The user has to manually uninstall the old version and THEN run the 64bit installer +!ifndef APP64BIT + InstallDir $PROGRAMFILES32\qBittorrent +!else + InstallDir $PROGRAMFILES64\qBittorrent +!endif ; Registry key to check for directory (so if you install again, it will ; overwrite the old one automatically)