diff --git a/src/windows/installer-translations/english.nsi b/src/windows/installer-translations/english.nsi index 1cad50928..62d3c4029 100644 --- a/src/windows/installer-translations/english.nsi +++ b/src/windows/installer-translations/english.nsi @@ -12,8 +12,12 @@ LangString inst_torrent ${LANG_ENGLISH} "Open .torrent files with qBittorrent" LangString inst_magnet ${LANG_ENGLISH} "Open magnet links with qBittorrent" ;LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule" LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule" +;LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule" +LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule" ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing." LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing." +;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version." +LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version." ;------------------------------------ @@ -31,6 +35,8 @@ LangString remove_registry ${LANG_ENGLISH} "Remove registry keys" LangString remove_conf ${LANG_ENGLISH} "Remove configuration files" ;LangString remove_firewall ${LANG_ENGLISH} "Remove Windows Firewall rule" LangString remove_firewall ${LANG_ENGLISH} "Remove Windows Firewall rule" +;LangString remove_firewallinfo ${LANG_ENGLISH} "Removing Windows Firewall rule" +LangString remove_firewallinfo ${LANG_ENGLISH} "Removing Windows Firewall rule" ;LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data" LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data" ;LangString uninst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before uninstalling." diff --git a/src/windows/installer.nsi b/src/windows/installer.nsi index ffeb0fe59..ba02d4bb5 100644 --- a/src/windows/installer.nsi +++ b/src/windows/installer.nsi @@ -6,7 +6,8 @@ Section "-hidden" StrCmp $1 "" done uninst: - ;Run the uninstaller of the previous install. + ;Run the uninstaller of the previous install. + DetailPrint $(inst_unist) ExecWait '"$INSTDIR\uninst.exe" /S _?=$INSTDIR' Delete "$INSTDIR\uninst.exe" @@ -119,6 +120,7 @@ SectionEnd Section $(inst_firewall) + DetailPrint $(inst_firewallinfo) nsisFirewall::AddAuthorizedApplication "$INSTDIR\qbittorrent.exe" "qBittorrent" SectionEnd diff --git a/src/windows/uninstaller.nsi b/src/windows/uninstaller.nsi index 89e406e3b..ca0d996e2 100644 --- a/src/windows/uninstaller.nsi +++ b/src/windows/uninstaller.nsi @@ -64,6 +64,7 @@ SectionEnd Section "un.$(remove_firewall)" ; + DetailPrint $(remove_firewallinfo) nsisFirewall::RemoveAuthorizedApplication "$INSTDIR\qbittorrent.exe" SectionEnd