Bump to 3.3.2

Replace some unnecessary (and slow) dynamic_cast with static_cast.

.travis.yml

@@ -8,12 +8,13 @@ osx_image: xcode7
 env:
   matrix:
     # Uncomment when Travis upgraded "Ubuntu 12.04 LTS" to a newer version whose repo will have a more up-to-date libtorrent package
-    #- lt_branch=dist   gui=true
+    #- lt_branch=dist gui=true
-    #- lt_branch=dist   gui=false
+    #- lt_branch=dist gui=false
-    - lt_branch=RC_1_0 gui=true qt=4
+    - lt_branch=RC_1_0 qt=5 gui=true
-    - lt_branch=RC_1_0 gui=true qt=5
+    - lt_branch=RC_1_0 qt=5 gui=false
-    - lt_branch=RC_1_0 gui=false qt=4
+    - lt_branch=RC_1_0 qt=4 gui=true
-    - lt_branch=RC_1_0 gui=false qt=5
+    - lt_branch=RC_1_0 qt=4 gui=false
+
   global:
     - secure: "OI9CUjj4lTb0HwwIZU5PbECU3hLlAL6KC8KsbwohG8/O3j5fLcnmDsK4Ad9us5cC39sS11Jcd1kDP2qRcCuST/glVNhLkcjKkiQerOfd5nQ/qL4JYfz/1mfP5mdpz9jHKzpLUIG+TXkbSTjP6VVmsb5KPT+3pKEdRFZB+Pu9+J8="
     - coverity_branch: coverity_scan
@@ -21,9 +22,9 @@ env:
 matrix:
   exclude:
     - os: linux
-      env: lt_branch=RC_1_0 gui=true qt=5
+      env: lt_branch=RC_1_0 qt=5 gui=true
     - os: linux
-      env: lt_branch=RC_1_0 gui=false qt=5
+      env: lt_branch=RC_1_0 qt=5 gui=false
 
 branches:
   except:
@@ -89,7 +90,8 @@ before_install:
     elif [ "$TRAVIS_OS_NAME" = "linux" ]; then export "DISPLAY=:99.0" && /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 ;
     fi
   - if [ "$TRAVIS_OS_NAME" = "osx" ]; then qbtconf="$qbtconf --disable-qt-dbus" ; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$qt" = 5 ]; then qbtconf="$qbtconf --with-qt4=no" ; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" -a "$qt" = 4 ]; then brew install qt; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" -a "$qt" = 5 ]; then qbtconf="$qbtconf --with-qt4=no" ; fi
 
   # Print settings
   - echo $lt_branch
@@ -101,14 +103,14 @@ before_install:
 install:
   - if [ "$TRAVIS_OS_NAME" = "linux" -a "$lt_branch" != "dist" ]; then cd "$HOME" && pwd && git clone --depth 1 https://github.com/arvidn/libtorrent.git --branch $lt_branch ; fi
   - if [ "$TRAVIS_OS_NAME" = "linux" -a "$lt_branch" != "dist" ]; then cd libtorrent && ./autotool.sh && ./configure $ltconf && make install && cd "$TRAVIS_BUILD_DIR" ; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update > /dev/null && brew install colormake libtorrent-rasterbar; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update > /dev/null && brew install colormake libtorrent-rasterbar ; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$qt" = 4 ]; then brew install qt; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" -a "$qt" = 5 ]; then brew install qt5 && brew link --force qt5 ; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$qt" = 5 ]; then brew install qt5 && brew link --force qt5; fi
 
 script:
   - if [ "$TRAVIS_BRANCH" = "$coverity_branch" ]; then exit ; fi # Skip usual build when running coverity scan
   - ./bootstrap.sh && ./configure $qbtconf
-  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then echo QMAKE_CC=$CC >> conf.pri && echo QMAKE_CXX=$CXX >> conf.pri ; fi
+  - if [ "$TRAVIS_OS_NAME" = "linux" ]; then echo "QMAKE_CC=$CC" >> conf.pri && echo "QMAKE_CXX=$CXX" >> conf.pri ; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed -i "" -e 's/^\(CXXFLAGS.*\)$/\1 -Wno-unused-local-typedefs/' src/Makefile ; fi
   - make && make install
 
 after_success:

.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[qbittorrent.qbittorrent_master]
+[qbittorrent.qbittorrent_v3_3_x]
 file_filter = src/lang/qbittorrent_<lang>.ts
 source_file = src/lang/qbittorrent_en.ts
 source_lang = en

AUTHORS

@@ -79,6 +79,11 @@ Images Authors:
 
 * file: src/icons/oxygen/checked.png
   copyright: Victor Buinsky <allok.victor@gmail.com>
+  
+* file: src/icons/skin/ratio.png
+  copyright: Fatcow Web Hosting
+  license: Creative Commons Attribution 3.0 License
+  url: http://www.fatcow.com/free-icons
 
 Translations authors:
 * files: src/lang/*.ts

CODING_GUIDELINES.md

@@ -1,6 +1,8 @@
 All new code must follow the following coding guidelines.  
 If you make changes in a file that still uses another coding style, make sure that you follow these guidelines for your changes instead.  
-**Note:** I will now take your head if you forget and use another style. However, most probably the request will be delayed until you fix your coding style.
+**Note 1:** I will not take your head if you forget and use another style. However, most probably the request will be delayed until you fix your coding style.  
+**Note 2:** You can use the `uncrustify` program/tool to clean up any source file. Use it with the `uncrustify.cfg` configuration file found in the root folder.  
+**Note 3:** There is also a style for QtCreator but it doesn't cover all cases. In QtCreator `Tools->Options...->C++->Code Style->Import...` and choose the `codingStyleQtCreator.xml` file found in the root folder.  
 
 ### 1. Curly braces ###
 #### a. Function blocks, class/struct definitions, namespaces ####

CONTRIBUTING.md

@@ -0,0 +1,36 @@
+# Filing an issue
+
+### Must read
+* If you aren't sure, you can ask on the [**forum**](http://forum.qbittorrent.org) or read our [**wiki**](http://wiki.qbittorrent.org) first.
+* Do a quick **search**. Others might already reported the issue.
+* Write in **English**!
+* Provide **version** information: (You can find version numbers at menu `Help -> About -> Libraries`)
+  ```
+qBittorrent:
+Qt:
+libtorrent:
+boost:
+OS version:
+
+  ```
+* Provide **steps** to reproduce the problem, it will be easier to pinpoint the fault.
+* **Screenshots**! A screenshot is worth a thousand words. just upload it. [(How?)](https://help.github.com/articles/file-attachments-on-issues-and-pull-requests)
+
+### Good to know
+* **Be patient**. The dev team is small and resource limited. Devs finding their free time, analyzing the problem and fixing the issue, it all takes time. :clock3:
+* If you can code, why not become a **contributor** by fixing the issue and open a pull request? :wink:
+* Harsh words or threats won't help your situation. What's worse, your complain will (very likely) to be **ignored**. :fearful:
+
+
+# Opening a pull request
+
+### Must read
+* Read our [**coding guidelines**](https://github.com/qbittorrent/qBittorrent/blob/master/CODING_GUIDELINES.md). There are some scripts to help you: [uncrustify script](https://raw.githubusercontent.com/qbittorrent/qBittorrent/master/uncrustify.cfg), [astyle script](https://gist.github.com/Chocobo1/539cee860d1eef0acfa6), [(related thread)](https://github.com/qbittorrent/qBittorrent/issues/2192).
+* Keep the title **short** and provide a **clear** description about what your pull request does.
+* Provide **screenshots** for UI related changes.
+* Keep your git commit history **clean** and **precise**. Commits like `xxx fixup` should not appear.
+* If your commit fix a reported issue (for example #4134), add the following message to the commit `Closes #4134.`. Example [here](https://github.com/qbittorrent/qBittorrent/commit/a74bac20c4e8de9776bf9bb77fdc7526135d1988).
+
+### Good to know
+* **Search** pull request history! Others might already implemented your idea and is waiting to be merged (or got rejected already). Save your precious time by doing a search first.
+* When resolving merge conflicts, do `git rebase <target_branch_name>`, don't do `git pull`. Then you can start fixing the conflicts. Here is a good explanation: [link](https://www.atlassian.com/git/tutorials/merging-vs-rebasing).

Changelog

@@ -1,3 +1,70 @@
+* Tue Jan 19 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.2
+    - FEATURE: Add a new column to peers list that shows list of files which are downloaded right now from a peer. (evsh)
+    - FEATURE: Improve the "Watch folders" UI. Closes #4300. You'll need to redo your watch folders settings. (sledgehammer999, glassez)
+    - FEATURE: Support loading multiple magnets/hashes/urls per .magnet file in the watched folder(one per line). Closes #217. (sledgehammer999)
+    - BUGFIX: Fix resolution of peer host names. Closes #4307. (sledgehammer999)
+    - BUGFIX: Don't recheck twice after 'Force Recheck' with 'Recheck torrents on completion' enabled. Closes #4274. (sledgehammer999)
+    - BUGFIX: Don't apply some settings again if they weren't changed. Closes #4278. (sledgehammer999)
+    - BUGFIX: Update ISO 3166 country codes. Closes #3942. (Chocobo1)
+    - BUGFIX: Fix moving torrents to Temp after app restart. Closes #4434. (glassez)
+    - BUGFIX: Fix crash in favicon code due to null pointer dereference. (glassez)
+    - BUGFIX: Move the 'qBittorrent-resume' file even when no magnets were recovered. Also make sure to rename it with a unique name. Closes #4334. (sledgehammer999)
+    - BUGFIX: Don't add the watch folder before the user closes the Preferences window. (sledgehammer999)
+    - BUGFIX: Remove watch folders permanently only if the user accepts the Preferences dialog. (sledgehammer999)
+    - BUGFIX: Better handling of cookies in the download manager (glassez)
+    - BUGFIX: Use the download manager for RSS, the program updater and the dns updater. (glassez)
+    - BUGFIX: Fix reconfigure additional trackers (glassez)
+    - BUGFIX: Fix loading corrupted .fastresume file (glassez)
+    - WEBUI: Show filtered torrents number (buinsky)
+    - WEBUI: Fix paused, active and inactive filters (buinsky)
+    - WEBUI: Fixed bug when uploading several files and only the last one was considered. (naikel)
+    - WEBUI: Implemented WebUI interface for the new Watched Folders feature (naikel)
+    - WEBUI: Fix possible showing "qBittorrent client is not reachable" message on deleting torrents. (buinsky)
+    - WEBUI: Don't show "Limit download speed" menu item for downloaded torrents. (buinsky)
+    - WEBUI: Update webui run program parameters (buinsky)
+    - WEBUI: Allow to remove the label assigned to a torrent (pmzqla)
+    - WEBUI: Repair translation (buinsky)
+    - WEBUI: Remember last opened tab (buinsky)
+    - WEBUI: Bump WebUI API_VERSION and API_VERSION_MIN.
+    - COSMETIC: Update native names for Chinese locales. Closes #4381. (sledgehammer999)
+    - COSMETIC: Rename column header in Content view. (Chocobo1)
+    - COSMETIC: Edit speed limits and upload ratio icons (buinsky)
+    - SEARCH: Code refactoring. (glassez)
+    - SEARCH: Fix PirateBay plugin implementation for Python 3 (ngosang)
+    - SEARCH: Update PirateBay URL. Closes #4470 (ngosang)
+    - RSS: Code refactoring. (glassez)
+    - LINUX: Fix build. (sledgehammer999)
+    - OSX: Set qBittorrent as default torrent app in  Mac OS (dmitry.viktorov)
+    - OTHER: Fix lrelease version due to the default Qt5 build (Fabio Alessandro Locati)
+    - OTHER: Indicate to the user that he's going to download the new version. Indicate from the installer that the old version was detected and no settings will be deleted. Closes #4320. (sledgehammer999)
+    - OTHER: Don't require GUI libs for qt4 nox build. Closes #4404. (sledgehammer999)
+    - OTHER: Fix cross-compilation (bnagaev)
+    - OTHER: Allow GeoIP in nox builds (glassez)
+
+* Tue Dec 08 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.1
+    - FEATURE: New "Set as default label" option in Add torrent dialog. (takiz)
+    - FEATURE: Support wildcards for filtering torrent list and torrent content (vlakoff)
+    - BUGFIX: Fix -1 is displayed instead of the infinity symbol (Chocobo1)
+    - BUGFIX: Fix scan dirs settings saving. Closes #4254, #4239, #4187. (glassez)
+    - BUGFIX: Exported torrents now use name instead of hash. Closes #4205. (glassez)
+    - BUGFIX: Improve upgrade to v3.3.0. Now undownloaded magnets will be migrated too. Fixes #4195. (glassez)
+    - BUGFIX: Fix wrong encoding for listen failed error message. (glassez)
+    - BUGFIX: Fix RSS not automarking articles as read. (glassez)
+    - BUGFIX: Fix possible deadlock during application exit. (sledgehammer999)
+    - WEBUI: Cookies support on WebUI when downloading torrent from a URL. (Naikel Aparicio)
+    - WEBUI: Modified download and upload windows to allow autocompletion of browsers. (Naikel Aparicio)
+    - WEBUI: Fixed the spinner in the WebUI upload page. (Naikel Aparicio)
+    - WEBUI: Modified height of the WebUI download page. (Naikel Aparicio)
+    - WEBUI: Fixed all the JavaScript functions for download and upload pages. (Naikel Aparicio)
+    - WEBUI: Add seeds tab to WebUI (buinsky)
+    - WEBUI: Bump WebUI API_VERSION.
+    - COSMETIC: Cleanup "Trackers", "Peers", "HTTP Sources", "Speed" and "Content" page layout (Chocobo1)
+    - COSMETIC: Reduce mainwindow border width (Chocobo1)
+    - COSMETIC: Use QLineEdit built-in ClearButton (Qt5 only) (Chocobo1)
+    - COSMETIC: Change text description for half-open connection (Chocobo1)
+    - OTHER: Change update URL to FossHub. Closes #4188. (sledgehammer999)
+    
+
 * Sun Nov 29 2015 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.0
     - FEATURE: Huge core code refactoring. Problems with labels, temp folders etc should be eliminated. Smoother UI should be observed too. (glassez)
     - FEATURE: Speed graph (Anton Lashkov)

codingStyleQtCreator.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE QtCreatorCodeStyle>
+<!-- Written by QtCreator 3.2.82, 2014-11-26T02:08:28. -->
+<qtcreator>
+ <data>
+  <variable>CodeStyleData</variable>
+  <valuemap type="QVariantMap">
+   <value type="bool" key="AlignAssignments">true</value>
+   <value type="bool" key="AutoSpacesForTabs">false</value>
+   <value type="bool" key="BindStarToIdentifier">false</value>
+   <value type="bool" key="BindStarToLeftSpecifier">true</value>
+   <value type="bool" key="BindStarToRightSpecifier">false</value>
+   <value type="bool" key="BindStarToTypeName">true</value>
+   <value type="bool" key="ExtraPaddingForConditionsIfConfusingAlign">false</value>
+   <value type="bool" key="IndentAccessSpecifiers">false</value>
+   <value type="bool" key="IndentBlockBody">true</value>
+   <value type="bool" key="IndentBlockBraces">false</value>
+   <value type="bool" key="IndentBlocksRelativeToSwitchLabels">false</value>
+   <value type="bool" key="IndentClassBraces">false</value>
+   <value type="bool" key="IndentControlFlowRelativeToSwitchLabels">true</value>
+   <value type="bool" key="IndentDeclarationsRelativeToAccessSpecifiers">true</value>
+   <value type="bool" key="IndentEnumBraces">false</value>
+   <value type="bool" key="IndentFunctionBody">true</value>
+   <value type="bool" key="IndentFunctionBraces">false</value>
+   <value type="bool" key="IndentNamespaceBody">true</value>
+   <value type="bool" key="IndentNamespaceBraces">false</value>
+   <value type="int" key="IndentSize">4</value>
+   <value type="bool" key="IndentStatementsRelativeToSwitchLabels">true</value>
+   <value type="bool" key="IndentSwitchLabels">false</value>
+   <value type="int" key="PaddingMode">1</value>
+   <value type="bool" key="SpacesForTabs">true</value>
+   <value type="int" key="TabSize">4</value>
+  </valuemap>
+ </data>
+ <data>
+  <variable>DisplayName</variable>
+  <value type="QString">qBittorrent</value>
+ </data>
+</qtcreator>

dist/mac/Info.plist

@@ -45,7 +45,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.3.0</string>
+	<string>3.3.2</string>
 	<key>CFBundleSignature</key>
 	<string>qBit</string>
 	<key>CFBundleExecutable</key>
@@ -59,7 +59,7 @@
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2006-2015 The qBittorrent project</string>
+	<string>Copyright © 2006-2016 The qBittorrent project</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>

dist/windows/README.txt

@@ -41,7 +41,10 @@ installer-translations
 translations
 	qt_ar.qm
 	...
-        (all the .qm files found in dist/qt-translations in every source release)
+        (all the .qm files found in the 'translations' folder of your Qt install. Those files differ between Qt4 and Qt5.
+	 If you want to distribute Qt4 translations it is better to use the ones found in this repo under the path "dist/qt-translations".
+	 They contain extra languages not distributed via the official qt4 sources.
+	 Don't forget to edit the filelist in installer.nsi + uninstaller.nsi to include all your .qm files.)
 	qt_zh_TW.qm
 installer.nsi
 license.txt

dist/windows/installer-translations/afrikaans.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_AFRIKAANS} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_AFRIKAANS} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_AFRIKAANS} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_AFRIKAANS} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_AFRIKAANS} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/albanian.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_ALBANIAN} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_ALBANIAN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_ALBANIAN} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_ALBANIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_ALBANIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/arabic.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_ARABIC} "اضافة قاعدة للجدار ال
 LangString inst_firewallinfo ${LANG_ARABIC} "جاري اضافة القاعدة للجدار الناري"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_ARABIC} "البرنامج يعمل. يرجى اغلاقه قبل البدء في التنصيب"
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_ARABIC} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_ARABIC} "جاري ازالة النسخة السابقة من البرنامج"
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/basque.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_BASQUE} "Gehitu Windows Suhesi araua"
 LangString inst_firewallinfo ${LANG_BASQUE} "Windows Suhesi araua gehitzen"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_BASQUE} "qBittorrent ekinean dago. Mesedez itxi aplikazioa ezarri aurretik."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_BASQUE} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_BASQUE} "Aurreko bertsioa kentzen."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/belarusian.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_BELARUSIAN} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_BELARUSIAN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_BELARUSIAN} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_BELARUSIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_BELARUSIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/bosnian.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_BOSNIAN} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_BOSNIAN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_BOSNIAN} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_BOSNIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_BOSNIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/breton.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_BRETON} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_BRETON} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_BRETON} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_BRETON} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_BRETON} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/bulgarian.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_BULGARIAN} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_BULGARIAN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_BULGARIAN} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_BULGARIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_BULGARIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/catalan.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_CATALAN} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_CATALAN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_CATALAN} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_CATALAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_CATALAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/croatian.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_CROATIAN} "Dodaj Windows Firewall pravilo"
 LangString inst_firewallinfo ${LANG_CROATIAN} "Dodavanje Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_CROATIAN} "qBittorrent je pokrenut. Zatvorite ga prije instalacije."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_CROATIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_CROATIAN} "Deinstaliraj prethodnu verziju."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/czech.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_CZECH} "Vytvořit pravidlo ve Windows Firewall"
 LangString inst_firewallinfo ${LANG_CZECH} "Vytváření pravidla ve Windows Firewall"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_CZECH} "qBittorrent je spuštěn. Před instalací aplikaci ukončete, prosím."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_CZECH} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_CZECH} "Odebírání předchozí verze."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/danish.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_DANISH} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_DANISH} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_DANISH} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_DANISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_DANISH} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/dutch.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_DUTCH} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_DUTCH} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_DUTCH} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_DUTCH} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_DUTCH} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/english.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_ENGLISH} "Add 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_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/esperanto.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_ESPERANTO} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_ESPERANTO} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_ESPERANTO} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_ESPERANTO} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_ESPERANTO} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/estonian.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_ESTONIAN} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_ESTONIAN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_ESTONIAN} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_ESTONIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_ESTONIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/farsi.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_FARSI} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_FARSI} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_FARSI} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_FARSI} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_FARSI} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/finnish.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_FINNISH} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_FINNISH} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_FINNISH} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_FINNISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_FINNISH} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/french.nsi

@@ -11,11 +11,13 @@ LangString inst_torrent ${LANG_FRENCH} "Ouvrir fichiers .torrent avec qBittorren
 ;LangString inst_magnet ${LANG_ENGLISH} "Open magnet links with qBittorrent"
 LangString inst_magnet ${LANG_FRENCH} "Ouvrir liens magnet avec qBittorrent"
 ;LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule"
-LangString inst_firewall ${LANG_FRENCH} "Ajouter régle Pare-Feu Windows"
+LangString inst_firewall ${LANG_FRENCH} "Ajouter règle Pare-Feu Windows"
 ;LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule"
-LangString inst_firewallinfo ${LANG_FRENCH} "Ajout régle Pare-Feu Windows"
+LangString inst_firewallinfo ${LANG_FRENCH} "Ajout règle Pare-Feu Windows"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
-LangString inst_warning ${LANG_FRENCH} "qBittorrent est en exécution. Veuillez fermer l'application avant l'installation."
+LangString inst_warning ${LANG_FRENCH} "qBittorrent est en cours d'exécution. Veuillez fermer l'application avant l'installation."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_FRENCH} "Une installation précédente a été détectée. Elle sera désinstallée sans supprimer les réglages utilisateur."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_FRENCH} "Désinstallation de la version précédente."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
@@ -30,20 +32,20 @@ LangString remove_files ${LANG_FRENCH} "Supprimer fichiers"
 ;LangString remove_shortcuts ${LANG_ENGLISH} "Remove shortcuts"
 LangString remove_shortcuts ${LANG_FRENCH} "Supprimer raccourcis"
 ;LangString remove_associations ${LANG_ENGLISH} "Remove file associations"
-LangString remove_associations ${LANG_FRENCH} "Supprimer fichiers associés"
+LangString remove_associations ${LANG_FRENCH} "Supprimer associations de fichiers"
 ;LangString remove_registry ${LANG_ENGLISH} "Remove registry keys"
-LangString remove_registry ${LANG_FRENCH} "supprimer clés de registre"
+LangString remove_registry ${LANG_FRENCH} "Supprimer clés de registre"
 ;LangString remove_conf ${LANG_ENGLISH} "Remove configuration files"
 LangString remove_conf ${LANG_FRENCH} "Supprimer fichiers de configuration"
 ;LangString remove_firewall ${LANG_ENGLISH} "Remove Windows Firewall rule"
-LangString remove_firewall ${LANG_FRENCH} "Supprimer régle Pare-Feu Windows"
+LangString remove_firewall ${LANG_FRENCH} "Supprimer règle Pare-Feu Windows"
 ;LangString remove_firewallinfo ${LANG_ENGLISH} "Removing Windows Firewall rule"
-LangString remove_firewallinfo ${LANG_FRENCH} "Suppression régle Pare-Feu Windows"
+LangString remove_firewallinfo ${LANG_FRENCH} "Suppression règle Pare-Feu Windows"
 ;LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data"
 LangString remove_cache ${LANG_FRENCH} "Supprimer torrents et données cachées"
 ;LangString uninst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before uninstalling."
-LangString uninst_warning ${LANG_FRENCH} "qBittorrent est en exécution. Veuillez fermer l'application avant la désinstallation."
+LangString uninst_warning ${LANG_FRENCH} "qBittorrent est en cours d'exécution. Veuillez fermer l'application avant la désinstallation."
 ;LangString uninst_tor_warn ${LANG_ENGLISH} "Not removing .torrent association. It is associated with:"
-LangString uninst_tor_warn ${LANG_FRENCH} "Ne peut pas supprimer l'association du .torrent. Elle est associée avec:"
+LangString uninst_tor_warn ${LANG_FRENCH} "Ne peut pas supprimer l'association du .torrent. Elle est associée avec :"
 ;LangString uninst_mag_warn ${LANG_ENGLISH} "Not removing magnet association. It is associated with:"
-LangString uninst_mag_warn ${LANG_FRENCH} "Ne peut pas supprimer l'association du magnet. Elle est associée avec:"
+LangString uninst_mag_warn ${LANG_FRENCH} "Ne peut pas supprimer l'association du magnet. Elle est associée avec :"

dist/windows/installer-translations/galician.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_GALICIAN} "Engadir unha regra á devasa (firewal
 LangString inst_firewallinfo ${LANG_GALICIAN} "Engadindo unha regra á devasa de Windows"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_GALICIAN} "qBittorrent está en execución. Peche o aplicativo antes da instalación."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_GALICIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_GALICIAN} "Desinstalando a versión anterior."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/german.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_GERMAN} "Regel in der Windows Firewall hinzufüg
 LangString inst_firewallinfo ${LANG_GERMAN} "Füge Regel in der Windows Firewall hinzu"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_GERMAN} "qBittorrent läuft gerade. Bitte das Programm vor der Installation beenden."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_GERMAN} "Eine ältere Installation wurde festgestellt. Diese wird deinstalliert ohne die Benutzereinstellungen zu löschen."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_GERMAN} "Vorherige Version wird deinstalliert."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/greek.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_GREEK} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_GREEK} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_GREEK} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_GREEK} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_GREEK} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/hebrew.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_HEBREW} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_HEBREW} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_HEBREW} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_HEBREW} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_HEBREW} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/hungarian.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_HUNGARIAN} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_HUNGARIAN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_HUNGARIAN} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_HUNGARIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_HUNGARIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/icelandic.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_ICELANDIC} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_ICELANDIC} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_ICELANDIC} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_ICELANDIC} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_ICELANDIC} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/indonesian.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_INDONESIAN} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_INDONESIAN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_INDONESIAN} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_INDONESIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_INDONESIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/irish.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_IRISH} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_IRISH} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_IRISH} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_IRISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_IRISH} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/italian.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_ITALIAN} "Aggiungi regola al firewall di Windows
 LangString inst_firewallinfo ${LANG_ITALIAN} "Aggiunta regola al firewall di Windows"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_ITALIAN} "qBittorrent è in esecuzione. Chiudi l'applicazione prima dell'installazione."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_ITALIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_ITALIAN} "Disinstallazione versione precedente."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/japanese.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_JAPANESE} "Windows ファイアウォールの
 LangString inst_firewallinfo ${LANG_JAPANESE} "Windows ファイアウォールのルールを追加しています"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_JAPANESE} "qBittorrent が起動されています。インストールの前にアプリケーションを終了してください。"
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_JAPANESE} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_JAPANESE} "以前のバージョンをアンインストールしています。"
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/korean.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_KOREAN} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_KOREAN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_KOREAN} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_KOREAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_KOREAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/kurdish.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_KURDISH} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_KURDISH} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_KURDISH} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_KURDISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_KURDISH} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/latvian.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_LATVIAN} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_LATVIAN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_LATVIAN} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_LATVIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_LATVIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/lithuanian.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_LITHUANIAN} "Sukurti Windows užkardos leidimą"
 LangString inst_firewallinfo ${LANG_LITHUANIAN} "Pridedu Windows užkardos leidimą"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_LITHUANIAN} "qBittorrent yra paleistas. Prašau uždaryti programą prieš įdiegiant."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_LITHUANIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_LITHUANIAN} "Šalinu ankstesnę versiją."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/luxembourgish.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_LUXEMBOURGISH} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_LUXEMBOURGISH} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_LUXEMBOURGISH} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_LUXEMBOURGISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_LUXEMBOURGISH} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/macedonian.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_MACEDONIAN} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_MACEDONIAN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_MACEDONIAN} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_MACEDONIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_MACEDONIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/malay.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_MALAY} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_MALAY} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_MALAY} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_MALAY} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_MALAY} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/mongolian.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_MONGOLIAN} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_MONGOLIAN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_MONGOLIAN} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_MONGOLIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_MONGOLIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/norwegian.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_NORWEGIAN} "Legg til Windows-brannmursregel"
 LangString inst_firewallinfo ${LANG_NORWEGIAN} "Legger til Windows-brannmursregel"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_NORWEGIAN} "qBittorrent kjører. Vennligst steng applikasjonen før installering."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_NORWEGIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_NORWEGIAN} "Avinstallerer forrige versjon."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/norwegiannynorsk.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_NORWEGIANNYNORSK} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_NORWEGIANNYNORSK} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_NORWEGIANNYNORSK} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_NORWEGIANNYNORSK} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_NORWEGIANNYNORSK} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/polish.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_POLISH} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_POLISH} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_POLISH} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_POLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_POLISH} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/portuguese.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_PORTUGUESE} "Adicionar regra à firewall do Wind
 LangString inst_firewallinfo ${LANG_PORTUGUESE} "Adicionando regra à firewall do Windows"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_PORTUGUESE} "O qBittorrent está a ser executado. Feche a aplicação antes de instalar esta versão."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_PORTUGUESE} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_PORTUGUESE} "A desinstalar versão anterior."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/portugueseBR.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_PORTUGUESEBR} "Adicionar regra no firewall do Wi
 LangString inst_firewallinfo ${LANG_PORTUGUESEBR} "Adicionando regra no firewall do Windows"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_PORTUGUESEBR} "qBittorrent está rodando. Por favor feche a aplicação antes de instalar."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_PORTUGUESEBR} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_PORTUGUESEBR} "Desinstalando versão anterior."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/romanian.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_ROMANIAN} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_ROMANIAN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_ROMANIAN} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_ROMANIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_ROMANIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/russian.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_RUSSIAN} "Добавить в список ис
 LangString inst_firewallinfo ${LANG_RUSSIAN} "Добавление в список исключений брандмауера"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_RUSSIAN} "qBittorrent запущен. Пожалуйста, закройте qBittorrent и перезапустите программу установки."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_RUSSIAN} "Обнаружена предыдущая установка. Она будет деинсталлирована без удаления пользовательских настроек."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_RUSSIAN} "Деинсталлируем старую версию."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/serbian.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_SERBIAN} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_SERBIAN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_SERBIAN} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_SERBIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_SERBIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/serbianlatin.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_SERBIANLATIN} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_SERBIANLATIN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_SERBIANLATIN} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_SERBIANLATIN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_SERBIANLATIN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/simpchinese.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_SIMPCHINESE} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_SIMPCHINESE} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_SIMPCHINESE} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_SIMPCHINESE} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_SIMPCHINESE} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/slovak.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_SLOVAK} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_SLOVAK} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_SLOVAK} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_SLOVAK} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_SLOVAK} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/slovenian.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_SLOVENIAN} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_SLOVENIAN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_SLOVENIAN} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_SLOVENIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_SLOVENIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/spanish.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_SPANISH} "Añadir regla al Firewall de Windows"
 LangString inst_firewallinfo ${LANG_SPANISH} "Añadiendo regla al Firewall de Windows"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_SPANISH} "qBittorrent se está ejecutando. Ciérrelo antes de continuar."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_SPANISH} "Se detectó una instalación anterior. Será desinstalada sin eliminar la configuración del usuario."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_SPANISH} "Desinstalando la versión anterior."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/spanishinternational.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_SPANISHINTERNATIONAL} "Añadir regla al Firewall
 LangString inst_firewallinfo ${LANG_SPANISHINTERNATIONAL} "Añadiendo regla al Firewall de Windows"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_SPANISHINTERNATIONAL} "qBittorrent se está ejecutando. Ciérrelo antes de continuar."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_SPANISHINTERNATIONAL} "Se detectó una instalación anterior. Será desinstalada sin eliminar la configuración del usuario."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_SPANISHINTERNATIONAL} "Desinstalando la versión anterior."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/swedish.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_SWEDISH} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_SWEDISH} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_SWEDISH} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_SWEDISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_SWEDISH} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/thai.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_THAI} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_THAI} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_THAI} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_THAI} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_THAI} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/tradchinese.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_TRADCHINESE} "建立 Windows 防火牆規則"
 LangString inst_firewallinfo ${LANG_TRADCHINESE} "正在建立 Windows 防火牆規則"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_TRADCHINESE} "qBittorrent 正在執行中，請先關閉後再進行安裝。"
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_TRADCHINESE} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_TRADCHINESE} "正在移除先前版本"
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/turkish.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_TURKISH} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_TURKISH} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_TURKISH} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_TURKISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_TURKISH} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/ukrainian.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_UKRAINIAN} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_UKRAINIAN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_UKRAINIAN} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_UKRAINIAN} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_UKRAINIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/uzbek.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_UZBEK} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_UZBEK} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_UZBEK} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_UZBEK} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_UZBEK} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer-translations/welsh.nsi

@@ -16,6 +16,8 @@ LangString inst_firewall ${LANG_WELSH} "Add Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_WELSH} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_WELSH} "qBittorrent is running. Please close the application before installing."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "A previous installation was detected. It will be uninstalled without deleting user settings."
+LangString inst_uninstall_question ${LANG_WELSH} "A previous installation was detected. It will be uninstalled without deleting user settings."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_WELSH} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."

dist/windows/installer.nsi

@@ -4,13 +4,12 @@
     FindFirst $0 $1 "$INSTDIR\uninst.exe"
     FindClose $0
     StrCmp $1 "" done
-        
+
     ;Run the uninstaller of the previous install.
-    DetailPrint $(inst_unist)    
+    DetailPrint $(inst_unist)
     ExecWait '"$INSTDIR\uninst.exe" /S _?=$INSTDIR'
     Delete "$INSTDIR\uninst.exe"
-    
+
-  
     done:
 
 SectionEnd
@@ -31,13 +30,13 @@ Section $(inst_qbt_req) ;"qBittorrent (required)"
   File "qbittorrent.pdb"
   File "qt.conf"
   File /oname=translations\qt_ar.qm "translations\qt_ar.qm"
-  File /oname=translations\qt_bg.qm "translations\qt_bg.qm"
   File /oname=translations\qt_ca.qm "translations\qt_ca.qm"
   File /oname=translations\qt_cs.qm "translations\qt_cs.qm"
   File /oname=translations\qt_da.qm "translations\qt_da.qm"
   File /oname=translations\qt_de.qm "translations\qt_de.qm"
+  File /oname=translations\qt_en.qm "translations\qt_en.qm"
   File /oname=translations\qt_es.qm "translations\qt_es.qm"
-  File /oname=translations\qt_eu.qm "translations\qt_eu.qm"  
+  File /oname=translations\qt_fa.qm "translations\qt_fa.qm"
   File /oname=translations\qt_fi.qm "translations\qt_fi.qm"
   File /oname=translations\qt_fr.qm "translations\qt_fr.qm"
   File /oname=translations\qt_gl.qm "translations\qt_gl.qm"
@@ -47,17 +46,15 @@ Section $(inst_qbt_req) ;"qBittorrent (required)"
   File /oname=translations\qt_ja.qm "translations\qt_ja.qm"
   File /oname=translations\qt_ko.qm "translations\qt_ko.qm"
   File /oname=translations\qt_lt.qm "translations\qt_lt.qm"
-  File /oname=translations\qt_nl.qm "translations\qt_nl.qm"
   File /oname=translations\qt_pl.qm "translations\qt_pl.qm"
   File /oname=translations\qt_pt.qm "translations\qt_pt.qm"
-  File /oname=translations\qt_pt_BR.qm "translations\qt_pt_BR.qm"
   File /oname=translations\qt_ru.qm "translations\qt_ru.qm"
-  File /oname=translations\qt_sk.qm "translations\qt_sk.qm"  
+  File /oname=translations\qt_sk.qm "translations\qt_sk.qm"
+  File /oname=translations\qt_sl.qm "translations\qt_sl.qm"
   File /oname=translations\qt_sv.qm "translations\qt_sv.qm"
-  File /oname=translations\qt_tr.qm "translations\qt_tr.qm"
   File /oname=translations\qt_uk.qm "translations\qt_uk.qm"
   File /oname=translations\qt_zh_CN.qm "translations\qt_zh_CN.qm"
-  File /oname=translations\qt_zh_TW.qm "translations\qt_zh_TW.qm" 
+  File /oname=translations\qt_zh_TW.qm "translations\qt_zh_TW.qm"
   
   ; Write the installation path into the registry  
   WriteRegStr HKLM "Software\qBittorrent" "InstallLocation" "$INSTDIR"
@@ -179,7 +176,18 @@ Function .onInit
 
   !insertmacro Init "installer"
   !insertmacro MUI_LANGDLL_DISPLAY
-	
+
+  ;Search if qBittorrent is already installed.
+  FindFirst $0 $1 "$INSTDIR\uninst.exe"
+  FindClose $0
+  StrCmp $1 "" done
+
+  ;Inform the user
+  MessageBox MB_OKCANCEL|MB_ICONINFORMATION $(inst_uninstall_question) /SD IDOK IDOK done
+  Quit
+
+  done:
+
 FunctionEnd
 
 Function check_instance

dist/windows/options.nsi

@@ -19,7 +19,7 @@ XPStyle on
 !define CSIDL_APPDATA '0x1A' ;Application Data path
 !define CSIDL_LOCALAPPDATA '0x1C' ;Local Application Data path
 
-!define PROG_VERSION "3.3.0"
+!define PROG_VERSION "3.3.2"
 !define MUI_FINISHPAGE_RUN
 !define MUI_FINISHPAGE_RUN_FUNCTION PageFinishRun
 !define MUI_FINISHPAGE_RUN_TEXT $(launch_qbt)
@@ -33,7 +33,7 @@ OutFile "qbittorrent_${PROG_VERSION}_setup.exe"
 ;Installer Version Information
 VIAddVersionKey "ProductName" "qBittorrent"
 VIAddVersionKey "CompanyName" "The qBittorrent project"
-VIAddVersionKey "LegalCopyright" "Copyright ©2006-2015 The qBittorrent project"
+VIAddVersionKey "LegalCopyright" "Copyright ©2006-2016 The qBittorrent project"
 VIAddVersionKey "FileDescription" "qBittorrent - A Bittorrent Client"
 VIAddVersionKey "FileVersion" "${PROG_VERSION}"
 

dist/windows/uninstaller.nsi

@@ -6,13 +6,12 @@
   Delete "$INSTDIR\qbittorrent.pdb"
   Delete "$INSTDIR\qt.conf"  
   Delete "$INSTDIR\translations\qt_ar.qm"
-  Delete "$INSTDIR\translations\qt_bg.qm"
   Delete "$INSTDIR\translations\qt_ca.qm"
   Delete "$INSTDIR\translations\qt_cs.qm"
   Delete "$INSTDIR\translations\qt_da.qm"
   Delete "$INSTDIR\translations\qt_de.qm"
+  Delete "$INSTDIR\translations\qt_en.qm"
   Delete "$INSTDIR\translations\qt_es.qm"
-  Delete "$INSTDIR\translations\qt_eu.qm"
   Delete "$INSTDIR\translations\qt_fa.qm"
   Delete "$INSTDIR\translations\qt_fi.qm"
   Delete "$INSTDIR\translations\qt_fr.qm"
@@ -23,18 +22,15 @@
   Delete "$INSTDIR\translations\qt_ja.qm"
   Delete "$INSTDIR\translations\qt_ko.qm"
   Delete "$INSTDIR\translations\qt_lt.qm"
-  Delete "$INSTDIR\translations\qt_nl.qm"
   Delete "$INSTDIR\translations\qt_pl.qm"
   Delete "$INSTDIR\translations\qt_pt.qm"
-  Delete "$INSTDIR\translations\qt_pt_BR.qm"
   Delete "$INSTDIR\translations\qt_ru.qm"
   Delete "$INSTDIR\translations\qt_sk.qm"
   Delete "$INSTDIR\translations\qt_sl.qm"
   Delete "$INSTDIR\translations\qt_sv.qm"
-  Delete "$INSTDIR\translations\qt_tr.qm"
   Delete "$INSTDIR\translations\qt_uk.qm"
   Delete "$INSTDIR\translations\qt_zh_CN.qm"
-  Delete "$INSTDIR\translations\qt_zh_TW.qm"   
+  Delete "$INSTDIR\translations\qt_zh_TW.qm"
   Delete "$INSTDIR\uninst.exe"
   
   ; Remove directories used  

qm_gen.pri

@@ -5,7 +5,12 @@ isEmpty(QMAKE_LRELEASE) {
     win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
     else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
     unix {
+      equals(QT_MAJOR_VERSION, 4) {
         !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 }
+      } 
+      equals(QT_MAJOR_VERSION, 5) {
+        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt5 }
+      }
     } else {
         !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
     }

src/app/application.cpp

@@ -37,7 +37,7 @@
 #ifndef DISABLE_GUI
 #include "gui/guiiconprovider.h"
 #ifdef Q_OS_WIN
-#include <Windows.h>
+#include <windows.h>
 #include <QSharedMemory>
 #include <QSessionManager>
 #endif // Q_OS_WIN
@@ -58,17 +58,17 @@
 #endif
 
 #include "application.h"
-#include "core/logger.h"
+#include "base/logger.h"
-#include "core/preferences.h"
+#include "base/preferences.h"
-#include "core/utils/fs.h"
+#include "base/utils/fs.h"
-#include "core/utils/misc.h"
+#include "base/utils/misc.h"
-#include "core/iconprovider.h"
+#include "base/iconprovider.h"
-#include "core/scanfoldersmodel.h"
+#include "base/scanfoldersmodel.h"
-#include "core/net/smtp.h"
+#include "base/net/smtp.h"
-#include "core/net/downloadmanager.h"
+#include "base/net/downloadmanager.h"
-#include "core/net/geoipmanager.h"
+#include "base/net/geoipmanager.h"
-#include "core/bittorrent/session.h"
+#include "base/bittorrent/session.h"
-#include "core/bittorrent/torrenthandle.h"
+#include "base/bittorrent/torrenthandle.h"
 
 static const char PARAMS_SEPARATOR[] = "|";
 
@@ -357,7 +357,7 @@ void Application::initializeTranslation()
     }
 
     if (m_qtTranslator.load(
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#ifdef QBT_USES_QT5
             QString::fromUtf8("qtbase_") + locale, QLibraryInfo::location(QLibraryInfo::TranslationsPath)) ||
         m_qtTranslator.load(
 #endif
@@ -462,10 +462,10 @@ void Application::cleanup()
 #ifndef DISABLE_COUNTRIES_RESOLUTION
     Net::GeoIPManager::freeInstance();
 #endif
+    Net::DownloadManager::freeInstance();
     Preferences::freeInstance();
     Logger::freeInstance();
     IconProvider::freeInstance();
-    Net::DownloadManager::freeInstance();
 #ifndef DISABLE_GUI
 #ifdef Q_OS_WIN
     typedef BOOL (WINAPI *PSHUTDOWNBRDESTROY)(HWND);

src/app/application.h

@@ -50,7 +50,7 @@ QT_END_NAMESPACE
 typedef QtSingleCoreApplication BaseApplication;
 #endif
 
-#include "core/utils/misc.h"
+#include "base/utils/misc.h"
 
 #ifndef DISABLE_WEBUI
 class WebUI;

src/app/main.cpp

@@ -42,7 +42,7 @@
 #include <QSplashScreen>
 #ifdef QBT_STATIC_QT
 #include <QtPlugin>
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
+#ifdef QBT_USES_QT5
 Q_IMPORT_PLUGIN(QICOPlugin)
 #else
 Q_IMPORT_PLUGIN(qico)
@@ -72,8 +72,8 @@ Q_IMPORT_PLUGIN(qico)
 #include <cstdlib>
 #include <iostream>
 #include "application.h"
-#include "core/utils/misc.h"
+#include "base/utils/misc.h"
-#include "core/preferences.h"
+#include "base/preferences.h"
 
 #include "upgrade.h"
 

src/app/upgrade.h

@@ -40,9 +40,12 @@
 #include <QMessageBox>
 #endif
 
-#include "core/logger.h"
+#include "base/logger.h"
-#include "core/utils/fs.h"
+#include "base/utils/fs.h"
-#include "core/utils/misc.h"
+#include "base/utils/misc.h"
+#include "base/utils/string.h"
+#include "base/qinisettings.h"
+#include "base/preferences.h"
 
 bool userAcceptsUpgrade()
 {
@@ -73,7 +76,7 @@ bool userAcceptsUpgrade()
     return false;
 }
 
-bool upgradeResumeFile(const QString &filepath)
+bool upgradeResumeFile(const QString &filepath, const QVariantHash &oldTorrent, int &maxPrio)
 {
     QFile file1(filepath);
     if (!file1.open(QIODevice::ReadOnly))
@@ -91,6 +94,12 @@ bool upgradeResumeFile(const QString &filepath)
     fastNew = fastOld;
 
     int priority = fastOld.dict_find_int_value("qBt-queuePosition");
+    if (priority > maxPrio)
+        maxPrio = priority;
+
+    fastNew["qBt-name"] = Utils::String::toStdString(oldTorrent.value("name").toString());
+    fastNew["qBt-tempPathDisabled"] = false;
+
     QFile file2(QString("%1.%2").arg(filepath).arg(priority > 0 ? priority : 0));
     QVector<char> out;
     libtorrent::bencode(std::back_inserter(out), fastNew);
@@ -106,24 +115,74 @@ bool upgradeResumeFile(const QString &filepath)
 
 bool upgrade(bool ask = true)
 {
+    // Move RSS cookies to common storage
+    Preferences::instance()->moveRSSCookies();
+
+    QIniSettings *oldResumeSettings = new QIniSettings("qBittorrent", "qBittorrent-resume");
+    QString oldResumeFilename = oldResumeSettings->fileName();
+    QVariantHash oldResumeData = oldResumeSettings->value("torrents").toHash();
+    delete oldResumeSettings;
+    bool oldResumeWasEmpty = oldResumeData.isEmpty();
+    if (oldResumeWasEmpty)
+        Utils::Fs::forceRemove(oldResumeFilename);
+
+
     QString backupFolderPath = Utils::Fs::expandPathAbs(Utils::Fs::QDesktopServicesDataLocation() + "BT_backup");
     QDir backupFolderDir(backupFolderPath);
-    if (!backupFolderDir.exists()) return true;
-
     QStringList backupFiles = backupFolderDir.entryList(QStringList() << QLatin1String("*.fastresume"), QDir::Files, QDir::Unsorted);
-    if (!backupFiles.isEmpty()) {
+    if (backupFiles.isEmpty() && oldResumeWasEmpty) return true;
-        if (ask && !userAcceptsUpgrade()) return false;
+    if (ask && !userAcceptsUpgrade()) return false;
 
-        QRegExp rx(QLatin1String("^([A-Fa-f0-9]{40})\\.fastresume$"));
+    int maxPrio = 0;
-        foreach (QString backupFile, backupFiles) {
+    QRegExp rx(QLatin1String("^([A-Fa-f0-9]{40})\\.fastresume$"));
-            if (rx.indexIn(backupFile) != -1) {
+    foreach (QString backupFile, backupFiles) {
-                if (!upgradeResumeFile(backupFolderDir.absoluteFilePath(backupFile)))
+        if (rx.indexIn(backupFile) != -1) {
-                    Logger::instance()->addMessage(QObject::tr("Couldn't migrate torrent with hash: %1").arg(rx.cap(1)), Log::WARNING);
+            if (upgradeResumeFile(backupFolderDir.absoluteFilePath(backupFile), oldResumeData[rx.cap(1)].toHash(), maxPrio))
-            }
+                oldResumeData.remove(rx.cap(1));
-            else {
+            else
-                Logger::instance()->addMessage(QObject::tr("Couldn't migrate torrent. Invalid fastresume file name: %1").arg(backupFile), Log::WARNING);
+                Logger::instance()->addMessage(QObject::tr("Couldn't migrate torrent with hash: %1").arg(rx.cap(1)), Log::WARNING);
-            }
         }
+        else {
+            Logger::instance()->addMessage(QObject::tr("Couldn't migrate torrent. Invalid fastresume file name: %1").arg(backupFile), Log::WARNING);
+        }
+    }
+
+    foreach (const QString &hash, oldResumeData.keys()) {
+        QVariantHash oldTorrent = oldResumeData[hash].toHash();
+        if (oldTorrent.value("is_magnet", false).toBool()) {
+            libtorrent::entry resumeData;
+            resumeData["qBt-magnetUri"] = Utils::String::toStdString(oldTorrent.value("magnet_uri").toString());
+            resumeData["qBt-paused"] = false;
+            resumeData["qBt-forced"] = false;
+
+            resumeData["qBt-savePath"] = Utils::String::toStdString(oldTorrent.value("save_path").toString());
+            resumeData["qBt-ratioLimit"] = Utils::String::toStdString(QString::number(oldTorrent.value("max_ratio", -2).toReal()));
+            resumeData["qBt-label"] = Utils::String::toStdString(oldTorrent.value("label").toString());
+            resumeData["qBt-name"] = Utils::String::toStdString(oldTorrent.value("name").toString());
+            resumeData["qBt-seedStatus"] = oldTorrent.value("seed").toBool();
+            resumeData["qBt-tempPathDisabled"] = false;
+
+            QString filename = QString("%1.fastresume.%2").arg(hash).arg(++maxPrio);
+            QString filepath = backupFolderDir.absoluteFilePath(filename);
+
+            QFile resumeFile(filepath);
+            QVector<char> out;
+            libtorrent::bencode(std::back_inserter(out), resumeData);
+            if (resumeFile.open(QIODevice::WriteOnly))
+                resumeFile.write(&out[0], out.size());
+        }
+    }
+
+    if (!oldResumeWasEmpty) {
+        int counter = 0;
+        QString backupResumeFilename = oldResumeFilename + ".bak";
+
+        while (QFile::exists(backupResumeFilename)) {
+            ++counter;
+            backupResumeFilename = oldResumeFilename + ".bak" + QString::number(counter);
+        }
+
+        QFile::rename(oldResumeFilename, backupResumeFilename);
     }
 
     return true;

src/base/base.pri

@@ -36,13 +36,22 @@ HEADERS += \
     $$PWD/bittorrent/private/bandwidthscheduler.h \
     $$PWD/bittorrent/private/filterparserthread.h \
     $$PWD/bittorrent/private/statistics.h \
+    $$PWD/rss/rssmanager.h \
+    $$PWD/rss/rssfeed.h \
+    $$PWD/rss/rssfolder.h \
+    $$PWD/rss/rssfile.h \
+    $$PWD/rss/rssarticle.h \
+    $$PWD/rss/rssdownloadrule.h \
+    $$PWD/rss/rssdownloadrulelist.h \
+    $$PWD/rss/private/rssparser.h \
     $$PWD/utils/fs.h \
     $$PWD/utils/gzip.h \
     $$PWD/utils/misc.h \
     $$PWD/utils/string.h \
     $$PWD/unicodestrings.h \
     $$PWD/torrentfilter.h \
-    $$PWD/scanfoldersmodel.h
+    $$PWD/scanfoldersmodel.h \
+    $$PWD/searchengine.h
 
 SOURCES += \
     $$PWD/tristatebool.cpp \
@@ -78,9 +87,18 @@ SOURCES += \
     $$PWD/bittorrent/private/bandwidthscheduler.cpp \
     $$PWD/bittorrent/private/filterparserthread.cpp \
     $$PWD/bittorrent/private/statistics.cpp \
+    $$PWD/rss/rssmanager.cpp \
+    $$PWD/rss/rssfeed.cpp \
+    $$PWD/rss/rssfolder.cpp \
+    $$PWD/rss/rssarticle.cpp \
+    $$PWD/rss/rssdownloadrule.cpp \
+    $$PWD/rss/rssdownloadrulelist.cpp \
+    $$PWD/rss/rssfile.cpp \
+    $$PWD/rss/private/rssparser.cpp \
     $$PWD/utils/fs.cpp \
     $$PWD/utils/gzip.cpp \
     $$PWD/utils/misc.cpp \
     $$PWD/utils/string.cpp \
     $$PWD/torrentfilter.cpp \
-    $$PWD/scanfoldersmodel.cpp
+    $$PWD/scanfoldersmodel.cpp \
+    $$PWD/searchengine.cpp

src/base/bittorrent/magneturi.cpp

@@ -30,7 +30,7 @@
 #include <libtorrent/error_code.hpp>
 #include <libtorrent/magnet_uri.hpp>
 
-#include "core/utils/string.h"
+#include "base/utils/string.h"
 #include "magneturi.h"
 
 namespace libt = libtorrent;

src/base/bittorrent/peerinfo.cpp

@@ -26,9 +26,10 @@
  * exception statement from your version.
  */
 
-#include "core/net/geoipmanager.h"
+#include "base/net/geoipmanager.h"
-#include "core/utils/string.h"
+#include "base/utils/string.h"
-#include "core/unicodestrings.h"
+#include "base/unicodestrings.h"
+#include "base/bittorrent/torrenthandle.h"
 #include "peerinfo.h"
 
 namespace libt = libtorrent;
@@ -49,9 +50,11 @@ PeerAddress::PeerAddress(QHostAddress ip, ushort port)
 
 // PeerInfo
 
-PeerInfo::PeerInfo(const libt::peer_info &nativeInfo)
+PeerInfo::PeerInfo(const TorrentHandle *torrent, const libt::peer_info &nativeInfo)
     : m_nativeInfo(nativeInfo)
 {
+    calcRelevance(torrent);
+    determineFlags();
 }
 
 bool PeerInfo::fromDHT() const
@@ -253,3 +256,160 @@ QString PeerInfo::connectionType() const
 
     return connection;
 }
+
+void PeerInfo::calcRelevance(const TorrentHandle *torrent)
+{
+    const QBitArray &allPieces = torrent->pieces();
+    const QBitArray &peerPieces = pieces();
+
+    int localMissing = 0;
+    int remoteHaves = 0;
+
+    for (int i = 0; i < allPieces.size(); ++i) {
+        if (!allPieces[i]) {
+            ++localMissing;
+            if (peerPieces[i])
+                ++remoteHaves;
+        }
+    }
+
+    if (localMissing == 0)
+        m_relevance = 0.0;
+    else
+        m_relevance = static_cast<qreal>(remoteHaves) / localMissing;
+}
+
+qreal PeerInfo::relevance() const
+{
+    return m_relevance;
+}
+
+void PeerInfo::determineFlags()
+{
+    if (isInteresting()) {
+        //d = Your client wants to download, but peer doesn't want to send (interested and choked)
+        if (isRemoteChocked()) {
+            m_flags += "d ";
+            m_flagsDescription += tr("interested(local) and choked(peer)");
+            m_flagsDescription += ", ";
+        }
+        else {
+            //D = Currently downloading (interested and not choked)
+            m_flags += "D ";
+            m_flagsDescription += tr("interested(local) and unchoked(peer)");
+            m_flagsDescription += ", ";
+        }
+    }
+
+    if (isRemoteInterested()) {
+        //u = Peer wants your client to upload, but your client doesn't want to (interested and choked)
+        if (isChocked()) {
+            m_flags += "u ";
+            m_flagsDescription += tr("interested(peer) and choked(local)");
+            m_flagsDescription += ", ";
+        }
+        else {
+            //U = Currently uploading (interested and not choked)
+            m_flags += "U ";
+            m_flagsDescription += tr("interested(peer) and unchoked(local)");
+            m_flagsDescription += ", ";
+        }
+    }
+
+    //O = Optimistic unchoke
+    if (optimisticUnchoke()) {
+        m_flags += "O ";
+        m_flagsDescription += tr("optimistic unchoke");
+        m_flagsDescription += ", ";
+    }
+
+    //S = Peer is snubbed
+    if (isSnubbed()) {
+        m_flags += "S ";
+        m_flagsDescription += tr("peer snubbed");
+        m_flagsDescription += ", ";
+    }
+
+    //I = Peer is an incoming connection
+    if (!isLocalConnection()) {
+        m_flags += "I ";
+        m_flagsDescription += tr("incoming connection");
+        m_flagsDescription += ", ";
+    }
+
+    //K = Peer is unchoking your client, but your client is not interested
+    if (!isRemoteChocked() && !isInteresting()) {
+        m_flags += "K ";
+        m_flagsDescription += tr("not interested(local) and unchoked(peer)");
+        m_flagsDescription += ", ";
+    }
+
+    //? = Your client unchoked the peer but the peer is not interested
+    if (!isChocked() && !isRemoteInterested()) {
+        m_flags += "? ";
+        m_flagsDescription += tr("not interested(peer) and unchoked(local)");
+        m_flagsDescription += ", ";
+    }
+
+    //X = Peer was included in peerlists obtained through Peer Exchange (PEX)
+    if (fromPeX()) {
+        m_flags += "X ";
+        m_flagsDescription += tr("peer from PEX");
+        m_flagsDescription += ", ";
+    }
+
+    //H = Peer was obtained through DHT
+    if (fromDHT()) {
+        m_flags += "H ";
+        m_flagsDescription += tr("peer from DHT");
+        m_flagsDescription += ", ";
+    }
+
+    //E = Peer is using Protocol Encryption (all traffic)
+    if (isRC4Encrypted()) {
+        m_flags += "E ";
+        m_flagsDescription += tr("encrypted traffic");
+        m_flagsDescription += ", ";
+    }
+
+    //e = Peer is using Protocol Encryption (handshake)
+    if (isPlaintextEncrypted()) {
+        m_flags += "e ";
+        m_flagsDescription += tr("encrypted handshake");
+        m_flagsDescription += ", ";
+    }
+
+    //P = Peer is using uTorrent uTP
+
+    if (useUTPSocket()) {
+        m_flags += "P ";
+        m_flagsDescription += QString::fromUtf8(C_UTP);
+        m_flagsDescription += ", ";
+    }
+
+    //L = Peer is local
+    if (fromLSD()) {
+        m_flags += "L";
+        m_flagsDescription += tr("peer from LSD");
+    }
+
+    m_flags = m_flags.trimmed();
+    m_flagsDescription = m_flagsDescription.trimmed();
+    if (m_flagsDescription.endsWith(',', Qt::CaseInsensitive))
+        m_flagsDescription.chop(1);
+}
+
+QString PeerInfo::flags() const
+{
+    return m_flags;
+}
+
+QString PeerInfo::flagsDescription() const
+{
+    return m_flagsDescription;
+}
+
+int PeerInfo::downloadingPieceIndex() const
+{
+    return m_nativeInfo.downloading_piece_index;
+}

src/base/bittorrent/peerinfo.h

@@ -33,9 +33,12 @@
 
 #include <QHostAddress>
 #include <QBitArray>
+#include <QCoreApplication>
 
 namespace BitTorrent
 {
+    class TorrentHandle;
+
     struct PeerAddress
     {
         QHostAddress ip;
@@ -47,8 +50,10 @@ namespace BitTorrent
 
     class PeerInfo
     {
+        Q_DECLARE_TR_FUNCTIONS(PeerInfo)
+
     public:
-        PeerInfo(const libtorrent::peer_info &nativeInfo);
+        PeerInfo(const TorrentHandle *torrent, const libtorrent::peer_info &nativeInfo);
 
         bool fromDHT() const;
         bool fromPeX() const;
@@ -89,12 +94,22 @@ namespace BitTorrent
         qlonglong totalDownload() const;
         QBitArray pieces() const;
         QString connectionType() const;
+        qreal relevance() const;
+        QString flags() const;
+        QString flagsDescription() const;
 #ifndef DISABLE_COUNTRIES_RESOLUTION
         QString country() const;
 #endif
+        int downloadingPieceIndex() const;
 
     private:
+        void calcRelevance(const TorrentHandle *torrent);
+        void determineFlags();
+
         libtorrent::peer_info m_nativeInfo;
+        qreal m_relevance;
+        QString m_flags;
+        QString m_flagsDescription;
     };
 }
 

src/base/bittorrent/private/bandwidthscheduler.cpp

@@ -31,7 +31,7 @@
 #include <QTime>
 #include <QDateTime>
 
-#include "core/preferences.h"
+#include "base/preferences.h"
 #include "bandwidthscheduler.h"
 
 BandwidthScheduler::BandwidthScheduler(QObject *parent)

src/base/bittorrent/private/filterparserthread.cpp

@@ -36,7 +36,7 @@
 #include <libtorrent/session.hpp>
 #include <libtorrent/ip_filter.hpp>
 
-#include "core/logger.h"
+#include "base/logger.h"
 #include "filterparserthread.h"
 
 namespace libt = libtorrent;

src/base/bittorrent/private/statistics.cpp

@@ -2,10 +2,10 @@
 
 #include <libtorrent/session.hpp>
 
-#include "core/qinisettings.h"
+#include "base/qinisettings.h"
-#include "core/preferences.h"
+#include "base/preferences.h"
-#include "core/bittorrent/sessionstatus.h"
+#include "base/bittorrent/sessionstatus.h"
-#include "core/bittorrent/session.h"
+#include "base/bittorrent/session.h"
 #include "statistics.h"
 
 static const qint64 SAVE_INTERVAL = 15 * 60 * 1000;
@@ -83,7 +83,7 @@ void Statistics::load()
     // Don't forget to remove:
     // 1. Preferences::getStats()
     // 2. Preferences::removeStats()
-    // 3. #include "core/preferences.h"
+    // 3. #include "base/preferences.h"
     Preferences* const pref = Preferences::instance();
     QIniSettings s("qBittorrent", "qBittorrent-data");
     QVariantHash v = pref->getStats();

src/base/bittorrent/session.cpp

@@ -62,21 +62,17 @@ using namespace BitTorrent;
 #include <libtorrent/extensions/smart_ban.hpp>
 //#include <libtorrent/extensions/metadata_transfer.hpp>
 
-#ifndef DISABLE_COUNTRIES_RESOLUTION
+#include "base/utils/misc.h"
-#include "core/net/geoipmanager.h"
+#include "base/utils/fs.h"
-#endif
+#include "base/utils/string.h"
-
+#include "base/unicodestrings.h"
-#include "core/utils/misc.h"
+#include "base/logger.h"
-#include "core/utils/fs.h"
+#include "base/preferences.h"
-#include "core/utils/string.h"
+#include "base/torrentfilter.h"
-#include "core/unicodestrings.h"
+#include "base/net/downloadmanager.h"
-#include "core/logger.h"
+#include "base/net/downloadhandler.h"
-#include "core/preferences.h"
+#include "base/net/portforwarder.h"
-#include "core/torrentfilter.h"
+#include "base/utils/string.h"
-#include "core/net/downloadmanager.h"
-#include "core/net/downloadhandler.h"
-#include "core/net/portforwarder.h"
-#include "core/utils/string.h"
 #include "private/filterparserthread.h"
 #include "private/statistics.h"
 #include "private/bandwidthscheduler.h"
@@ -466,7 +462,8 @@ void Session::configure()
         m_torrentExportEnabled = torrentExportEnabled;
         if (m_torrentExportEnabled) {
             qDebug("Torrent export is enabled, exporting the current torrents");
-            exportTorrentFiles(pref->getTorrentExportDir());
+            for (auto torrent: m_torrents)
+                exportTorrentFile(torrent);
         }
     }
 
@@ -575,7 +572,7 @@ void Session::configure()
     m_nativeSession->set_pe_settings(encryptionSettings);
 
     // * Add trackers
-    m_additionalTrackers.empty();
+    m_additionalTrackers.clear();
     if (pref->isAddTrackersEnabled()) {
         foreach (QString tracker, pref->getTrackersList().split("\n")) {
             tracker = tracker.trimmed();
@@ -967,6 +964,10 @@ bool Session::addTorrent(QString source, const AddTorrentParams &params)
         qDebug("Converting bc link to magnet link");
         source = Utils::Misc::bcLinkToMagnet(source);
     }
+    else if (((source.size() == 40) && !source.contains(QRegExp("[^0-9A-Fa-f]")))
+             || ((source.size() == 32) && !source.contains(QRegExp("[^2-7A-Za-z]")))) {
+        source = "magnet:?xt=urn:btih:" + source;
+    }
 
     if (Utils::Misc::isUrl(source)) {
         Logger::instance()->addMessage(tr("Downloading '%1', please wait...", "e.g: Downloading 'xxx.torrent', please wait...").arg(source));
@@ -1151,57 +1152,22 @@ void Session::exportTorrentFile(TorrentHandle *const torrent, TorrentExportFolde
     Q_ASSERT(((folder == TorrentExportFolder::Regular) && m_torrentExportEnabled) ||
              ((folder == TorrentExportFolder::Finished) && m_finishedTorrentExportEnabled));
 
+    QString validName = Utils::Fs::toValidFileSystemName(torrent->name());
     QString torrentFilename = QString("%1.torrent").arg(torrent->hash());
+    QString torrentExportFilename = QString("%1.torrent").arg(validName);
     QString torrentPath = QDir(m_resumeFolderPath).absoluteFilePath(torrentFilename);
     QDir exportPath(folder == TorrentExportFolder::Regular ? Preferences::instance()->getTorrentExportDir() : Preferences::instance()->getFinishedTorrentExportDir());
     if (exportPath.exists() || exportPath.mkpath(exportPath.absolutePath())) {
-        QString newTorrentPath = exportPath.absoluteFilePath(torrentFilename);
+        QString newTorrentPath = exportPath.absoluteFilePath(torrentExportFilename);
-        if (QFile::exists(newTorrentPath) && Utils::Fs::sameFiles(torrentPath, newTorrentPath)) {
+        int counter = 0;
-            // Append hash to torrent name to make it unique
+        while (QFile::exists(newTorrentPath) && !Utils::Fs::sameFiles(torrentPath, newTorrentPath)) {
-            newTorrentPath = exportPath.absoluteFilePath(torrent->name() + "-" + torrentFilename);
+            // Append number to torrent name to make it unique
-        }
+            torrentExportFilename = QString("%1 %2.torrent").arg(validName).arg(++counter);
-        QFile::copy(torrentPath, newTorrentPath);
+            newTorrentPath = exportPath.absoluteFilePath(torrentExportFilename);
-    }
-}
-
-void Session::exportTorrentFiles(QString path)
-{
-    // NOTE: Maybe create files from current metadata here?
-    Q_ASSERT(m_torrentExportEnabled);
-
-    QDir exportDir(path);
-    if (!exportDir.exists()) {
-        if (!exportDir.mkpath(exportDir.absolutePath())) {
-            Logger::instance()->addMessage(tr("Error: Could not create torrent export directory: '%1'").arg(exportDir.absolutePath()), Log::CRITICAL);
-            return;
-        }
-    }
-
-    QDir resumeDataDir(m_resumeFolderPath);
-    foreach (TorrentHandle *const torrent, m_torrents) {
-        if (!torrent->isValid()) {
-            Logger::instance()->addMessage(tr("Torrent Export: torrent is invalid, skipping..."), Log::CRITICAL);
-            continue;
         }
 
-        const QString srcPath(resumeDataDir.absoluteFilePath(QString("%1.torrent").arg(torrent->hash())));
+        if (!QFile::exists(newTorrentPath))
-        if (QFile::exists(srcPath)) {
+            QFile::copy(torrentPath, newTorrentPath);
-            QString dstPath = exportDir.absoluteFilePath(QString("%1.torrent").arg(torrent->name()));
-            if (QFile::exists(dstPath)) {
-                if (!Utils::Fs::sameFiles(srcPath, dstPath)) {
-                    dstPath = exportDir.absoluteFilePath(QString("%1-%2.torrent").arg(torrent->name()).arg(torrent->hash()));
-                }
-                else {
-                    qDebug("Torrent Export: Destination file exists, skipping...");
-                    continue;
-                }
-            }
-            qDebug("Export Torrent: %s -> %s", qPrintable(srcPath), qPrintable(dstPath));
-            QFile::copy(srcPath, dstPath);
-        }
-        else {
-            Logger::instance()->addMessage(tr("Error: could not export torrent '%1', maybe it has not metadata yet.").arg(torrent->hash()), Log::CRITICAL);
-        }
     }
 }
 
@@ -1433,6 +1399,8 @@ void Session::networkOnlineStateChanged(const bool online)
 void Session::networkConfigurationChange(const QNetworkConfiguration& cfg)
 {
     const QString configuredInterfaceName = Preferences::instance()->getNetworkInterface();
+    // Empty means "Any Interface". In this case libtorrent has binded to 0.0.0.0 so any change to any interface will
+    // be automatically picked up. Otherwise we would rebinding here to 0.0.0.0 again.
     if (configuredInterfaceName.isEmpty())
         return;
     const QString changedInterface = cfg.name();
@@ -1511,7 +1479,7 @@ void Session::setListeningPort()
             m_nativeSession->listen_on(ports, ec, 0, libt::session::listen_no_system_port);
 
             if (ec)
-                logger->addMessage(tr("qBittorrent failed to listen on any interface port: %1. Reason: %2", "e.g: qBittorrent failed to listen on any interface port: TCP/6881. Reason: no such interface" ).arg(QString::number(port)).arg(Utils::String::fromStdString(ec.message())), Log::CRITICAL);
+                logger->addMessage(tr("qBittorrent failed to listen on any interface port: %1. Reason: %2.", "e.g: qBittorrent failed to listen on any interface port: TCP/6881. Reason: no such interface" ).arg(QString::number(port)).arg(QString::fromLocal8Bit(ec.message().c_str())), Log::CRITICAL);
 
             return;
         }
@@ -1996,7 +1964,7 @@ void Session::getPendingAlerts(QVector<libt::alert *> &out, ulong time)
 
     QMutexLocker lock(&m_alertsMutex);
 
-    while (m_alerts.empty())
+    if (m_alerts.empty())
         m_alertsWaitCondition.wait(&m_alertsMutex, time);
 
     m_alerts.swap(out);
@@ -2304,10 +2272,10 @@ void Session::handleListenFailedAlert(libt::listen_failed_alert *p)
         proto = "SOCKS5";
     qDebug() << "Failed listening on " << proto << p->endpoint.address().to_string(ec).c_str() << "/" << p->endpoint.port();
     Logger::instance()->addMessage(
-                tr("qBittorrent failed listening on interface %1 port: %2/%3. Reason: %4",
+                tr("qBittorrent failed listening on interface %1 port: %2/%3. Reason: %4.",
                    "e.g: qBittorrent failed listening on interface 192.168.0.1 port: TCP/6881. Reason: already in use")
                 .arg(p->endpoint.address().to_string(ec).c_str()).arg(proto).arg(QString::number(p->endpoint.port()))
-                .arg(Utils::String::fromStdString(p->error.message())), Log::CRITICAL);
+                .arg(QString::fromLocal8Bit(p->error.message().c_str())), Log::CRITICAL);
 }
 
 void Session::handleExternalIPAlert(libt::external_ip_alert *p)
@@ -2368,7 +2336,7 @@ bool loadTorrentResumeData(const QByteArray &data, AddTorrentData &out, MagnetUr
     libt::lazy_entry fast;
     libt::error_code ec;
     libt::lazy_bdecode(data.constData(), data.constData() + data.size(), fast, ec);
-    if ((fast.type() != libt::lazy_entry::dict_t) && !ec) return false;
+    if (ec || (fast.type() != libt::lazy_entry::dict_t)) return false;
 
     out.savePath = Utils::Fs::fromNativePath(Utils::String::fromStdString(fast.dict_find_string_value("qBt-savePath")));
     out.ratioLimit = Utils::String::fromStdString(fast.dict_find_string_value("qBt-ratioLimit")).toDouble();

src/base/bittorrent/session.h

@@ -38,8 +38,8 @@
 #include <QWaitCondition>
 #include <QNetworkConfigurationManager>
 
-#include "core/tristatebool.h"
+#include "base/tristatebool.h"
-#include "core/types.h"
+#include "base/types.h"
 #include "torrentinfo.h"
 
 namespace libtorrent
@@ -293,7 +293,6 @@ namespace BitTorrent
 
         void updateRatioTimer();
         void exportTorrentFile(TorrentHandle *const torrent, TorrentExportFolder folder = TorrentExportFolder::Regular);
-        void exportTorrentFiles(QString path);
         void saveTorrentResumeData(TorrentHandle *const torrent);
 
         void handleAlert(libtorrent::alert *a);

src/base/bittorrent/torrentcreatorthread.cpp

@@ -43,9 +43,9 @@
 #include <iostream>
 #include <fstream>
 
-#include "core/utils/fs.h"
+#include "base/utils/fs.h"
-#include "core/utils/misc.h"
+#include "base/utils/misc.h"
-#include "core/utils/string.h"
+#include "base/utils/string.h"
 #include "torrentcreatorthread.h"
 
 namespace libt = libtorrent;
@@ -60,6 +60,9 @@ bool fileFilter(const std::string &f)
 
 TorrentCreatorThread::TorrentCreatorThread(QObject *parent)
     : QThread(parent)
+    , m_private(false)
+    , m_pieceSize(0)
+    , m_abort(false)
 {
 }
 

src/base/bittorrent/torrenthandle.cpp

@@ -43,14 +43,14 @@
 #include <boost/bind.hpp>
 
 #ifdef Q_OS_WIN
-#include <Windows.h>
+#include <windows.h>
 #endif
 
-#include "core/logger.h"
+#include "base/logger.h"
-#include "core/preferences.h"
+#include "base/preferences.h"
-#include "core/utils/string.h"
+#include "base/utils/string.h"
-#include "core/utils/fs.h"
+#include "base/utils/fs.h"
-#include "core/utils/misc.h"
+#include "base/utils/misc.h"
 #include "session.h"
 #include "peerinfo.h"
 #include "trackerentry.h"
@@ -960,7 +960,7 @@ QList<PeerInfo> TorrentHandle::peers() const
     SAFE_CALL(get_peer_info, nativePeers);
 
     foreach (const libt::peer_info &peer, nativePeers)
-        peers << peer;
+        peers << PeerInfo(this, peer);
 
     return peers;
 }
@@ -1364,10 +1364,13 @@ void TorrentHandle::handleTorrentCheckedAlert(libtorrent::torrent_checked_alert
     qDebug("%s have just finished checking", qPrintable(hash()));
 
     updateStatus();
-    adjustActualSavePath();
 
-    if (progress() < 1.0 && wantedSize() > 0)
+    if ((progress() < 1.0) && (wantedSize() > 0))
         m_hasSeedStatus = false;
+    else if (progress() == 1.0)
+        m_hasSeedStatus = true;
+
+    adjustActualSavePath();
 
     if (m_pauseAfterRecheck) {
         m_pauseAfterRecheck = false;
@@ -1694,7 +1697,7 @@ bool TorrentHandle::isMoveInProgress() const
 
 bool TorrentHandle::useTempPath() const
 {
-    return !m_tempPathDisabled && m_session->isTempPathEnabled() && !isSeed();
+    return !m_tempPathDisabled && m_session->isTempPathEnabled() && !(isSeed() || m_hasSeedStatus);
 }
 
 void TorrentHandle::updateStatus()

src/base/bittorrent/torrenthandle.h

@@ -40,7 +40,7 @@
 #include <libtorrent/torrent_handle.hpp>
 #include <boost/function.hpp>
 
-#include "core/tristatebool.h"
+#include "base/tristatebool.h"
 #include "private/speedmonitor.h"
 #include "infohash.h"
 #include "torrentinfo.h"