Bump to 3.3.3

There's a bug that causes frequent crashes.
Issue #4597.

.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=false
-    - lt_branch=RC_1_0 gui=true qt=4
-    - lt_branch=RC_1_0 gui=true qt=5
-    - lt_branch=RC_1_0 gui=false qt=4
-    - lt_branch=RC_1_0 gui=false qt=5
+    #- lt_branch=dist gui=true
+    #- lt_branch=dist gui=false
+    - lt_branch=RC_1_0 qt=5 gui=true
+    - lt_branch=RC_1_0 qt=5 gui=false
+    - lt_branch=RC_1_0 qt=4 gui=true
+    - 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" ] && [ "$qt" = 4 ]; then brew install qt; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ] && [ "$qt" = 5 ]; then brew install qt5 && brew link --force qt5; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update > /dev/null && brew install colormake libtorrent-rasterbar ; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" -a "$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,75 @@
+* Thu Jan 21 2016 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.3.3
+    - BUGFIX: Temporarily disable "filename" column of peers view. It has a bug that causes frequent crashes. See issue #4597.
+    - WEBUI: Move style of dynamic table header to CSS (buinsky)
+    - WEBUI: Fix unnecessary updates of torrent peers table (buinsky)
+
+* 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.3</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."