Bump to 4.3.1

> Using the specific major action version allows you to receive critical
> fixes and security patches while still maintaining compatibility. It
> also assures that your workflow should still work.
https://docs.github.com/en/free-pro-team@latest/actions/reference/workflow-syntax-for-github-actions#jobsjob_idstepsuses

.github/ISSUE_TEMPLATE.md

@@ -17,4 +17,3 @@
 
 ### Extra info(if any)
 (type here)
-

.github/workflows/ci.yaml

@@ -0,0 +1,244 @@
+name: GitHub Actions CI
+
+# Cache is used for all Windows and macOS dependencies (size approx. 1230 * 2 + 1850 = 4310 MiB)
+# Cache is not used for Ubuntu builds, because it already has all dependencies except
+# the appropriate libtorrent version, which only takes 3-5 minutes to build from source anyway
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    types: [edited, opened, reopened, synchronize]
+    branches: [ master ]
+
+env:
+  # Qt: 5.15.0
+  # libtorrent: RC_1_2 HEAD, 1.2.10
+  VCPKG_COMMIT: 32eccc18191fbb57b159784a1724d2d00613ae82
+  VCPKG_DEST_MACOS: /Users/runner/qbt_tools/vcpkg
+  VCPKG_DEST_WIN: C:\qbt_tools\vcpkg
+  LIBTORRENT_VERSION_TAG: libtorrent-1.2.10
+
+jobs:
+
+  ci_ubuntu:
+    name: Ubuntu
+
+    strategy:
+      matrix:
+        os: [ubuntu-20.04, ubuntu-18.04]
+        qbt_gui: ["GUI=ON", "GUI=OFF"]
+      fail-fast: false
+
+    runs-on: ${{ matrix.os }}
+
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+    - name: checkout repository
+      uses: actions/checkout@v2
+
+    - name: install all build dependencies except libtorrent from Ubuntu repos
+      run: |
+        sudo apt update
+        sudo apt install \
+          build-essential cmake git ninja-build pkg-config \
+          libssl-dev libgeoip-dev zlib1g-dev \
+          libboost-dev libboost-chrono-dev libboost-random-dev libboost-system-dev \
+          libqt5svg5-dev qtbase5-dev qttools5-dev
+
+    - name: install libtorrent from source
+      run: |
+        git clone https://github.com/arvidn/libtorrent && cd libtorrent
+        git checkout ${{ env.LIBTORRENT_VERSION_TAG }}
+        cmake -B cmake-build-dir -G "Ninja" \
+          -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+          -Ddeprecated-functions=OFF \
+          --graphviz=cmake-build-dir/target_graph.dot
+        cmake --build cmake-build-dir
+        sudo cmake --install cmake-build-dir --prefix /usr/local
+
+    - name: build qBittorrent
+      run: |
+        cmake -B build -G "Ninja" \
+          -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+          -D${{ matrix.qbt_gui }} \
+          -DVERBOSE_CONFIGURE=ON \
+          --graphviz=build/target_graph.dot
+        cmake --build build
+
+    - name: upload artifact as zip
+      uses: actions/upload-artifact@v2
+      with:
+        name: qBittorrent-CI-Ubuntu_${{ matrix.os }}-${{ matrix.qbt_gui }}
+        path: |
+          build/compile_commands.json
+          build/target_graph.dot
+          build/qbittorrent
+          build/qbittorrent-nox
+          libtorrent/cmake-build-dir/compile_commands.json
+          libtorrent/cmake-build-dir/target_graph.dot
+
+  ci_windows:
+    name: Windows + vcpkg
+
+    runs-on: windows-2019
+
+    defaults:
+      run:
+        shell: pwsh
+
+    steps:
+    - name: checkout repository
+      uses: actions/checkout@v2
+
+    # - ninja is needed for building qBittorrent (because it's preferrable, not a hard requirement)
+    - name: install additional required packages with chocolatey
+      run: |
+        choco install ninja
+
+    - name: setup vcpkg (cached, if possible)
+      uses: lukka/run-vcpkg@v4
+      with:
+        vcpkgDirectory: ${{ env.VCPKG_DEST_WIN }}
+        vcpkgGitCommitId: ${{ env.VCPKG_COMMIT }}
+        setupOnly: true
+
+    # Tell vcpkg to only build Release variants of the dependencies
+    - name: configure vcpkg triplet overlay for release builds only
+      run: |
+        New-Item -Path ${{ github.workspace }} -Name "triplets_overlay" -ItemType Directory
+        Copy-Item ${{ env.RUNVCPKG_VCPKG_ROOT }}/triplets/x64-windows-static.cmake `
+          ${{ github.workspace }}/triplets_overlay/x64-windows-static-release.cmake
+        Add-Content ${{ github.workspace }}/triplets_overlay/x64-windows-static-release.cmake `
+          -Value "set(VCPKG_BUILD_TYPE release)"
+
+    # clear buildtrees after each package installation to reduce disk space requirements
+    - name: install dependencies via vcpkg
+      run: |
+        $packages = `
+          "boost-circular-buffer:x64-windows-static-release",
+          "libtorrent:x64-windows-static-release",
+          "qt5-base:x64-windows-static-release",
+          "qt5-svg:x64-windows-static-release",
+          "qt5-tools:x64-windows-static-release",
+          "qt5-winextras:x64-windows-static-release"
+        foreach($package in $packages)
+        {
+          ${{ env.RUNVCPKG_VCPKG_ROOT }}/vcpkg.exe install $package `
+            --overlay-triplets=${{ github.workspace }}/triplets_overlay `
+            --clean-after-build
+        }
+
+    # NOTE: this is necessary to correctly find and use cl.exe with the Ninja generator for now
+    - name: setup devcmd
+      uses: ilammy/msvc-dev-cmd@v1
+
+    - name: build qBittorrent
+      shell: cmd
+      run: |
+        cmake -B build -G "Ninja" ^
+          -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo ^
+          -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_DEST_WIN }}\scripts\buildsystems\vcpkg.cmake ^
+          -DVCPKG_TARGET_TRIPLET=x64-windows-static-release ^
+          -DVERBOSE_CONFIGURE=ON ^
+          -DMSVC_RUNTIME_DYNAMIC=OFF ^
+          --graphviz=build\target_graph.dot
+        cmake --build build
+
+    - name: upload artifact as zip
+      uses: actions/upload-artifact@v2
+      with:
+        name: qBittorrent-CI-Windows_x64-static-release
+        path: |
+          build/compile_commands.json
+          build/target_graph.dot
+          build/qbittorrent.exe
+          build/qbittorrent.pdb
+          dist/windows/qt.conf
+
+  ci_macos:
+    name: macOS + vcpkg
+
+    strategy:
+      matrix:
+        qbt_gui: ["GUI=ON", "GUI=OFF"]
+      fail-fast: false
+
+    runs-on: macos-10.15
+
+    defaults:
+      run:
+        shell: pwsh
+
+    steps:
+    - name: checkout repository
+      uses: actions/checkout@v2
+
+    # - ninja is needed for building qBittorrent (because it's preferrable, not a hard requirement)
+    # - pkg-config is needed for some vcpkg installations
+    - name: install additional required packages with homebrew
+      shell: bash
+      run: |
+        brew install ninja pkg-config
+
+    - name: setup vcpkg (cached, if possible)
+      uses: lukka/run-vcpkg@v4
+      with:
+        vcpkgDirectory: ${{ env.VCPKG_DEST_MACOS }}
+        vcpkgGitCommitId: ${{ env.VCPKG_COMMIT }}
+        setupOnly: true
+
+    - name: configure vcpkg triplet overlay for release builds only
+      run: |
+        New-Item -Path ${{ github.workspace }} -Name "triplets_overlay" -ItemType Directory
+        Copy-Item ${{ env.RUNVCPKG_VCPKG_ROOT }}/triplets/x64-osx.cmake `
+          ${{ github.workspace }}/triplets_overlay/x64-osx-release.cmake
+        Add-Content ${{ github.workspace }}/triplets_overlay/x64-osx-release.cmake `
+          -Value "set(VCPKG_BUILD_TYPE release)"
+
+    # NOTE: Avoids a libtorrent ABI issue. See https://github.com/arvidn/libtorrent/issues/4965
+    - name: force AppleClang to compile libtorrent with C++14
+      run: |
+        (Get-Content -path ${{ env.RUNVCPKG_VCPKG_ROOT }}/ports/libtorrent/portfile.cmake).Replace( `
+          '${FEATURE_OPTIONS}', '${FEATURE_OPTIONS} -DCMAKE_CXX_STANDARD=14') `
+          | Set-Content -Path ${{ env.RUNVCPKG_VCPKG_ROOT }}/ports/libtorrent/portfile.cmake
+
+    - name: install dependencies via vcpkg
+      run: |
+        $packages = `
+          "boost-circular-buffer:x64-osx-release",
+          "libtorrent:x64-osx-release",
+          "qt5-base:x64-osx-release",
+          "qt5-svg:x64-osx-release",
+          "qt5-tools:x64-osx-release",
+          "qt5-macextras:x64-osx-release"
+        foreach($package in $packages)
+        {
+          ${{ env.RUNVCPKG_VCPKG_ROOT }}/vcpkg install $package `
+            --overlay-triplets=${{ github.workspace }}/triplets_overlay `
+            --clean-after-build
+        }
+
+    - name: build qBittorrent
+      shell: bash
+      run: |
+        cmake -B build -G "Ninja" -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+          -DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_DEST_MACOS }}/scripts/buildsystems/vcpkg.cmake \
+          -DVCPKG_TARGET_TRIPLET=x64-osx-release \
+          -D${{ matrix.qbt_gui }} \
+          -DVERBOSE_CONFIGURE=ON \
+          --graphviz=build/target_graph.dot
+        cmake --build build
+
+    - name: upload artifact as zip
+      uses: actions/upload-artifact@v2
+      with:
+        name: qBittorrent-CI-macOS_x64-static-release_${{ matrix.qbt_gui }}
+        path: |
+          build/compile_commands.json
+          build/target_graph.dot
+          build/qbittorrent.app
+          build/qbittorrent-nox.app

.github/workflows/file_health.sh

@@ -0,0 +1,75 @@
+#!/usr/bin/env zsh
+
+set -o nounset
+
+# Assumption: file names don't contain `:` (for the `cut` invocation).
+# Safe to assume, as such a character in a filename would cause trouble on Windows, a platform we support
+
+# any regression turn this non-zero
+regressions=0
+
+# exclusions (these are just grep extended regular expressions to match against paths relative to the root of the repository)
+exclusions_nonutf8='(.*(7z|gif|ic(ns|o)|png|qm|zip))'
+exclusions_bom='src/base/unicodestrings.h'
+exclusions_tw='(*.ts)|src/webui/www/private/scripts/lib/mootools-1.2-more.js'
+exclusions_no_lf='(*.ts)|(.*svg)|compile_commands.json|src/webui/www/private/scripts/lib/mootools-1.2-(core-yc.js|more.js)'
+
+echo -e "*** Detect files not encoded in UTF-8 ***\n"
+
+find . -path ./build -prune -false -o -path ./.git -prune -false -o -type f -exec file --mime {} \; | sort \
+    | grep -v -e "charset=us-ascii" -e "charset=utf-8" | cut -d ":" -f 1 \
+    | grep -E -v -e "${exclusions_nonutf8}" \
+    | tee >(echo -e "\n--> Files not encoded in UTF-8: found" "$(wc -l < /dev/stdin)" "regression(s)") \
+    | xargs -I my_input -0 bash -c 'echo "my_input"; test "$(echo -n "my_input" | wc -l)" -eq 0'
+regressions=$((regressions+$?))
+
+echo -e "*** Detect files encoded in UTF-8 with BOM ***\n"
+
+grep --exclude-dir={.git,build} -rIl $'\xEF\xBB\xBF' | sort \
+    | grep -E -v -e "${exclusions_bom}" \
+    | tee >(echo -e "\n--> Files encoded in UTF-8 with BOM: found" "$(wc -l < /dev/stdin)" "regression(s)") \
+    | xargs -I my_input -0 bash -c 'echo "my_input"; test "$(echo -n "my_input" | wc -l)" -eq 0'
+regressions=$((regressions+$?))
+
+echo -e "*** Detect usage of CR byte ***\n"
+
+grep --exclude-dir={.git,build} -rIlU $'\x0D' | sort \
+    | tee >(echo -e "\n--> Usage of CR byte: found" "$(wc -l < /dev/stdin)" "regression(s)") \
+    | xargs -I my_input -0 bash -c 'echo "my_input"; test "$(echo -n "my_input" | wc -l)" -eq 0'
+regressions=$((regressions+$?))
+
+echo -e "*** Detect trailing whitespace in lines ***\n"
+
+grep --exclude-dir={.git,build} -rIl "[[:blank:]]$" | sort \
+    | grep -E -v -e "${exclusions_tw}" \
+    | tee >(echo -e "\n--> Trailing whitespace in lines: found" "$(wc -l < /dev/stdin)" "regression(s)") \
+    | xargs -I my_input -0 bash -c 'echo "my_input"; test "$(echo -n "my_input" | wc -l)" -eq 0';
+regressions=$((regressions+$?))
+
+echo -e "*** Detect too many trailing newlines ***\n"
+
+find . -path ./build -prune -false -o -path ./.git -prune -false -o -type f -exec file --mime {} \; | sort \
+    | grep -e "charset=us-ascii" -e "charset=utf-8" | cut -d ":" -f 1 \
+    | xargs -L1 -I my_input bash -c 'test "$(tail -q -c2 "my_input" | hexdump -C | grep "0a 0a")" && echo "my_input"' \
+    | tee >(echo -e "\n--> Too many trailing newlines: found" "$(wc -l < /dev/stdin)" "regression(s)") \
+    | xargs -I my_input -0 bash -c 'echo "my_input"; test "$(echo -n "my_input" | wc -l)" -eq 0'
+regressions=$((regressions+$?))
+
+echo -e "*** Detect no trailing newline ***\n"
+
+find . -path ./build -prune -false -o -path ./.git -prune -false -o -type f -exec file --mime {} \; | sort \
+    | grep -e "charset=us-ascii" -e "charset=utf-8" |  cut -d ":" -f 1 \
+    | grep -E -v -e "${exclusions_no_lf}" \
+    | xargs -L1 -I my_input bash -c 'test "$(tail -q -c1 "my_input" | hexdump -C | grep "0a")" || echo "my_input"' \
+    | tee >(echo -e "\n--> No trailing newline: found" "$(wc -l < /dev/stdin)" "regression(s)") \
+    | xargs -I my_input -0 bash -c 'echo "my_input"; test "$(echo -n "my_input" | wc -l)" -eq 0'
+regressions=$((regressions+$?))
+
+if [ "$regressions" -ne 0 ]; then
+    regressions=1
+    echo "File health regressions found. Please fix them (or add them as exclusions)."
+else
+    echo "All OK, no file health regressions found."
+fi
+
+exit $regressions;

.github/workflows/file_health.yaml

@@ -0,0 +1,27 @@
+name: GitHub Actions file health check
+
+on:
+  push:
+    branches: [ '**' ]
+  pull_request:
+    types: [edited, opened, reopened, synchronize]
+    branches: [ '**' ]
+
+jobs:
+  check_file_health:
+    name: Check file health
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: checkout repository
+      uses: actions/checkout@v2
+
+    - name: install zsh
+      run: |
+        sudo apt update
+        sudo apt install zsh
+
+    - name: run check file health script
+      run: |
+        ./.github/workflows/file_health.sh

.travis.yml

@@ -4,7 +4,7 @@ os:
   - linux
   - osx
 
-dist: xenial
+dist: bionic
 
 env:
   matrix:
@@ -12,26 +12,10 @@ env:
     - libt_branch=RC_1_2 gui=false build_system=qmake
     - libt_branch=RC_1_2 gui=true build_system=cmake
     - libt_branch=RC_1_2 gui=false build_system=cmake
-    - libt_branch=RC_1_1 gui=true build_system=qmake
-    - libt_branch=RC_1_1 gui=false build_system=qmake
-    - libt_branch=RC_1_1 gui=true build_system=cmake
-    - libt_branch=RC_1_1 gui=false build_system=cmake
   global:
     - secure: "OI9CUjj4lTb0HwwIZU5PbECU3hLlAL6KC8KsbwohG8/O3j5fLcnmDsK4Ad9us5cC39sS11Jcd1kDP2qRcCuST/glVNhLkcjKkiQerOfd5nQ/qL4JYfz/1mfP5mdpz9jHKzpLUIG+TXkbSTjP6VVmsb5KPT+3pKEdRFZB+Pu9+J8="
     - coverity_branch: coverity_scan
 
-matrix:
-  allow_failures:
-    - env: libt_branch=RC_1_2 gui=true build_system=cmake
-    - env: libt_branch=RC_1_2 gui=false build_system=cmake
-    - env: libt_branch=RC_1_1 gui=true build_system=cmake
-    - env: libt_branch=RC_1_1 gui=false build_system=cmake
-
-branches:
-  except:
-    - search_encoding_windows
-    - v2_9_x
-
 notifications:
   email:
     on_success: change
@@ -56,16 +40,15 @@ addons:
     sources:
       # sources list: https://github.com/travis-ci/apt-source-safelist/blob/master/ubuntu.json
       - sourceline: 'ppa:qbittorrent-team/qbt-libtorrent-travisci'
-      - sourceline: 'ppa:beineri/opt-qt59-xenial'
+      - sourceline: 'deb https://apt.kitware.com/ubuntu/ bionic main'
+        key_url: 'https://apt.kitware.com/keys/kitware-archive-latest.asc'
     packages:
       # packages list: https://github.com/travis-ci/apt-package-safelist/blob/master/ubuntu-trusty
-      - [autoconf, automake, colormake]
+      - [autoconf, automake, cmake, colormake]
       - [libboost-dev, libboost-system-dev]
       - libssl-dev
-      - [qt59base, qt59svg, qt59tools]
+      - [qtbase5-dev, libqt5svg5-dev, qttools5-dev]
       - zlib1g-dev
-      # required for Qt 5.9 from 'beineri' PPA
-      - libgl1-mesa-dev
 
 before_install:
   # only allow specific build for coverity scan, others will stop
@@ -82,11 +65,10 @@ before_install:
     if [ "$TRAVIS_OS_NAME" = "linux" ]; then
       # setup virtual display for after_success target
       if [ "$gui" = "true" ]; 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 ;
-
-      # Qt 5.9
-      PATH=/opt/qt59/bin:${PATH}
-      qmake_conf="$qmake_conf PKG_CONFIG_PATH=/opt/qt59/lib/pkgconfig:$PKG_CONFIG_PATH"
-      cmake_conf="$cmake_conf PKG_CONFIG_PATH=/opt/qt59/lib/pkgconfig:$PKG_CONFIG_PATH"
+      # CMake from Kitware is installed in /usr/bin
+      # TravisCI installs its own cmake to another location which ovverides other installations
+      # if they don't call the new binary directly
+      alias cmake="/usr/bin/cmake"
     fi
   - |
     if [ "$TRAVIS_OS_NAME" = "osx" ]; then
@@ -99,7 +81,7 @@ before_install:
   - |
     if [ "$gui" = "false" ]; then
       qmake_conf="$qmake_conf --disable-gui"
-      cmake_conf="$cmake_conf -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Widgets=ON"
+      cmake_conf="$cmake_conf -DGUI=OFF"
     fi
 
   # print settings
@@ -116,6 +98,7 @@ install:
       PATH="/usr/local/opt/ccache/libexec:$PATH"
 
       brew update > /dev/null
+      brew upgrade cmake
       brew install ccache colormake boost openssl qt zlib
       brew link --force qt zlib
 
@@ -130,78 +113,24 @@ install:
       ccache -M 512M
       ccache -V && ccache --show-stats && ccache --zero-stats
     fi
-  - |
-    if [ "$libt_branch" = "RC_1_1" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then
-      wget https://builds.shiki.hu/travis/deb/version
-      if ! cmp --quiet "version" "$HOME/travis/deb/version" ; then
-        echo "Cached files are different from server. Downloading new ones."
-        # First delete old files
-        rm -r "$HOME/travis/deb"
-        mkdir "$HOME/travis/deb"
-        cp "version" $HOME/travis/deb
-        cd "$HOME/travis/deb"
-        wget https://builds.shiki.hu/travis/deb/libtorrent-rasterbar-dev_1.1.x_amd64.deb
-        wget https://builds.shiki.hu/travis/deb/libtorrent-rasterbar9_1.1.x_amd64.deb
-      fi
-
-      sudo dpkg -i "$HOME/travis/deb/libtorrent-rasterbar-dev_1.1.x_amd64.deb" "$HOME/travis/deb/libtorrent-rasterbar9_1.1.x_amd64.deb"
-    fi
   - |
     if [ "$libt_branch" = "RC_1_2" ] && [ "$TRAVIS_OS_NAME" = "linux" ]; then
       # Will install latest 1.2.x daily build from the PPA
       sudo apt-get -y install libtorrent-rasterbar-dev
     fi
-  - |
-    if [ "$libt_branch" = "RC_1_1" ] && [ "$TRAVIS_OS_NAME" = "osx" ]; then
-      wget https://builds.shiki.hu/travis/brew/1_1/version
-      if ! cmp --quiet "version" "$HOME/travis/brew/1_1/version" ; then
-        echo "Cached files are different from server. Downloading new ones."
-        # First delete old files
-        rm -r "$HOME/travis/brew/1_1"
-        mkdir "$HOME/travis/brew/1_1"
-        cp "version" $HOME/travis/brew/1_1
-        cd "$HOME/travis/brew/1_1"
-        wget https://builds.shiki.hu/travis/brew/1_1/libtorrent-rasterbar.rb
-        wget https://builds.shiki.hu/travis/brew/1_1/bd36a4b440aa138a88e375c1a3b672f1a1bc6606e7866fc3415b6b98fa49e771--libtorrent-rasterbar-1.1.13.high_sierra.bottle.tar.gz
-      fi
-      # Copy custom libtorrent bottle to homebrew's download cache so it can find and install it
-      # Also install our custom libtorrent formula by passing the local path to it
-      # These 2 files are restored from Travis' cache.
-      cp "$HOME/travis/brew/1_1/bd36a4b440aa138a88e375c1a3b672f1a1bc6606e7866fc3415b6b98fa49e771--libtorrent-rasterbar-1.1.13.high_sierra.bottle.tar.gz" "$(brew --cache)/downloads"
-      brew uninstall libtorrent-rasterbar
-      brew install "$HOME/travis/brew/1_1/libtorrent-rasterbar.rb"
-
-      # NOTE about the bottle name
-      # The part before the "--" characters is a sha256 hash of the string
-      # of the URL homebrew itself would use to download the bottle.
-      # In this case the URL is the following:
-      # http://127.0.0.1/libtorrent-rasterbar-1.1.13.high_sierra.bottle.tar.gz
-    fi
   - |
     if [ "$libt_branch" = "RC_1_2" ] && [ "$TRAVIS_OS_NAME" = "osx" ]; then
-      wget https://builds.shiki.hu/travis/brew/version
-      if ! cmp --quiet "version" "$HOME/travis/brew/version" ; then
-        echo "Cached files are different from server. Downloading new ones."
-        # First delete old files
-        rm -r "$HOME/travis/brew"
-        mkdir "$HOME/travis/brew"
-        cp "version" $HOME/travis/brew
-        cd "$HOME/travis/brew"
-        wget https://builds.shiki.hu/travis/brew/libtorrent-rasterbar.rb
-        wget https://builds.shiki.hu/travis/brew/6e4eb13f70df35e8fc7ff41883fef3e5c7b535dd55c78cd2ce1eae3fb4288e21--libtorrent-rasterbar-1.2.0.high_sierra.bottle.tar.gz
-      fi
-      # Copy custom libtorrent bottle to homebrew's download cache so it can find and install it
-      # Also install our custom libtorrent formula by passing the local path to it
-      # These 2 files are restored from Travis' cache.
-      cp "$HOME/travis/brew/6e4eb13f70df35e8fc7ff41883fef3e5c7b535dd55c78cd2ce1eae3fb4288e21--libtorrent-rasterbar-1.2.0.high_sierra.bottle.tar.gz" "$(brew --cache)/downloads"
-      brew uninstall libtorrent-rasterbar
-      brew install "$HOME/travis/brew/libtorrent-rasterbar.rb"
+      # building libtorrent manually should be faster than using the official bottle
+      # because the bottle will also pull in a lot of updated dependencies and prolong the overall time
+      pushd "$HOME"
+      git clone --single-branch --branch RC_1_2 https://github.com/arvidn/libtorrent.git
+      cd libtorrent
+      git checkout tags/v1.2.10
 
-      # NOTE about the bottle name
-      # The part before the "--" characters is a sha256 hash of the string
-      # of the URL homebrew itself would use to download the bottle.
-      # In this case the URL is the following:
-      # http://127.0.0.1/libtorrent-rasterbar-1.2.0.high_sierra.bottle.tar.gz
+      cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=14 -Ddeprecated-functions=OFF -DOPENSSL_ROOT_DIR="$openssl_root_path" ./
+      make
+      sudo make install
+      popd
     fi
 
 script:
@@ -217,7 +146,8 @@ script:
       mkdir build && cd build
       cmake $cmake_conf ../
     fi
-  - make && make install
+  - make
+  - make install
 
 after_success:
   - if [ "$gui" = "true" ]; then qbt_exe="qbittorrent" ; else qbt_exe="qbittorrent-nox" ; fi

AUTHORS

@@ -62,7 +62,7 @@ Images Authors:
   copyright: Mateusz Tobola <tobejodok@qbittorrent.org>
   license: GPLv2
 
-* file: src/icons/skin/tabs.gif
+* file: src/icons/tabs.gif
   copyright: Greg Houston <gregory.houston@gmail.com>
   license: MIT
 

CMakeLists.txt

@@ -1,60 +1,51 @@
-cmake_minimum_required(VERSION 3.9 FATAL_ERROR)
-
-message(AUTHOR_WARNING "If the build fails, please try the autotools/qmake method.")
-
-if(POLICY CMP0074)
-    cmake_policy(SET CMP0074 NEW)
-endif()
+cmake_minimum_required(VERSION 3.16 FATAL_ERROR) # Policies <= CMP0097 default to NEW
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
-include(FunctionReadVersion)
 
-read_version("${CMAKE_CURRENT_SOURCE_DIR}/version.pri" VER_MAJOR VER_MINOR VER_BUGFIX VER_BUILD VER_STATUS)
-# message(STATUS "Project version is: ${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}.${VER_BUILD} (${VER_STATUS})")
-
-project(qBittorrent VERSION ${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}.${VER_BUILD})
-
-set(PROJECT_VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUGFIX}")
-
-if (NOT VER_BUILD EQUAL 0)
-    set(PROJECT_VERSION "${PROJECT_VERSION}.${VER_BUILD}")
-endif()
-
-set(PROJECT_VERSION "${PROJECT_VERSION}${VER_STATUS}")
-
-add_definitions(-DQBT_VERSION_MAJOR=${VER_MAJOR})
-add_definitions(-DQBT_VERSION_MINOR=${VER_MINOR})
-add_definitions(-DQBT_VERSION_BUGFIX=${VER_BUGFIX})
-add_definitions(-DQBT_VERSION_BUILD=${VER_BUILD})
-
-add_definitions(-DQBT_VERSION="v${PROJECT_VERSION}")
-add_definitions(-DQBT_VERSION_2="${PROJECT_VERSION}")
-
-include(GNUInstallDirs)
-include(FeatureSummary)
+project(qBittorrent
+    VERSION 4.3.1.0
+    DESCRIPTION "The qBittorrent BitTorrent client"
+    HOMEPAGE_URL "https://www.qbittorrent.org/"
+    LANGUAGES CXX
+)
 
+# use CONFIG mode first in find_package
+set(CMAKE_FIND_PACKAGE_PREFER_CONFIG ON)
 # version requirements
 set(requiredBoostVersion 1.40)
 set(requiredQtVersion 5.9.0)
-set(requiredOpensslVersion 1.0)
-set(requiredLibtorrentVersion 1.1.10)
+set(requiredOpenSSLVersion 1.0)
+set(requiredLibtorrentVersion 1.2.0)
+set(requiredZlibVersion 1.2.5.2)
 
-if(WIN32)
-    include(winconf)
-endif(WIN32)
+# features (some are platform-specific)
+include(FeatureSummary)
+include(FeatureOptionsSetup)
+feature_option(STACKTRACE "Enable stacktraces" ON)
+feature_option(GUI "Build GUI application" ON)
+feature_option(WEBUI "Enables built-in HTTP server for headless use" ON)
+feature_option(VERBOSE_CONFIGURE "Show information about PACKAGES_FOUND and PACKAGES_NOT_FOUND in the configure output (only useful for debugging the CMake build scripts)" OFF)
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+    feature_option_dependent(DBUS
+        "Enables support for notifications and power-management features on Linux via D-Bus"
+        ON "GUI" OFF
+    )
+    feature_option_dependent(SYSTEMD
+        "Install systemd service file to a directory manually overridable with Systemd_SERVICES_INSTALL_DIR"
+        OFF "NOT GUI" OFF
+    )
+elseif (MSVC)
+    feature_option(MSVC_RUNTIME_DYNAMIC "Use MSVC dynamic runtime library (-MD) instead of static (-MT)" ON)
+endif()
 
+set(QBT_VER_STATUS "alpha1" CACHE STRING "Project status version. Should be empty for release builds.")
 
-# we need options here, at the top level, because they are used not only in "src" subdir, but in the "dist" dir too
-include(CompileFeature)
-
-optional_compile_definitions(COUNTRIES_RESOLUTION FEATURE DESCRIPTION "Enable resolving peers IP addresses to countries"
-    DEFAULT ON DISABLED DISABLE_COUNTRIES_RESOLUTION)
-optional_compile_definitions(STACKTRACE FEATURE DESCRIPTION "Enable stacktraces"
-    DEFAULT ON ENABLED STACKTRACE)
-optional_compile_definitions(WEBUI FEATURE DESCRIPTION "Enables built-in HTTP server for headless use"
-    DEFAULT ON DISABLED DISABLE_WEBUI)
-
+include(GNUInstallDirs)
 add_subdirectory(src)
 add_subdirectory(dist)
 
-feature_summary(DESCRIPTION "\nConfiguration results:" WHAT ALL)
+if (VERBOSE_CONFIGURE)
+    feature_summary(WHAT ALL)
+else()
+    feature_summary(WHAT ENABLED_FEATURES DISABLED_FEATURES)
+endif()

CODING_GUIDELINES.md

@@ -1,12 +1,14 @@
-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.  
+# Coding Guidelines
+
+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. \
 For programming languages other than C++ (e.g. JavaScript) used in this repository and submodules, unless otherwise specified, coding guidelines listed here applies as much as possible.
 
-**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 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.
 
-### Table Of Contents
+## Table Of Contents
 
 * [1. New lines & curly braces](#1-new-lines--curly-braces)
   * [a. Function blocks, class/struct definitions, namespaces](#a-function-blocks-classstruct-definitions-namespaces)
@@ -29,11 +31,13 @@ For programming languages other than C++ (e.g. JavaScript) used in this reposito
 * [9. Misc](#9-misc)
 * [10. Git commit message](#10-git-commit-message)
 * [11. Not covered above](#11-not-covered-above)
+
 ---
 
-### 1. New lines & curly braces ###
+## 1. New lines & curly braces
+
+### a. Function blocks, class/struct definitions, namespaces
 
-#### a. Function blocks, class/struct definitions, namespaces ####
 ```c++
 int myFunction(int a)
 {
@@ -43,7 +47,7 @@ int myFunction(int a)
 void myFunction() {} // empty body
 
 MyClass::MyClass(int *parent)
-    : m_parent(parent)
+    : m_parent {parent}
 {
     // initialize
 }
@@ -79,17 +83,21 @@ namespace Name
 }
 ```
 
-#### b. Other code blocks ####
+### b. Other code blocks
+
 ```c++
-if (condition) {
+if (condition)
+{
     // code
 }
 
-for (int a = 0; a < b; ++b) {
+for (int a = 0; a < b; ++b)
+{
     // code
 }
 
-switch (a) {
+switch (a)
+{
 case 1:
     // blah
 case 2:
@@ -97,17 +105,25 @@ case 2:
 default:
     // blah
 }
+
+{
+    // code
+}
 ```
 
-#### c. Blocks in switch's case labels ####
+### c. Blocks in switch's case labels
+
 ```c++
-switch (var) {
-case 1: {
+switch (var)
+{
+case 1:
+    {
         // declare local variables
         // code
     }
     break;
-case 2: {
+case 2:
+    {
         // declare local variables
         // code
     }
@@ -117,22 +133,29 @@ default:
 }
 ```
 
-#### d. If-else statements ####
+### d. If-else statements
+
 The `else if`/`else` must be on their own lines:
+
 ```c++
-if (condition) {
+if (condition)
+{
     // code
 }
-else if (condition) {
+else if (condition)
+{
     // code
 }
-else {
+else
+{
     // code
 }
 ```
 
-#### e. Single statement if blocks ####
+### e. Single statement if blocks
+
 Most single statement if blocks should look like this:
+
 ```c++
 if (condition)
     a = a + b;
@@ -141,19 +164,23 @@ if (condition)
 One acceptable exception to this can be `return`, `break` or `continue` statements,
 provided that the test condition isn't very long and its body statement occupies only one line.
 However you can still choose to use the first rule.
+
 ```c++
 if (a > 0) return;
 
-while (p) {
+while (p)
+{
     // ...
     if (!b) continue;
 }
 ```
 
-#### f. Acceptable conditions to omit braces ####
+### f. Acceptable conditions to omit braces
+
 When the conditional statement in `if`/`else` has only one line and its body occupy only one line,
-this also applies to loops statements.  
+this also applies to loops statements. \
 Notice that for a series of `if - else` branches, if one branch needs braces then all branches must add braces.
+
 ```c++
 if (a < b)  // conditional statement
     do(a);  // body
@@ -165,21 +192,27 @@ else if (a > b)
 else
     do(c);
 
-if (a < b) {
+if (a < b)
+{
     do(a);
 }
-else if (a > b) {  // curly braces required here, then all branches should also add them
+else if (a > b)
+{
+    // curly braces required here, then all branches should also add them
     do(b);
     do(d);
 }
-else {
+else
+{
     do(c);
 }
 ```
 
-#### g. Brace enclosed initializers ####
-Unlike single-line functions, you must not insert spaces between the brackets and concluded expressions.<br/>
+### g. Brace enclosed initializers
+
+Unlike single-line functions, you must not insert spaces between the brackets and concluded expressions. \
 But you must insert a space between the variable name and initializer.
+
 ```c++
 Class obj {}; // empty
 Class obj {expr};
@@ -187,28 +220,33 @@ Class obj {expr1, /*...,*/ exprN};
 QVariantMap map {{"key1", 5}, {"key2", 10}};
 ```
 
-### 2. Indentation ###
+## 2. Indentation
+
 4 spaces.
 
-### 3. File encoding and line endings ###
+## 3. File encoding and line endings
 
 UTF-8 and Unix-like line ending (LF). Unless some platform specific files need other encodings/line endings.
 
-### 4. Initialization lists ###
+## 4. Initialization lists
+
 Initialization lists should be vertical. This will allow for more easily readable diffs. The initialization colon should be indented and in its own line along with first argument. The rest of the arguments should be indented too and have the comma prepended.
+
 ```c++
 myClass::myClass(int a, int b, int c, int d)
-    : m_a(a)
-    , m_b(b)
-    , m_c(c)
-    , m_d(d)
+    : m_a {a}
+    , m_b {b}
+    , m_c {c}
+    , m_d {d}
 {
     // code
 }
 ```
 
-### 5. Enums ###
+## 5. Enums
+
 Enums should be vertical. This will allow for more easily readable diffs. The members should be indented.
+
 ```c++
 enum Days
 {
@@ -222,11 +260,14 @@ enum Days
 };
 ```
 
-### 6. Names ###
+## 6. Names
+
 All names should be camelCased.
 
-#### a. Type names and namespaces ####
+### a. Type names and namespaces
+
 Type names and namespaces start with Upper case letter (except POD types).
+
 ```c++
 class ClassName {};
 
@@ -241,14 +282,18 @@ namespace NamespaceName
 }
 ```
 
-#### b. Variable names ####
+### b. Variable names
+
 Variable names start with lower case letter.
+
 ```c++
 int myVar;
 ```
 
-#### c. Private member variable names ####
+### c. Private member variable names
+
 Private member variable names start with lower case letter and should have ```m_``` prefix.
+
 ```c++
 class MyClass
 {
@@ -256,8 +301,10 @@ class MyClass
 }
 ```
 
-### 7. Header inclusion order ###
+## 7. Header inclusion order
+
 The headers should be placed in the following group order:
+
 1. Module header (in .cpp)
 2. C++ Standard Library headers
 3. System headers
@@ -266,13 +313,14 @@ The headers should be placed in the following group order:
 6. Qt headers
 7. qBittorrent's own headers, starting from the *base* headers.
 
-The headers should be ordered alphabetically within each group.  
-If there are conditionals for the same header group, then put them at the bottom of the respective group.  
+The headers should be ordered alphabetically within each group. \
+If there are conditionals for the same header group, then put them at the bottom of the respective group. \
 If there are conditionals that contain headers from several different header groups, then put them above the "qBittorrent's own headers" group.
 
 One exception is the header containing the library version (for example, QtGlobal), this particular header isn't constrained by the aforementioned order.
 
 Example:
+
 ```c++
 // file: examplewidget.cpp
 
@@ -322,8 +370,10 @@ Example:
 #include "ui_examplewidget.h"
 ```
 
-### 8. Include guard ###
+## 8. Include guard
+
 `#pragma once` should be used instead of "include guard" in new code:
+
 ```c++
 // examplewidget.h
 
@@ -338,7 +388,7 @@ class ExampleWidget : public QWidget
 
 ```
 
-### 9. Misc ###
+## 9. Misc
 
 * Line breaks for long lines with operation:
 
@@ -350,28 +400,29 @@ a += "b"
 
 * **auto** keyword
 
-We allow the use of the **auto** keyword only where it is strictly necessary 
-(for example, to declare a lambda object, etc.), or where it **enhances** the readability of the code.
-Declarations for which one can gather enough information about the object interface (type) from its name 
-or the usage pattern (an iterator or a loop variable are good examples of clear patterns) 
-or the right part of the expression nicely fit here.<br/>
-<br/>
-When weighing whether to use an auto-typed variable please think about potential reviewers of your code, 
-who will read it as a plain diff (on github.com, for instance). Please make sure that such reviewers can 
-understand the code completely and without excessive effort.<br/>
-<br/>
+  We allow the use of the **auto** keyword only where it is strictly necessary (for example, to declare a lambda object, etc.), or where it **enhances** the readability of the code. \
+  Declarations for which one can gather enough information about the object interface (type) from its name or the usage pattern (an iterator or a loop variable are good examples of clear patterns) or the right part of the expression nicely fit here.
+
+  When weighing whether to use an auto-typed variable please think about potential reviewers of your code, who will read it as a plain diff (on github.com, for instance). \
+  Please make sure that such reviewers can understand the code completely and without excessive effort.
+
   Some valid use cases:
+
+  * Container iteration and casts:
+
     ```c++
     template <typename List>
     void doSomethingWithList(const List &list)
     {
-    foreach (const auto &item, list) {
+        foreach (const auto &item, list)
+        {
             // we don't know item type here so we use 'auto' keyword
             // do something with item
         }
     }
 
-for (auto it = container.begin(), end = container.end(); it != end; ++it) {
+    for (auto it = container.begin(), end = container.end(); it != end; ++it)
+    {
         // we don't need to know the exact iterator type,
         // because all iterators have the same interface
     }
@@ -381,6 +432,7 @@ auto spinBox = static_cast<QSpinBox*>(sender());
     ```
 
   * Notice the spaces in the following specific situations:
+
     ```c++
     // Before and after the assignment and other binary (and ternary) operators there should be a space
     // There should not be a space between increment/decrement and its operand
@@ -388,14 +440,13 @@ a += 20;
     a = (b <= MAX_B ? b : MAX_B);
     ++a;
     --b;
-
-for (int a = 0; a < b; ++b) {
+    for (int a = 0; a < b; ++b)
+    {
     }
-
     // Range-based for loop, spaces before and after the colon
-for (auto i : container) {
+    for (auto i : container)
+    {
     }
-
     // Derived class, spaces before and after the colon
     class Derived : public Base
     {
@@ -403,6 +454,7 @@ class Derived : public Base
     ```
 
 * Prefer pre-increment, pre-decrement operators
+
   ```c++
   ++i, --j;  // Yes
   i++, j--;  // No
@@ -414,7 +466,8 @@ i++, j--;  // No
 
 * Method definitions aren't allowed in header files
 
-### 10. Git commit message ###
+## 10. Git commit message
+
 1. Limit the subject line to 50 characters. Subject should contain only the very essence of the changes (you should avoid extra details and internals)
 2. Separate subject from body with a blank line
 3. Capitalize the subject line
@@ -424,6 +477,7 @@ i++, j--;  // No
 7. Use the body to explain what and why vs. how
 8. If commit fixes a reported issue, mention it in the message body (e.g. `Closes #4134.`)
 
-### 11. Not covered above ###
-If something isn't covered above, just follow the same style the file you are editing has.  
+## 11. Not covered above
+
+If something isn't covered above, just follow the same style the file you are editing has. \
 *This guide is not exhaustive and the style for a particular piece of code not specified here will be determined by project members on code review.*

CONTRIBUTING.md

@@ -138,7 +138,7 @@ These are unstable/unsupported platforms, and in all likelihood, whatever the is
 *   **For performance-related issues**, include as much profiling data as you can (resource usage graphs, etc).
 
 *   Paste the **qBittorrent log** (or put the contents of the log in a gist and provide a link to the gist). The log can be viewed in the GUI (View -> Log -> tick all boxes). If you can't do that, the file is at:
-    -   Linux: `~/.local/share/data/qBittorrent/logs/qBittorrent.log`
+    -   Linux: `~/.local/share/qBittorrent/logs/qBittorrent.log`
     -   Windows: `%LocalAppData%\qBittorrent\logs`
     -   macOS: `~/Library/Application Support/qBittorrent/qBittorrent.log`
 

Changelog

@@ -1,123 +1,77 @@
-Sat Apr 25 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.5
-    - BUGFIX: Fix crash when torrent is deleted on limit reached (glassez)
-    - BUGFIX: Register datatype properly (Chocobo1)
-    - WEBUI: Add ability to send custom HTTP headers (Chocobo1)
-    - WEBUI: Expand RSS related API (Sepro)
-    - WINDOWS: Installer: Update german translation (schnurlos)
+Wed Nov 25 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.1
+    - FEATURE: Allow progress bar styling from custom themes (jagannatharjun)
+    - FEATURE: Allow adding torrents using "Paste" key sequence (Chocobo1)
+    - FEATURE: Add Latgalian translation (sledgehammer999)
+    - BUGFIX: Prevent resume data to be saved for removed torrent (glassez)
+    - BUGFIX: Clarify connection protocol choice label (FranciscoPombal)
+    - BUGFIX: Fix crash when clicked outside the table of torrent content view (jagannatharjun)
+    - BUGFIX: Don't resume "paused" torrents when put into "checking" state by libtorrent (glassez)
+    - BUGFIX: Fix torrent state calculation (glassez)
+    - BUGFIX: Align integer data to right in torrent content view (jagannatharjun)
+    - WEBUI: Place WebUI RSS description in sandboxed iframe (Sepro)
+    - WEBUI: Avoid settings being reset via WebAPI (Chocobo1)
+    - WEBUI: Fix toggling advanced option in WebUI (thalieht)
+    - WEBUI: Expose contentPath in WebAPI torrents/info (FranciscoPombal)
+    - WEBUI: Fix the issue that IPv6 address can't be banned (brvphoenix)
+    - RSS: Fix confusion in date format description (Thomas De Rocker)
+    - WINDOWS: Update dutch.nsi (Thomas De Rocker)
+    - LINUX: Update .desktop file translations (sledgehammer999)
 
-Wed Apr 22 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.4
-    - BUGFIX: Fix sub-sorting of Transfer list (glassez)
-    - BUGFIX: Fix wrong logic that disables "prevent sleeping" timer (Chocobo1)
-    - BUGFIX: Set disk cache size for older libtorrent versions (NotTsunami)
-    - BUGFIX: Sort locale language list (Chocobo1)
-    - BUGFIX: Remove white outline around mascot.png (adem)
-    - BUGFIX: Various fixes in configuring the chosen network interface and not leaking the IP (Raif Atef, an0n666)
-    - BUGFIX: Save "resume data" when torrent storage is moved (glassez)
-    - BUGFIX: Avoid holding encoded resume data in memory (Chocobo1)
-    - BUGFIX: Fix date format for "Last seen complete" (Chocobo1)
-    - BUGFIX: Remove deprecated strict super seeding mode from advanced settings (an0n666)
-    - BUGFIX: Change default stop_tracker_timeout settings (an0n666)
-    - BUGFIX: Convert the Log widget to use custom View/Model (jagannatharjun)
-    - BUGFIX: Change default upload slot choking limits (an0n666)
-    - BUGFIX: Don't uncheck Authentication checkbox when changing proxy type (thalieht)
-    - BUGFIX: Reduce ambiguity for selecting tray icons (Chocobo1)
-    - WEBUI: Fix unable to add multiple peers in WebUI (Sepro)
-    - WEBUI: Fix UPnP lease duration get/set (NotTsunami)
-    - SEARCH: Detect python3 executable on Windows (József Sallai)
+Thu Oct 22 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.0.1
+    - WINDOWS: NSIS: Update Italian translation (bovirus)
 
-Wed Apr 01 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.3
-    - FEATURE: Add logging for SOCKS5 proxy errors (Chocobo1)
-    - FEATURE: Add UPnP lease duration advanced option (NotTsunami)
-    - BUGFIX: Allow to translate error messages (Chocobo1)
-    - BUGFIX: Don't round scaling factor (Nick Korotysh)
-    - BUGFIX: Save log file in UTF-8 encoding (Chocobo1)
-    - BUGFIX: Avoid log file excessive flushing (Chocobo1)
-    - BUGFIX: Fix regression when fastresume contains network path (Tester798)
-    - BUGFIX: Fix broken UNC paths in fastresumes on Windows (sledgehammer999)
-    - BUGFIX: Prevent multiple instances for the same app config (glassez)
-    - BUGFIX: Fix unexpected torrent resume after app restart with libtorrent 1.1.x (glassez)
-    - WEBUI: Add alt and title tags for WebUI footer (LameLemon)
-    - WINDOWS: Installer: Update Finnish translation (Roope Jukkara)
-    - WINDOWS: Installer: Update Japanese translation (maboroshin)
-    - WINDOWS: Installer: Update Turkish translation (Burak Yavuz)
-    - WINDOWS: Installer: Update Russian translation (Andrei Stepanov)
-
-Tue Mar 24 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.2
-    - FEATURE: Allow transfer list text color changes through QSS (Prince Gupta)
-    - FEATURE: Option to show console when external program is run (sledgehammer999)
-    - FEATURE: Rename Country column to "Country / Region" (Thomas Piccirello)
-    - FEATURE: Change the defaults of some settings (FranciscoPombal)
-    - FEATURE: Refactored Transfer List code to allow theming. As a sideffect the row height has more padding. (glassez)
-    - FEATURE: Allow double-click in preview dialog (thalieht)
-    - FEATURE: Expose stop_tracker_timeout in advanced settings (an0n666)
-    - FEATURE: Add piece_extent_affinity to AdvancedSettings (FranciscoPombal)
-    - FEATURE: Reorganize UI theme selection (Prince Gupta)
-    - FEATURE: Show any multiple connections from the same IP in peer list (thalieht)
-    - FEATURE: Add stalled filters to GUI and Web API/UI (FranciscoPombal)
-    - FEATURE: Use IP geolocation database by DB-IP instead of MaxMind (sledgehammer999)
-    - FEATURE: Allow to save downloaded metadata as torrent file (glassez)
-    - FEATURE: Allow single app instance per configuration (glassez)
-    - PERFORMANCE: Move multiple torrents one by one (glassez)
-    - BUGFIX: Disable Torrent Queue by default for new users (an0n666)
-    - BUGFIX: Update free disk space label on Category change in Auto Mode (Medvedishce)
-    - BUGFIX: Save resume data after recheck (glassez)
-    - BUGFIX: Tracker is errored only if all local endpoints fail (sledgehammer999)
-    - BUGFIX: Change placement of stop tracker timeout setting (An0n)
-    - BUGFIX: Redesign torrent startup handling (glassez)
-    - BUGFIX: Show "∞" instead of " -1" in Preferences (Sakib-Abrar)
-    - BUGFIX: Improve code efficiency for reverse resolution of peers (Chocobo1)
-    - BUGFIX: Handle HTTP redirection to magnet URI (glassez)
-    - BUGFIX: Various fixes for portable mode (Tester798)
-    - BUGFIX: Include resume folder path in exception message (Chocobo1)
-    - BUGFIX: Change placeholder text in torrent list's filter (djt3)
-    - BUGFIX: Improvements in the embedded tracker to be more spec compliant (FranciscoPombal)
-    - BUGFIX: Improve the options tooltips (NotTsunami)
-    - BUGFIX: Check if file exists in seed mode (an0n666)
-    - BUGFIX: Delegate GUI scaling work to Qt (Nick Korotysh)
-    - BUGFIX: Fix crash when renaming torrent contents (Chocobo1)
-    - BUGFIX: Fix total connected peers count calculation (FranciscoPombal)
-    - BUGFIX: Allow other keypresses in LogListWidget (NotTsunami)
-    - BUGFIX: Disable Auto TMM when not using default savepath from monitored folder (thalieht)
-    - WEBUI: Fix first row renaming in files tab (Denis)
-    - WEBUI: Use SVG image for WebUI favicon (Nick Korotysh)
-    - WEBUI: Inherit text color for filter list elements (Nick Korotysh)
-    - WEBUI: Expose WebUI ban counter to users (Chocobo1)
-    - WEBUI: Expose WebUI ban duration to users (Chocobo1)
-    - WEBUI: Implement "Secure" flag for session cookie (FranciscoPombal)
-    - WEBUI: Remove unused/deprecated option (FranciscoPombal)
-    - WEBUI: Prevent excessive sync requests (FranciscoPombal)
-    - WEBUI: Fix populating statistics window (FranciscoPombal)
-    - WEBUI: Fix matching uncategorized torrents (FranciscoPombal)
-    - WEBUI: Always allow whitespace in category names (FranciscoPombal)
-    - SEARCH: Bump python version for new installation (Chocobo1)
-    - SEARCH: Fix missing string (Chocobo1)
-    - SEARCH: Drop python2 support (Chocobo1)
-    - WINDOWS: Installer: Option to start qBittorrent on Windows start up (An0n)
-    - WINDOWS: Installer: Improve Czech translation (slrslr)
-    - WINDOWS: Installer: Update French translation (zywo)
-    - WINDOWS: Installer: Update German translation (schnurlos)
-    - WINDOWS: Installer: Update Japanese translation (maboroshin)
-    - WINDOWS: Path length limitation is removed on Windows 10 1607 onwards (an0n666)
-
-Wed Dec 18 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.1
-    - FEATURE: Enable portable mode if "profile" directory exists (Tester798)
-    - FEATURE: Enable "Apply rate limit to peers on LAN" option by default (Chocobo1)
-    - BUGFIX: Sync translations from Transifex and run lupdate (sledgehammer999)
-    - BUGFIX: Don't unnecessarily delete OS files in folders (sledgehammer999)
-    - BUGFIX: Use the incomplete folder where appropriate (sledgehammer999)
-    - BUGFIX: Align Properties tab bar correctly on window resize (Prince Gupta)
-    - BUGFIX: Rework the listening IP/interface selection code (sledgehammer999)
-    - BUGFIX: Fix inconsistent icon for deleting torrent (Chocobo1)
-    - BUGFIX: Show torrent error message in transfer list (Chocobo1)
-    - BUGFIX: Fix stuck in wrong torrent state (Chocobo1)
-    - BUGFIX: Expand single-item folders in torrent content (warren)
-    - WEBUI: Bump Web API version (sledgehammer999)
-    - WEBUI: Add ability to rename torrent files from the WebUI (Thomas Piccirello)
-    - WEBUI: Mention lack of HTTPS in WebUI magnet link warning (nl6720)
-    - WEBUI: Fix HTML elements size in search tab (Chocobo1)
-    - SEARCH: Fix incorrect translation displayed after language change (Chocobo1)
-    - SEARCH: Fix missing translations in search plugins dialog (Chocobo1)
-    - WINDOWS: Update russian translation of the installer (Andrei Stepanov)
+Sun Oct 18 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.0
+    - FEATURE: Many UI elements colors are themeable now (jagannatharjun)
+    - FEATURE: Allow changing GUI icons from theme bundles (jagannatharjun)
+    - FEATURE: Notify user when torrent moving finished (glassez)
+    - FEATURE: Shortcut CTRL + I opens Statistics window (LoopsGod)
+    - FEATURE: Add RSS functionality in Web UI (Sepro)
+    - FEATURE: Drop ".unwanted folder" feature (glassez)
+    - FEATURE: Expose libtorrent peer_turnover, max_concurrent_http_announces, no_connect_privileged_ports settings (Sophist, an0n666, NotTsunami)
+    - BUGFIX: Fix typo in Options dialog (Andrei Stepanov)
+    - BUGFIX: Remove "requires restart" from network interface settings (an0n666)
+    - BUGFIX: Rename "Create subfolder" to "Keep top-level folder" (thalieht)
+    - BUGFIX: Show tooltip for some properties in transfer list (Nick Korotysh)
+    - BUGFIX: Fix calculation of torrent current state (glassez)
+    - BUGFIX: Improve detecting completed files when adding, rechecking or moving a torrent (glassez)
+    - BUGFIX: Fixed broken announce logic in embedded tracker causing failures in some cases (FranciscoPombal)
+    - BUGFIX: Disable checkbox if torrent doesn't have root folder (thalieht)
+    - BUGFIX: Update country flag icons with upstream (Chocobo1)
+    - BUGFIX: Private torrent: If tracker entry is edited clear old peer list. Also don't allow user to manually add peers. (an0n666)
+    - BUGFIX: Fix large strings not visible in log widget (jagannatharjun)
+    - BUGFIX: Disable edit action in Peer list widget (Chocobo1)
+    - BUGFIX: Add a scroll area to torrent creator dialog (Ernesto Castellotti)
+    - BUGFIX: Content tab: Open double-clicked folder regardless on which column the click happens (Chocobo1)
+    - BUGFIX: "Open containing folder" on a folder now opens it in its parent folder (Chocobo1)
+    - BUGFIX: Fix GeoDB download in systems with non-C locales (FranciscoPombal)
+    - BUGFIX: Fix peer blocked message (FranciscoPombal)
+    - BUGFIX: Make more robust the banning of selected peers from the list (NotTsunami)
+    - BUGFIX: Use toned green color for downloading pieces in Pieces bar (jagannatharjun)
+    - BUGFIX: Correctly fill whole width of speed graph (jagannatharjun)
+    - BUGFIX: Fix impossible speed in speed graph (jagannatharjun)
+    - WEBUI: Hide additional search filters on small screens (Thomas Piccirello)
+    - WEBUI: Shrink search bar on small screens (Thomas Piccirello)
+    - WEBUI: Fix search categories only working in English (Thomas Piccirello)
+    - WEBUI: Add Trackers section to sidebar (Thomas Piccirello)
+    - WEBUI: Fix Enter button behavior in textarea (Tom Piccirello)
+    - WEBUI: Fix wrong file renaming selection range (MR)
+    - WEBUI: Preselect "Default save path" in watched folders (thalieht)
+    - WEBUI: Fix banning peers (brvphoenix)
+    - WEBUI: Fix seeding time checkbox placement (Chocobo1)
+    - WEBUI: Bump Web API version (Thomas Piccirello)
+    - RSS: Fix renaming RSS autodownload rule (glassez)
+    - RSS: Fix RSS article is not marked as "read" when torrent is downloaded (glassez)
+    - SEARCH: Update minimum Python version to 3.5.0 (ngosang)
+    - SEARCH: Make middle-click close search tabs (Will Da Silva)
+    - WINDOWS: NSIS: Update Dutch translation (Thomas De Rocker)
+    - WINDOWS: NSIS: Change the installers uninstallation question to clear confusion (an0n666)
+    - LINUX: Fix typo in systemd service file (Shane Allgeier)
+    - LINUX: Don't use HTML in tray tooltip (thalieht)
+    - LINUX: Don't create 'data' subdirectory in XDG_DATA_HOME (lbilli)
+    - LINUX/MACOS: Add HTTPS tracker certificate validation option (NotTsunami)
+    - OTHER: Many CMake improvements (FranciscoPombal)
+    - OTHER: Support for libtorrent 1.1.x is dropped (Chocobo1)
+    - OTHER: Many code cleanups and improvements (FranciscoPombal, Chocobo1, glassez)
 
 Tue Dec 03 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.0
     - FEATURE: Libtorrent 1.2.x series are supported now (glassez)
@@ -150,7 +104,7 @@ Tue Dec 03 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.0
     - BUGFIX: Remove the max half-open connections option (thalieht)
     - BUGFIX: Center align the section labels in advanced settings (thalieht)
     - BUGFIX: Add documentation links to some advanced settings (thalieht)
-    - BUGFIX: Impove DownloadManager code (glassez)
+    - BUGFIX: Improve DownloadManager code (glassez)
     - BUGFIX: Limit DownloadHandler max redirection to 20 (Chocobo1)
     - BUGFIX: Log DownloadManager SSL errors (Chocobo1)
     - BUGFIX: Force recheck multiple torrents one by one (glassez)
@@ -381,10 +335,10 @@ Tue Dec 03 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.0
     - BUGFIX: Restore torrent in two steps (glassez)
     - BUGFIX: Improve scaling of speed graphs (dzmat)
     - BUGFIX: Add isNetworkFileSystem() detection on Windows. This allows network mounts to be monitored correctly by polling timer. (Chocobo1)
-    - BUGFIX: Reduce horizontal graphs resolution. Improves perfomance. (dzmat)
+    - BUGFIX: Reduce horizontal graphs resolution. Improves performance. (dzmat)
     - BUGFIX: Don't recheck just checked torrent (mj-p, glassez)
     - BUGFIX: Add SMB2 magic number (Chocobo1)
-    - BUGFIX: Restore startup perfomance to v4.1.2 times. Needs at least libtorrent 1.1.10 (sledgehammer999)
+    - BUGFIX: Restore startup performance to v4.1.2 times. Needs at least libtorrent 1.1.10 (sledgehammer999)
     - BUGFIX: Make strings actually translatable (sledgehammer999)
     - WEBUI: Handle downloading .torrent file as success (Tom Piccirello)
     - WEBUI: Fix Alternative Web UI to be available (glassez)
@@ -455,7 +409,7 @@ Tue Dec 03 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.0
     - BUGFIX: Improve torrent initialization (glassez)
     - BUGFIX: Save resume data on torrent change events (glassez)
     - BUGFIX: Increase default resume data save interval (Chocobo1)
-    - BUGFIX: Work around crash when procesing recursive download. Closes #9086 (Chocobo1)
+    - BUGFIX: Work around crash when processing recursive download. Closes #9086 (Chocobo1)
     - BUGFIX: Reduce queries to python version (Chocobo1)
     - BUGFIX: Disable certain mouse wheel events in Options dialog (Chocobo1)
     - WEBUI: Send all rechecks in one request (Thomas Piccirello)
@@ -942,7 +896,7 @@ Tue Dec 03 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.0
     - COSMETIC: Change RSS view layout to horizontal. Closes #5920. (Chocobo1)
     - OSX: Fix crash on exit using Qt4. (Yez Ezey)
     - OSX: Change QSettings to IniFormat on macOS. Closes #5770 #5808. (Yez Ezey)
-    - LINUX: Workaround a Qt5 bug which results in a flood of network interface change singals. (Eugene Shalygin)
+    - LINUX: Workaround a Qt5 bug which results in a flood of network interface change signals. (Eugene Shalygin)
     - OTHER: Turkish translation for installer. (Burak Yavuz)
     - OTHER: Update portugueseBR for installer. (DaRKSoM)
     - OTHER: Update portuguese for installer. (EdwardLinux)
@@ -2289,7 +2243,7 @@ Tue Dec 03 2019 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.2.0
     - FEATURE: Added "Unread" item to RSS feed list to display all unread news
     - FEATURE: If a torrent contains a torrent file, process downloaded torrent file too
     - FEATURE: A random listening port can be chosen automatically
-    - BUGFIX: torrent resume code rewrited
+    - BUGFIX: torrent resume code rewritten
     - BUGFIX: Fixed uTorrent spoofing code
     - BUGFIX: Greatly improved column sorting code
     - BUGFIX: Possibility to create trackerless torrents

INSTALL

@@ -5,7 +5,7 @@ qBittorrent - A BitTorrent client in C++ / Qt
 
   - Boost >= 1.40
 
-  - libtorrent-rasterbar >= 1.1.10 (by Arvid Norberg)
+  - libtorrent-rasterbar >= 1.2 (by Arvid Norberg)
       * https://www.libtorrent.org/
       * Be careful: another library (the one used by rTorrent) uses a similar name
 
@@ -17,7 +17,7 @@ qBittorrent - A BitTorrent client in C++ / Qt
 
   - pkg-config (compile-time only)
 
-  - Python >= 3.3.0 (optional, runtime only)
+  - Python >= 3.5.0 (optional, runtime only)
       * Required by the internal search engine
 
 2a) Compile and install qBittorrent with Qt graphical interface

README.md

@@ -3,6 +3,7 @@ qBittorrent - A BitTorrent client in Qt
 
 [![TravisCI Status](https://travis-ci.org/qbittorrent/qBittorrent.svg?branch=master)](https://travis-ci.org/qbittorrent/qBittorrent)
 [![AppVeyor Status](https://ci.appveyor.com/api/projects/status/github/qbittorrent/qBittorrent?branch=master&svg=true)](https://ci.appveyor.com/project/qbittorrent/qBittorrent)
+[![GitHub Actions CI Status](https://github.com/qbittorrent/qBittorrent/workflows/GitHub%20Actions%20CI/badge.svg)](https://github.com/qbittorrent/qBittorrent/actions)
 [![Coverity Status](https://scan.coverity.com/projects/5494/badge.svg)](https://scan.coverity.com/projects/5494)
 ********************************
 ### Description:

TODO

@@ -1,2 +1 @@
 See https://blueprints.launchpad.net/qbittorrent/
-

cmake/Modules/CompileFeature.cmake

@@ -1,22 +0,0 @@
-# Helper function for coupling add_feature_info(), option(), and add_definitions()
-
-function(optional_compile_definitions _name)
-    set(options FEATURE)
-    set(oneValueArgs DESCRIPTION DEFAULT)
-    set(multiValueArgs ENABLED DISABLED)
-    cmake_parse_arguments(OCD "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-    option(${_name} "${OCD_DESCRIPTION}" ${OCD_DEFAULT})
-    if (${${_name}})
-        set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" APPEND PROPERTY COMPILE_DEFINITIONS ${OCD_ENABLED})
-    else()
-        set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" APPEND PROPERTY COMPILE_DEFINITIONS ${OCD_DISABLED})
-    endif()
-    if(${OCD_FEATURE})
-        add_feature_info(${_name} ${_name} "${OCD_DESCRIPTION}")
-    endif()
-endfunction()
-
-macro(feature_option _name _description _default)
-    option(${_name} "${_description}" ${_default})
-    add_feature_info(${_name} ${_name} "${_description}")
-endmacro()

cmake/Modules/DeployQt5.cmake

@@ -1,355 +0,0 @@
-# Borrowed from Avogadro project (https://github.com/OpenChemistry/avogadroapp)
-
-#.rst:
-# DeployQt5
-# ---------
-#
-# Functions to help assemble a standalone Qt5 executable.
-#
-# A collection of CMake utility functions useful for deploying Qt5
-# executables.
-#
-# The following functions are provided by this module:
-#
-# ::
-#
-#    write_qt5_conf
-#    resolve_qt5_paths
-#    fixup_qt5_executable
-#    install_qt5_plugin_path
-#    install_qt5_plugin
-#    install_qt5_executable
-#
-# Requires CMake 2.8.9 or greater because Qt 5 does.
-# Also depends on BundleUtilities.cmake.
-#
-# ::
-#
-#   WRITE_QT5_CONF(<qt_conf_dir> <qt_conf_contents>)
-#
-# Writes a qt.conf file with the <qt_conf_contents> into <qt_conf_dir>.
-#
-# ::
-#
-#   RESOLVE_QT5_PATHS(<paths_var> [<executable_path>])
-#
-# Loop through <paths_var> list and if any don't exist resolve them
-# relative to the <executable_path> (if supplied) or the
-# CMAKE_INSTALL_PREFIX.
-#
-# ::
-#
-#   FIXUP_QT5_EXECUTABLE(<executable> [<qtplugins> <libs> <dirs> <plugins_dir> <request_qt_conf>])
-#
-# Copies Qt plugins, writes a Qt configuration file (if needed) and
-# fixes up a Qt5 executable using BundleUtilities so it is standalone
-# and can be drag-and-drop copied to another machine as long as all of
-# the system libraries are compatible.
-#
-# <executable> should point to the executable to be fixed-up.
-#
-# <qtplugins> should contain a list of the names or paths of any Qt
-# plugins to be installed.
-#
-# <libs> will be passed to BundleUtilities and should be a list of any
-# already installed plugins, libraries or executables to also be
-# fixed-up.
-#
-# <dirs> will be passed to BundleUtilities and should contain and
-# directories to be searched to find library dependencies.
-#
-# <plugins_dir> allows an custom plugins directory to be used.
-#
-# <request_qt_conf> will force a qt.conf file to be written even if not
-# needed.
-#
-# ::
-#
-#   INSTALL_QT5_PLUGIN_PATH(plugin executable copy installed_plugin_path_var <plugins_dir> <component> <configurations>)
-#
-# Install (or copy) a resolved <plugin> to the default plugins directory
-# (or <plugins_dir>) relative to <executable> and store the result in
-# <installed_plugin_path_var>.
-#
-# If <copy> is set to TRUE then the plugins will be copied rather than
-# installed.  This is to allow this module to be used at CMake time
-# rather than install time.
-#
-# If <component> is set then anything installed will use this COMPONENT.
-#
-# ::
-#
-#   INSTALL_QT5_PLUGIN(plugin executable copy installed_plugin_path_var <plugins_dir> <component>)
-#
-# Install (or copy) an unresolved <plugin> to the default plugins
-# directory (or <plugins_dir>) relative to <executable> and store the
-# result in <installed_plugin_path_var>.  See documentation of
-# INSTALL_QT5_PLUGIN_PATH.
-#
-# ::
-#
-#   INSTALL_QT5_EXECUTABLE(<executable> [<qtplugins> <libs> <dirs> <plugins_dir> <request_qt_conf> <component>])
-#
-# Installs Qt plugins, writes a Qt configuration file (if needed) and
-# fixes up a Qt5 executable using BundleUtilities so it is standalone
-# and can be drag-and-drop copied to another machine as long as all of
-# the system libraries are compatible.  The executable will be fixed-up
-# at install time.  <component> is the COMPONENT used for bundle fixup
-# and plugin installation.  See documentation of FIXUP_QT5_BUNDLE.
-
-#=============================================================================
-# Copyright 2011 Mike McQuaid <mike@mikemcquaid.com>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-# The functions defined in this file depend on the fixup_bundle function
-# (and others) found in BundleUtilities.cmake
-
-include(BundleUtilities)
-set(DeployQt5_cmake_dir "${CMAKE_CURRENT_LIST_DIR}")
-set(DeployQt5_apple_plugins_dir "PlugIns")
-
-function(write_qt5_conf qt_conf_dir qt_conf_contents)
-  set(qt_conf_path "${qt_conf_dir}/qt.conf")
-  message(STATUS "Writing ${qt_conf_path}")
-  file(WRITE "${qt_conf_path}" "${qt_conf_contents}")
-endfunction()
-
-function(resolve_qt5_paths paths_var)
-  set(executable_path ${ARGV1})
-
-  set(paths_resolved)
-  foreach(path ${${paths_var}})
-    if(EXISTS "${path}")
-      list(APPEND paths_resolved "${path}")
-    else()
-      if(${executable_path})
-        list(APPEND paths_resolved "${executable_path}/${path}")
-      else()
-        list(APPEND paths_resolved "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${path}")
-      endif()
-    endif()
-  endforeach()
-  set(${paths_var} ${paths_resolved} PARENT_SCOPE)
-endfunction()
-
-function(fixup_qt5_executable executable)
-  set(qtplugins ${ARGV1})
-  set(libs ${ARGV2})
-  set(dirs ${ARGV3})
-  set(plugins_dir ${ARGV4})
-  set(request_qt_conf ${ARGV5})
-
-  message(STATUS "fixup_qt5_executable")
-  message(STATUS "  executable='${executable}'")
-  message(STATUS "  qtplugins='${qtplugins}'")
-  message(STATUS "  libs='${libs}'")
-  message(STATUS "  dirs='${dirs}'")
-  message(STATUS "  plugins_dir='${plugins_dir}'")
-  message(STATUS "  request_qt_conf='${request_qt_conf}'")
-
-  if(QT_LIBRARY_DIR)
-    list(APPEND dirs "${QT_LIBRARY_DIR}")
-  endif()
-  if(QT_BINARY_DIR)
-    list(APPEND dirs "${QT_BINARY_DIR}")
-  endif()
-
-  if(APPLE)
-    set(qt_conf_dir "${executable}/Contents/Resources")
-    set(executable_path "${executable}")
-    set(write_qt_conf TRUE)
-    if(NOT plugins_dir)
-      set(plugins_dir "${DeployQt5_apple_plugins_dir}")
-    endif()
-  else()
-    get_filename_component(executable_path "${executable}" PATH)
-    if(NOT executable_path)
-      set(executable_path ".")
-    endif()
-    set(qt_conf_dir "${executable_path}")
-    set(write_qt_conf ${request_qt_conf})
-  endif()
-
-  foreach(plugin ${qtplugins})
-    set(installed_plugin_path "")
-    install_qt5_plugin("${plugin}" "${executable}" 1 installed_plugin_path)
-    list(APPEND libs ${installed_plugin_path})
-  endforeach()
-
-  foreach(lib ${libs})
-    if(NOT EXISTS "${lib}")
-      message(FATAL_ERROR "Library does not exist: ${lib}")
-    endif()
-  endforeach()
-
-  resolve_qt5_paths(libs "${executable_path}")
-
-  if(write_qt_conf)
-    set(qt_conf_contents "[Paths]\nPlugins = ${plugins_dir}")
-    write_qt5_conf("${qt_conf_dir}" "${qt_conf_contents}")
-  endif()
-
-  fixup_bundle("${executable}" "${libs}" "${dirs}")
-endfunction()
-
-function(install_qt5_plugin_path plugin executable copy installed_plugin_path_var)
-  set(plugins_dir ${ARGV4})
-  set(component ${ARGV5})
-  set(configurations ${ARGV6})
-  if(EXISTS "${plugin}")
-    if(APPLE)
-      if(NOT plugins_dir)
-        set(plugins_dir "${DeployQt5_apple_plugins_dir}")
-      endif()
-      set(plugins_path "${executable}/Contents/${plugins_dir}")
-    else()
-      get_filename_component(plugins_path "${executable}" PATH)
-      if(NOT plugins_path)
-        set(plugins_path ".")
-      endif()
-      if(plugins_dir)
-        set(plugins_path "${plugins_path}/${plugins_dir}")
-      endif()
-    endif()
-
-    set(plugin_group "")
-
-    get_filename_component(plugin_path "${plugin}" PATH)
-    get_filename_component(plugin_parent_path "${plugin_path}" PATH)
-    get_filename_component(plugin_parent_dir_name "${plugin_parent_path}" NAME)
-    get_filename_component(plugin_name "${plugin}" NAME)
-    string(TOLOWER "${plugin_parent_dir_name}" plugin_parent_dir_name)
-
-    if("${plugin_parent_dir_name}" STREQUAL "plugins")
-      get_filename_component(plugin_group "${plugin_path}" NAME)
-      set(${plugin_group_var} "${plugin_group}")
-    endif()
-    set(plugins_path "${plugins_path}/${plugin_group}")
-
-    if(${copy})
-      file(MAKE_DIRECTORY "${plugins_path}")
-      file(COPY "${plugin}" DESTINATION "${plugins_path}")
-    else()
-      if(configurations AND (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE))
-        set(configurations CONFIGURATIONS ${configurations})
-      else()
-        unset(configurations)
-      endif()
-      install(FILES "${plugin}" DESTINATION "${plugins_path}" ${configurations} ${component})
-    endif()
-    set(${installed_plugin_path_var} "${plugins_path}/${plugin_name}" PARENT_SCOPE)
-  endif()
-endfunction()
-
-function(install_qt5_plugin plugin executable copy installed_plugin_path_var)
-  set(plugins_dir ${ARGV4})
-  set(component ${ARGV5})
-  if(EXISTS "${plugin}")
-    install_qt5_plugin_path("${plugin}" "${executable}" "${copy}" "${installed_plugin_path_var}" "${plugins_dir}" "${component}")
-  else()
-    string(TOUPPER "QT_${plugin}_PLUGIN" plugin_var)
-    set(plugin_release_var "${plugin_var}_RELEASE")
-    set(plugin_debug_var "${plugin_var}_DEBUG")
-    set(plugin_release "${${plugin_release_var}}")
-    set(plugin_debug "${${plugin_debug_var}}")
-    if(DEFINED "${plugin_release_var}" AND DEFINED "${plugin_debug_var}" AND NOT EXISTS "${plugin_release}" AND NOT EXISTS "${plugin_debug}")
-      message(WARNING "Qt plugin \"${plugin}\" not recognized or found.")
-    endif()
-    if(NOT EXISTS "${${plugin_debug_var}}")
-      set(plugin_debug "${plugin_release}")
-    endif()
-
-    if(CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
-      install_qt5_plugin_path("${plugin_release}" "${executable}" "${copy}" "${installed_plugin_path_var}_release" "${plugins_dir}" "${component}" "Release|RelWithDebInfo|MinSizeRel")
-      install_qt5_plugin_path("${plugin_debug}" "${executable}" "${copy}" "${installed_plugin_path_var}_debug" "${plugins_dir}" "${component}" "Debug")
-
-      if(CMAKE_BUILD_TYPE MATCHES "^Debug$")
-        set(${installed_plugin_path_var} ${${installed_plugin_path_var}_debug})
-      else()
-        set(${installed_plugin_path_var} ${${installed_plugin_path_var}_release})
-      endif()
-    else()
-      install_qt5_plugin_path("${plugin_release}" "${executable}" "${copy}" "${installed_plugin_path_var}" "${plugins_dir}" "${component}")
-    endif()
-  endif()
-  set(${installed_plugin_path_var} ${${installed_plugin_path_var}} PARENT_SCOPE)
-endfunction()
-
-function(install_qt5_executable executable)
-  set(qtplugins ${ARGV1})
-  set(libs ${ARGV2})
-  set(dirs ${ARGV3})
-  set(plugins_dir ${ARGV4})
-  set(request_qt_conf ${ARGV5})
-  set(component ${ARGV6})
-  if(QT_LIBRARY_DIR)
-    list(APPEND dirs "${QT_LIBRARY_DIR}")
-  endif()
-  if(QT_BINARY_DIR)
-    list(APPEND dirs "${QT_BINARY_DIR}")
-  endif()
-  if(TARGET Qt5::Core)
-    get_property(_locCore TARGET Qt5::Core PROPERTY LOCATION_RELEASE)
-    get_filename_component(_loc ${_locCore} DIRECTORY)
-    message(STATUS "Adding Qt 5 directory: ${_loc}")
-    list(APPEND dirs "${_loc}")
-  else()
-    message(FATAL_ERROR "No Qt5::Core target found, ensure it is available")
-  endif()
-  if(component)
-    set(component COMPONENT ${component})
-  else()
-    unset(component)
-  endif()
-
-  get_filename_component(executable_absolute "${executable}" ABSOLUTE)
-  if(EXISTS "${QT_QTCORE_LIBRARY_RELEASE}")
-    gp_file_type("${executable_absolute}" "${QT_QTCORE_LIBRARY_RELEASE}" qtcore_type)
-  elseif(EXISTS "${QT_QTCORE_LIBRARY_DEBUG}")
-    gp_file_type("${executable_absolute}" "${QT_QTCORE_LIBRARY_DEBUG}" qtcore_type)
-  endif()
-  if(qtcore_type STREQUAL "system")
-    set(qt_plugins_dir "")
-  endif()
-
-  if(QT_IS_STATIC)
-    message(WARNING "Qt built statically: not installing plugins.")
-  else()
-    if(APPLE)
-      get_property(loc TARGET Qt5::QCocoaIntegrationPlugin
-        PROPERTY LOCATION_RELEASE)
-      install_qt5_plugin("${loc}" "${executable}" 0 installed_plugin_paths
-        "PlugIns" "${component}")
-      list(APPEND libs ${installed_plugin_paths})
-    elseif(WIN32)
-      get_property(loc TARGET Qt5::QWindowsIntegrationPlugin
-        PROPERTY LOCATION_RELEASE)
-      install_qt5_plugin("${loc}" "${executable}" 0 installed_plugin_paths
-        "" "${component}")
-      list(APPEND libs ${installed_plugin_paths})
-    endif()
-    foreach(plugin ${qtplugins})
-      set(installed_plugin_paths "")
-      install_qt5_plugin("${plugin}" "${executable}" 0 installed_plugin_paths "${plugins_dir}" "${component}")
-      list(APPEND libs ${installed_plugin_paths})
-    endforeach()
-  endif()
-
-  resolve_qt5_paths(libs "")
-
-  install(CODE
-  "include(\"${DeployQt5_cmake_dir}/DeployQt5.cmake\")
-  set(BU_CHMOD_BUNDLE_ITEMS TRUE)
-  fixup_qt5_executable(\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${executable}\" \"\" \"${libs}\" \"${dirs}\" \"${plugins_dir}\" \"${request_qt_conf}\")"
-    ${component}
-    )
-endfunction()

cmake/Modules/FeatureOptionsSetup.cmake

@@ -0,0 +1,14 @@
+# Helper functions for coupling add_feature_info() or CMAKE_DEPENDENT_OPTION() and option()
+
+function(feature_option _name _description _default)
+    string(CONCAT _desc "${_description} (default: ${_default})")
+    option("${_name}" "${_desc}" "${_default}")
+    add_feature_info("${_name}" "${_name}" "${_desc}")
+endfunction()
+
+include(CMakeDependentOption)
+function(feature_option_dependent _name _description _default_opt _dependency _default_dep_not_sat)
+    string(CONCAT _desc "${_description} (default: ${_default_opt}; depends on condition: ${_dependency})")
+    CMAKE_DEPENDENT_OPTION("${_name}" "${_desc}" "${_default_opt}" "${_dependency}" "${_default_dep_not_sat}")
+    add_feature_info("${_name}" "${_name}" "${_desc}")
+endfunction()

cmake/Modules/FindLibtorrentRasterbar.cmake

@@ -1,129 +0,0 @@
-# - Try to find libtorrent-rasterbar
-#
-# If not using pkg-config, you can pre-set LibtorrentRasterbar_CUSTOM_DEFINITIONS
-# for definitions unrelated to Boost's separate compilation (which are already
-# decided by the LibtorrentRasterbar_USE_STATIC_LIBS variable).
-#
-# Once done this will define
-#  LibtorrentRasterbar_FOUND - System has libtorrent-rasterbar
-#  LibtorrentRasterbar_INCLUDE_DIRS - The libtorrent-rasterbar include directories
-#  LibtorrentRasterbar_LIBRARIES - The libraries needed to use libtorrent-rasterbar
-#  LibtorrentRasterbar_DEFINITIONS - Compiler switches required for using libtorrent-rasterbar
-#  LibtorrentRasterbar_OPENSSL_ENABLED - libtorrent-rasterbar uses and links against OpenSSL
-
-find_package(Threads REQUIRED)
-find_package(PkgConfig QUIET)
-
-macro(_detect_boost_components _outComponets librariesList)
-    string(REGEX MATCHALL "boost_[a-z_]+[-a-z]*" _boost_libraries "${librariesList}")
-    string(REGEX REPLACE "boost_([a-z_]+)[-a-z]*" "\\1" ${_outComponets} "${_boost_libraries}")
-endmacro()
-
-if(PKG_CONFIG_FOUND)
-    pkg_check_modules(PC_LIBTORRENT_RASTERBAR QUIET libtorrent-rasterbar)
-endif()
-
-if(LibtorrentRasterbar_USE_STATIC_LIBS)
-    set(LibtorrentRasterbar_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
-    set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
-endif()
-
-if(PC_LIBTORRENT_RASTERBAR_FOUND)
-    set(LibtorrentRasterbar_DEFINITIONS ${PC_LIBTORRENT_RASTERBAR_CFLAGS})
-else()
-    if(LibtorrentRasterbar_CUSTOM_DEFINITIONS)
-        set(LibtorrentRasterbar_DEFINITIONS ${LibtorrentRasterbar_CUSTOM_DEFINITIONS})
-    else()
-        # Without pkg-config, we can't possibly figure out the correct build flags.
-        # libtorrent is very picky about those. Let's take a set of defaults and
-        # hope that they apply. If not, you the user are on your own.
-        set(LibtorrentRasterbar_DEFINITIONS
-            -DTORRENT_USE_LIBCRYPTO
-            # TODO: remove the following define as it is not used since OpenSSL >= 1.1
-            -DTORRENT_USE_OPENSSL
-            -DBOOST_ASIO_ENABLE_CANCELIO
-            -DUNICODE -D_UNICODE -D_FILE_OFFSET_BITS=64)
-    endif()
-
-    if(NOT LibtorrentRasterbar_USE_STATIC_LIBS)
-        list(APPEND LibtorrentRasterbar_DEFINITIONS
-            -DTORRENT_LINKING_SHARED
-            -DBOOST_SYSTEM_DYN_LINK)
-    endif()
-endif()
-
-message(STATUS "libtorrent definitions: ${LibtorrentRasterbar_DEFINITIONS}")
-
-find_path(LibtorrentRasterbar_INCLUDE_DIR libtorrent
-          HINTS ${PC_LIBTORRENT_RASTERBAR_INCLUDEDIR} ${PC_LIBTORRENT_RASTERBAR_INCLUDE_DIRS}
-          PATH_SUFFIXES libtorrent-rasterbar)
-
-find_library(LibtorrentRasterbar_LIBRARY NAMES torrent-rasterbar libtorrent
-             HINTS ${PC_LIBTORRENT_RASTERBAR_LIBDIR} ${PC_LIBTORRENT_RASTERBAR_LIBRARY_DIRS})
-
-if(LibtorrentRasterbar_USE_STATIC_LIBS)
-    set(CMAKE_FIND_LIBRARY_SUFFIXES ${LibtorrentRasterbar_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-endif()
-
-set(LibtorrentRasterbar_LIBRARIES ${LibtorrentRasterbar_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
-set(LibtorrentRasterbar_INCLUDE_DIRS ${LibtorrentRasterbar_INCLUDE_DIR})
-
-# Without pkg-config, we can't possibly figure out the correct boost dependencies
-if (LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES)
-    set(_boost_components "${LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES}")
-else(LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES)
-    if(PC_LIBTORRENT_RASTERBAR_FOUND)
-        _detect_boost_components(_boost_components "${PC_LIBTORRENT_RASTERBAR_LIBRARIES}")
-    else()
-        # all possible boost dependencies
-        set(_boost_components
-            date_time
-            system
-            chrono
-            random
-            thread
-        )
-    endif()
-endif(LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES)
-
-list(SORT _boost_components)
-message(STATUS "Libtorrent Boost dependencies: ${_boost_components}")
-find_package(Boost REQUIRED COMPONENTS ${_boost_components})
-set(LibtorrentRasterbar_LIBRARIES ${LibtorrentRasterbar_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-foreach(_boost_cmpnt IN LISTS _boost_components)
-    list(APPEND LibtorrentRasterbar_LIBRARIES "Boost::${_boost_cmpnt}")
-endforeach(_boost_cmpnt)
-
-set(LibtorrentRasterbar_INCLUDE_DIRS ${LibtorrentRasterbar_INCLUDE_DIRS})
-
-list(FIND LibtorrentRasterbar_DEFINITIONS -DTORRENT_USE_OPENSSL LibtorrentRasterbar_ENCRYPTION_INDEX)
-if(LibtorrentRasterbar_ENCRYPTION_INDEX GREATER -1)
-    find_package(OpenSSL REQUIRED)
-    set(LibtorrentRasterbar_LIBRARIES ${LibtorrentRasterbar_LIBRARIES} OpenSSL::SSL OpenSSL::Crypto)
-    list(APPEND LibtorrentRasterbar_INCLUDE_DIRS "${OPENSSL_INCLUDE_DIR}")
-    set(LibtorrentRasterbar_OPENSSL_ENABLED ON)
-endif()
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set LibtorrentRasterbar_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(LibtorrentRasterbar DEFAULT_MSG
-                                  LibtorrentRasterbar_LIBRARY
-                                  LibtorrentRasterbar_INCLUDE_DIR)
-
-mark_as_advanced(LibtorrentRasterbar_INCLUDE_DIR LibtorrentRasterbar_LIBRARY
-    LibtorrentRasterbar_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES
-    LibtorrentRasterbar_ENCRYPTION_INDEX)
-
-if (LibtorrentRasterbar_FOUND AND NOT TARGET LibtorrentRasterbar::torrent-rasterbar)
-    add_library(LibtorrentRasterbar::torrent-rasterbar UNKNOWN IMPORTED)
-
-    set_target_properties(LibtorrentRasterbar::torrent-rasterbar PROPERTIES
-        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-        IMPORTED_LOCATION "${LibtorrentRasterbar_LIBRARY}"
-        INTERFACE_INCLUDE_DIRECTORIES "${LibtorrentRasterbar_INCLUDE_DIRS}"
-        INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${LibtorrentRasterbar_INCLUDE_DIRS}"
-        INTERFACE_LINK_LIBRARIES "${LibtorrentRasterbar_LIBRARIES}"
-        INTERFACE_COMPILE_OPTIONS "${LibtorrentRasterbar_DEFINITIONS}"
-    )
-endif()

cmake/Modules/FindSystemd.cmake

@@ -8,7 +8,7 @@ find_package(PkgConfig QUIET REQUIRED)
 
 if (NOT SYSTEMD_FOUND)
     pkg_check_modules(SYSTEMD "systemd")
-endif(NOT SYSTEMD_FOUND)
+endif()
 
 if (SYSTEMD_FOUND AND "${SYSTEMD_SERVICES_INSTALL_DIR}" STREQUAL "")
     execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE}
@@ -23,4 +23,4 @@ endif()
 
 if (SYSTEMD_FOUND)
     message(STATUS "systemd services install dir: ${SYSTEMD_SERVICES_INSTALL_DIR}")
-endif(SYSTEMD_FOUND)
+endif()

cmake/Modules/FunctionReadVersion.cmake

@@ -1,28 +0,0 @@
-# function for parsing version variables that are set in version.pri file
-# the version identifiers there are defined as follows:
-# VER_MAJOR = 3
-# VER_MINOR = 4
-# VER_BUGFIX = 0
-# VER_BUILD = 0
-# VER_STATUS = alpha
-
-function(read_version priFile outMajor outMinor outBugfix outBuild outStatus)
-    file(STRINGS ${priFile} _priFileContents REGEX "^VER_.+")
-    # message(STATUS "version.pri version contents: ${_priFileContents}")
-    # the _priFileContents variable contains something like the following:
-    # VER_MAJOR = 3;VER_MINOR = 4;VER_BUGFIX = 0;VER_BUILD = 0;VER_STATUS = alpha # Should be empty for stable releases!
-    set(_regex "VER_MAJOR += +([0-9]+);VER_MINOR += +([0-9]+);VER_BUGFIX += +([0-9]+);VER_BUILD += +([0-9]+);VER_STATUS += +([0-9A-Za-z]+)?")
-     # note quotes around _regex, they are needed because the variable contains semicolons
-    string(REGEX MATCH "${_regex}" _tmp "${_priFileContents}")
-    if (NOT _tmp)
-        message(FATAL_ERROR "Could not detect project version number from ${priFile}")
-    endif()
-
-    # message(STATUS "Matched version string: ${_tmp}")
-
-    set(${outMajor} ${CMAKE_MATCH_1} PARENT_SCOPE)
-    set(${outMinor} ${CMAKE_MATCH_2} PARENT_SCOPE)
-    set(${outBugfix} ${CMAKE_MATCH_3} PARENT_SCOPE)
-    set(${outBuild} ${CMAKE_MATCH_4} PARENT_SCOPE)
-    set(${outStatus} ${CMAKE_MATCH_5} PARENT_SCOPE)
-endfunction()

cmake/Modules/MacroConfigureMSVCRuntime.cmake

@@ -1,36 +0,0 @@
-macro(configure_msvc_runtime)
-    # Default to statically-linked runtime.
-    if("${MSVC_RUNTIME}" STREQUAL "")
-        set(MSVC_RUNTIME "static")
-    endif()
-    # Set compiler options.
-    set(variables
-        CMAKE_C_FLAGS_DEBUG
-        CMAKE_C_FLAGS_MINSIZEREL
-        CMAKE_C_FLAGS_RELEASE
-        CMAKE_C_FLAGS_RELWITHDEBINFO
-        CMAKE_CXX_FLAGS_DEBUG
-        CMAKE_CXX_FLAGS_MINSIZEREL
-        CMAKE_CXX_FLAGS_RELEASE
-        CMAKE_CXX_FLAGS_RELWITHDEBINFO
-    )
-    if(${MSVC_RUNTIME} STREQUAL "static")
-        message(STATUS
-            "MSVC -> forcing use of statically-linked runtime."
-        )
-        foreach(variable ${variables})
-            if(${variable} MATCHES "/MD")
-                string(REGEX REPLACE "/MD" "/MT" ${variable} "${${variable}}")
-            endif()
-        endforeach()
-    else()
-        message(STATUS
-            "MSVC -> forcing use of dynamically-linked runtime."
-        )
-        foreach(variable ${variables})
-            if(${variable} MATCHES "/MT")
-                string(REGEX REPLACE "/MT" "/MD" ${variable} "${${variable}}")
-            endif()
-        endforeach()
-    endif()
-endmacro()

cmake/Modules/MacroLinkQtComponents.cmake

@@ -1,28 +0,0 @@
-# - macro similar to target_link_libraries, which links Qt components
-# names of the components are passed in Qt4/Qt5 agnostic way (Core, DBus, Xml...)
-# and the macro links Qt4 ones if QT4_FOUND is set or Qt5 ones if not
-
-macro (target_link_qt_components target)
-if (QT4_FOUND)
-    foreach(_cmp ${ARGN})
-        if ("${_cmp}" STREQUAL "PRIVATE" OR
-            "${_cmp}" STREQUAL "PUBLIC" OR
-            "${_cmp}" STREQUAL "INTERFACE")
-             list(APPEND _QT_CMPNTS "${_cmp}")
-        else()
-            list(APPEND _QT_CMPNTS "Qt4::Qt${_cmp}")
-        endif()
-    endforeach()
-else (QT4_FOUND)
-    foreach(_cmp ${ARGN})
-        if ("${_cmp}" STREQUAL "PRIVATE" OR
-            "${_cmp}" STREQUAL "PUBLIC" OR
-            "${_cmp}" STREQUAL "INTERFACE")
-             list(APPEND _QT_CMPNTS "${_cmp}")
-        else()
-            list(APPEND _QT_CMPNTS "Qt5::${_cmp}")
-        endif()
-    endforeach()
-endif (QT4_FOUND)
-    target_link_libraries(${target} ${_QT_CMPNTS})
-endmacro()

cmake/Modules/MacroQbtCommonConfig.cmake

@@ -0,0 +1,112 @@
+# Set common variables and create some interface-only library targets
+# that some or all other targets will link to, either directly or transitively,
+# to consume common compile options/definitions
+
+macro(qbt_common_config)
+
+    # treat value specified by the CXX_STANDARD target property as a requirement by default
+    set(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+    # these definitions are only needed for calls to
+    # lt::generate_fingerprint and for the qbittorrent.rc file on Windows
+    add_library(qbt_version_definitions INTERFACE)
+
+    target_compile_definitions(qbt_version_definitions INTERFACE
+        QBT_VERSION_MAJOR=${qBittorrent_VERSION_MAJOR}
+        QBT_VERSION_MINOR=${qBittorrent_VERSION_MINOR}
+        QBT_VERSION_BUGFIX=${qBittorrent_VERSION_PATCH}
+        QBT_VERSION_BUILD=${qBittorrent_VERSION_TWEAK}
+    )
+
+    add_library(qbt_common_cfg INTERFACE)
+
+    # Full C++ 14 support is required
+    # See also https://cmake.org/cmake/help/latest/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.html
+    # for a breakdown of the features that CMake recognizes for each C++ standard
+    target_compile_features(qbt_common_cfg INTERFACE
+        cxx_std_14
+        cxx_aggregate_default_initializers
+        cxx_attribute_deprecated
+        cxx_binary_literals
+        cxx_contextual_conversions
+        cxx_decltype_auto
+        cxx_digit_separators
+        cxx_generic_lambdas
+        cxx_lambda_init_captures
+        cxx_relaxed_constexpr
+        cxx_return_type_deduction
+        cxx_variable_templates
+    )
+
+    set(QBT_PROJECT_VERSION "${qBittorrent_VERSION_MAJOR}.${qBittorrent_VERSION_MINOR}.${qBittorrent_VERSION_PATCH}")
+    if (NOT ${qBittorrent_VERSION_TWEAK} EQUAL 0)
+        set(QBT_PROJECT_VERSION "${QBT_PROJECT_VERSION}.${qBittorrent_VERSION_TWEAK}")
+    endif()
+
+    set(QBT_FULL_VERSION "${QBT_PROJECT_VERSION}${QBT_VER_STATUS}")
+
+    target_compile_definitions(qbt_common_cfg INTERFACE
+        QBT_VERSION="v${QBT_FULL_VERSION}"
+        QBT_VERSION_2="${QBT_FULL_VERSION}"
+        QT_DEPRECATED_WARNINGS
+        QT_NO_CAST_TO_ASCII
+        QT_NO_CAST_FROM_BYTEARRAY
+        QT_USE_QSTRINGBUILDER
+        QT_STRICT_ITERATORS
+        $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG_OUTPUT>
+    )
+
+    if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+        target_compile_definitions(qbt_common_cfg INTERFACE
+            NTDDI_VERSION=0x06010000
+            _WIN32_WINNT=0x0601
+            _WIN32_IE=0x0601
+            WIN32_LEAN_AND_MEAN
+            NOMINMAX
+            UNICODE
+            _UNICODE
+        )
+    endif()
+
+    if ((CXX_COMPILER_ID STREQUAL "GNU") OR (CXX_COMPILER_ID STREQUAL "Clang") OR (CXX_COMPILER_ID STREQUAL "AppleClang"))
+        target_compile_options(qbt_common_cfg INTERFACE
+            -Wall
+            -Wextra
+            -Wcast-qual
+            -Wcast-align
+            -Winvalid-pch
+            -Woverloaded-virtual
+            -Wold-style-cast
+            -Wnon-virtual-dtor
+            -pedantic
+            -pedantic-errors
+        )
+
+        # Clang 11 still doesn't support -Wstrict-null-sentinel
+        include(CheckCXXCompilerFlag)
+        check_cxx_compiler_flag(-Wstrict-null-sentinel SNS_SUPPORT)
+        if (SNS_SUPPORT)
+            target_compile_options(qbt_common_cfg INTERFACE -Wstrict-null-sentinel)
+        endif()
+    endif()
+
+    if (MINGW)
+        target_link_options(qbt_common_cfg INTERFACE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:LINKER:--dynamicbase>)
+    endif()
+
+    if (MSVC_RUNTIME_DYNAMIC)
+        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+    else()
+        set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+    endif()
+
+    if (MSVC)
+        target_compile_options(qbt_common_cfg INTERFACE /guard:cf)
+        target_link_options(qbt_common_cfg INTERFACE /guard:cf
+            $<$<NOT:$<CONFIG:Debug>>:/OPT:REF /OPT:ICF>
+            # suppress linking warning due to /INCREMENTAL and /OPT:ICF being both ON
+            $<$<CONFIG:RelWithDebInfo>:/INCREMENTAL:NO>
+        )
+    endif()
+
+endmacro(qbt_common_config)

cmake/Modules/MacroQbtCompilerSettings.cmake

@@ -1,74 +0,0 @@
-# Sets cache variable QBT_ADDITONAL_FLAGS and QBT_ADDITONAL_CXX_FLAGS to list of additional
-# compiler flags for C and C++ (QBT_ADDITONAL_FLAGS) and for C++ only (QBT_ADDITONAL_CXX_FLAGS)
-# and appends them to CMAKE_XXX_FLAGS variables.
-
-# It could use add_compile_options(), but then it is needed to use generator expressions,
-# and most interesting of them are not compatible with Visual Studio :(
-
-macro(qbt_set_compiler_options)
-# if (NOT QBT_ADDITONAL_FLAGS)
-    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-        #-Wshadow -Wconversion ?
-        set(_GCC_COMMON_C_AND_CXX_FLAGS "-Wall -Wextra"
-            "-Wcast-qual -Wcast-align"
-            "-Winvalid-pch -Wno-long-long"
-            #"-fstack-protector-all"
-            #"-Werror -Wno-error=deprecated-declarations"
-        )
-        set(_GCC_COMMON_CXX_FLAGS "-fexceptions -frtti"
-            "-Woverloaded-virtual -Wold-style-cast"
-            "-Wnon-virtual-dtor"
-            #"-Weffc++"
-            #"-Werror -Wno-error=cpp"
-            # we should modify code to make these ones obsolete
-            #"-Wno-error=sign-conversion -Wno-error=float-equal"
-        )
-
-        # GCC 4.8 has problems with std::array and its initialization
-        if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
-            list(APPEND _GCC_COMMON_CXX_FLAGS "-Wno-error=missing-field-initializers")
-        endif()
-
-        include(CheckCXXCompilerFlag)
-        # check for -pedantic
-        check_cxx_compiler_flag(-pedantic _PEDANTIC_IS_SUPPORTED)
-        if (_PEDANTIC_IS_SUPPORTED)
-            list(APPEND _GCC_COMMON_CXX_FLAGS "-pedantic -pedantic-errors")
-        else (_PEDANTIC_IS_SUPPORTED)
-            list(APPEND _GCC_COMMON_CXX_FLAGS "-Wpedantic")
-        endif (_PEDANTIC_IS_SUPPORTED)
-
-        if (CMAKE_SYSTEM_NAME MATCHES Linux)
-            add_definitions(-D_DEFAULT_SOURCE)
-        endif()
-
-        # Clang 5.0 still doesn't support -Wstrict-null-sentinel
-        if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-            check_cxx_compiler_flag(-Wstrict-null-sentinel _STRICT_NULL_SENTINEL_IS_SUPPORTED)
-            if (_STRICT_NULL_SENTINEL_IS_SUPPORTED)
-                list(APPEND _GCC_COMMON_CXX_FLAGS "-Wstrict-null-sentinel")
-            endif (_STRICT_NULL_SENTINEL_IS_SUPPORTED)
-
-            # Code should be improved to render this not needed
-            list(APPEND _GCC_COMMON_CXX_FLAGS "-Wno-error=unused-function")
-        else ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-            # GCC supports it
-            list(APPEND _GCC_COMMON_CXX_FLAGS "-Wstrict-null-sentinel")
-        endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-
-        string(REPLACE ";" " " _GCC_COMMON_C_AND_CXX_FLAGS_STRING "${_GCC_COMMON_C_AND_CXX_FLAGS}")
-        string(REPLACE ";" " " _GCC_COMMON_CXX_FLAGS_STRING "${_GCC_COMMON_CXX_FLAGS}")
-
-        string(APPEND CMAKE_C_FLAGS " ${_GCC_COMMON_C_AND_CXX_FLAGS_STRING}")
-        string(APPEND CMAKE_CXX_FLAGS " ${_GCC_COMMON_C_AND_CXX_FLAGS_STRING} ${_GCC_COMMON_CXX_FLAGS_STRING}")
-    endif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
-
-    if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-        set(QBT_ADDITONAL_FLAGS "/wd4251 /wd4275 /wd4290  /W4" CACHE STRING "Additional qBittorent compile flags")
-    endif ()
-
-    string(APPEND CMAKE_C_FLAGS " ${QBT_ADDITONAL_FLAGS}")
-    string(APPEND CMAKE_CXX_FLAGS " ${QBT_ADDITONAL_FLAGS}")
-
-# endif (NOT QBT_ADDITONAL_FLAGS)
-endmacro(qbt_set_compiler_options)

cmake/Modules/QbtTargetSources.cmake

@@ -1,17 +0,0 @@
-# a helper function which appends source to the target
-# sources file names are relative to the the target source dir
-
-function (qbt_target_sources _target _scope)
-    get_target_property(targetSourceDir ${_target} SOURCE_DIR)
-    set(sourcesRelative "")
-    foreach(source IN ITEMS ${ARGN})
-        if(IS_ABSOLUTE "${source}")
-            set(sourceAbsolutePath "${source}")
-        else()
-            get_filename_component(sourceAbsolutePath "${source}" ABSOLUTE)
-        endif()
-        file(RELATIVE_PATH sourceRelativePath "${targetSourceDir}" "${sourceAbsolutePath}")
-        list(APPEND sourcesRelative "${sourceRelativePath}")
-    endforeach()
-    target_sources(${_target} ${_scope} "${sourcesRelative}")
-endfunction(qbt_target_sources)

cmake/Modules/QbtTranslations.cmake

@@ -1,48 +0,0 @@
-# macros to handle translation files
-
-# qbt_add_translations(<target> QRC_FILE <filename> TS_FILES <filenames>)
-# handles out of source builds for Qt resource files that include translations
-# The function generates translations out of the supplied list of .ts files in the build directory,
-# copies the .qrc file there, calls qt5_add_resources() adds its output to the target sources list.
-function(qbt_add_translations _target)
-    set(oneValueArgs QRC_FILE)
-    set(multiValueArgs TS_FILES)
-    cmake_parse_arguments(QBT_TR "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
-
-    get_target_property(_binaryDir ${_target} BINARY_DIR)
-
-    if (NOT QBT_TR_QRC_FILE)
-        message(FATAL_ERROR "QRC file is empty")
-    endif()
-    if (NOT QBT_TR_TS_FILES)
-        message(FATAL_ERROR "TS_FILES files are empty")
-    endif()
-
-    if(IS_ABSOLUTE "${QBT_TR_QRC_FILE}")
-        file(RELATIVE_PATH _qrcToTs "${CMAKE_CURRENT_SOURCE_DIR}" "${QBT_TR_QRC_FILE}")
-    else()
-        set(_qrcToTs "${QBT_TR_QRC_FILE}")
-    endif()
-
-    get_filename_component(_qrcToTsDir "${_qrcToTs}" DIRECTORY)
-
-    get_filename_component(_qmFilesBinaryDir "${CMAKE_CURRENT_BINARY_DIR}/${_qrcToTsDir}" ABSOLUTE)
-    # to make qt5_add_translation() work as we need
-    set_source_files_properties(${QBT_TR_TS_FILES} PROPERTIES OUTPUT_LOCATION "${_qmFilesBinaryDir}")
-    qt5_add_translation(_qmFiles ${QBT_TR_TS_FILES})
-
-    set(_qrc_dest_dir "${_binaryDir}/${_qrcToTsDir}")
-    set(_qrc_dest_file "${_binaryDir}/${QBT_TR_QRC_FILE}")
-
-    message(STATUS "copying ${QBT_TR_QRC_FILE} to ${_qrc_dest_dir}")
-    file(COPY ${QBT_TR_QRC_FILE} DESTINATION ${_qrc_dest_dir})
-
-    set_source_files_properties("${_qrc_dest_file}" PROPERTIES
-        GENERATED True
-        OBJECT_DEPENDS "${_qmFiles}")
-
-    # With AUTORCC enabled rcc is ran by cmake before language files are generated,
-    # and thus we call rcc explicitly
-    qt5_add_resources(_resources "${_qrc_dest_file}")
-    target_sources(${_target} PRIVATE "${_resources}")
-endfunction()

cmake/Modules/bundle.cmake

@@ -1,21 +0,0 @@
-set(BU_CHMOD_BUNDLE_ITEMS ON)
-include(DeployQt5)
-
-set(plugins "")
-
-get_property(svgIconPluginLocation TARGET Qt5::QSvgIconPlugin
-        PROPERTY LOCATION_RELEASE)
-list(APPEND plugins "${svgIconPluginLocation}")
-get_property(svgPluginLocation TARGET Qt5::QSvgPlugin
-        PROPERTY LOCATION_RELEASE)
-list(APPEND plugins "${svgPluginLocation}")
-
-set(sfx "")
-if(APPLE)
-    set(sfx ".app")
-elseif(WIN32)
-    set(sfx "${CMAKE_EXECUTABLE_SUFFIX}")
-endif()
-
-get_target_property(exe qBittorrent OUTPUT_NAME)
-install_qt5_executable("${exe}${sfx}" "${plugins}" "" "" "")

cmake/Modules/winconf-mingw.cmake

@@ -1,11 +0,0 @@
-if (("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") OR ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo"))
-    link_libraries(-Wl,--dynamicbase)
-endif ()
-
-list(APPEND LibtorrentRasterbar_CUSTOM_DEFINITIONS
-    -D_FILE_OFFSET_BITS=64
-    -D__USE_W32_SOCKETS)
-
-# libraries from winconf.pri
-link_libraries(advapi32 iphlpapi ole32 shell32 user32 wsock32 ws2_32)
-

cmake/Modules/winconf-msvc.cmake

@@ -1,7 +0,0 @@
-include(MacroConfigureMSVCRuntime)
-set(MSVC_RUNTIME "dynamic")
-configure_msvc_runtime()
-
-# libraries from winconf.pri
-link_libraries(advapi32 crypt32 Iphlpapi ole32 shell32 User32)
-

cmake/Modules/winconf.cmake

@@ -1,102 +0,0 @@
-# Settings for compiling qBittorrent on Windows
-
-list(APPEND CMAKE_LIBRARY_PATH "$ENV{LIB}")
-
-set(LibtorrentRasterbar_CUSTOM_DEFINITIONS
-    -DBOOST_ASIO_DISABLE_CONNECTEX
-    -DBOOST_EXCEPTION_DISABLE
-    -DTORRENT_USE_LIBCRYPTO
-    # TODO: remove the following define as it is not used since OpenSSL >= 1.1
-    -DTORRENT_USE_OPENSSL
-    # TODO: remove the following define as it is not used since libtorrent >= 1.2
-    -DTORRENT_DISABLE_RESOLVE_COUNTRIES
-)
-
-set(LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES system)
-
-# If you want to link with static version of libtorrent
-#set(LibtorrentRasterbar_USE_STATIC_LIBS True)
-#list(APPEND LibtorrentRasterbar_CUSTOM_DEFINITIONS
-#    -DBOOST_SYSTEM_STATIC_LINK=1)
-
-# and boost
-#set(Boost_USE_STATIC_LIBS True)
-#set(Boost_USE_STATIC_RUNTIME True)
-
-add_definitions(
-    -DNTDDI_VERSION=0x06010000
-    -D_WIN32_WINNT=0x0601
-    -D_WIN32_IE=0x0601
-    -DUNICODE
-    -D_UNICODE
-    -DWIN32
-    -D_WIN32
-    -DWIN32_LEAN_AND_MEAN
-    -D_CRT_SECURE_NO_DEPRECATE
-    -D_SCL_SECURE_NO_DEPRECATE
-    -DNOMINMAX
-    -DBOOST_ALL_NO_LIB
-)
-
-# Enable if libtorrent was built with this flag defined
-#list(APPEND LibtorrentRasterbar_CUSTOM_DEFINITIONS -DTORRENT_NO_DEPRECATE)
-
-if (("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") OR ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo"))
-    list(APPEND LibtorrentRasterbar_CUSTOM_DEFINITIONS
-    -DTORRENT_DEBUG)
-else ()
-    add_definitions(-DNDEBUG)
-endif ()
-
-# Here we assume that all required libraries are installed into the same prefix
-# with usual unix subdirectories (bin, lib, include)
-# if so, we just need to set CMAKE_SYSTEM_PREFIX_PATH
-# If it is not the case, individual paths need to be specified manually (see below)
-set(COMMON_INSTALL_PREFIX "c:/usr" CACHE PATH "Prefix used to install all the required libraries")
-list(APPEND CMAKE_SYSTEM_PREFIX_PATH "${COMMON_INSTALL_PREFIX}")
-
-# If two version of Qt are installed, separate prefixes are needed most likely
-set(QT5_INSTALL_PREFIX "${COMMON_INSTALL_PREFIX}/lib/qt5" CACHE PATH "Prefix where Qt5 is installed")
-
-# it is safe to set Qt dirs even if their files are directly in the prefix
-set(Qt5_DIR "${QT5_INSTALL_PREFIX}/lib/cmake/Qt5")
-
-# And now we can set specific values for the Boost and libtorrent libraries.
-# The following values are generated from the paths listed above just for an example
-# they have to be set to actual locations
-
-# Boost
-# set(BOOST_ROOT "${COMMON_INSTALL_PREFIX}")
-# set(Boost_version_suffix "1_59")
-# if a link like boost-version/boost -> boost was created or the boost directory was renamed in the same way,
-# the following needs adjustment
-# set(BOOST_INCLUDEDIR "${COMMON_INSTALL_PREFIX}/include/boost-${Boost_version_suffix}")
-# set(BOOST_LIBRARYDIR "${COMMON_INSTALL_PREFIX}/lib/")
-
-# libtorrent
-
-# set(PC_LIBTORRENT_RASTERBAR_INCLUDEDIR "${COMMON_INSTALL_PREFIX}")
-# set(PC_LIBTORRENT_RASTERBAR_LIBDIR "${COMMON_INSTALL_PREFIX}/lib")
-
-set(AUTOGEN_TARGETS_FOLDER "generated")
-
-set(CMAKE_INSTALL_BINDIR ".")
-
-# Test 32/64 bits
-if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    message(STATUS "Target is 64 bits")
-    if (WIN32)
-        set(WINXXBITS Win64)
-    endif(WIN32)
-else("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    message(STATUS "Target is 32 bits")
-    if (WIN32)
-        set(WINXXBITS Win32)
-    endif(WIN32)
-endif("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-
-if (MSVC)
-    include(winconf-msvc)
-else (MSVC)
-    include(winconf-mingw)
-endif (MSVC)

conf.pri.windows

@@ -13,17 +13,16 @@ LIBS += $$quote(-LC:/qBittorrent/openssl/lib)
 # Adapt the lib names/versions accordingly
 # If you want to use Boost auto-linking then disable
 # BOOST_ALL_NO_LIB below and omit Boost libraries here
+LIBS += libcrypto.lib libssl.lib libtorrent.lib zlib.lib
 CONFIG(debug, debug|release) {
-    LIBS += libtorrentd.lib \
-            libboost_system-vc140-mt-sgd-1_64.lib
+    LIBS += boost_system-vc140-mt-d.lib
 }
 else {
-    LIBS += libtorrent.lib \
-            libboost_system-vc140-mt-s-1_64.lib
+    LIBS += boost_system-vc140-mt.lib
 }
-LIBS += libeay32.lib ssleay32.lib
-LIBS += zlib.lib
+
 # ...or if you use MinGW
+#LIBS += libcrypto libssl libz
 #CONFIG(debug, debug|release) {
 #    LIBS += libtorrent-rasterbar \
 #            libboost_system-mt
@@ -32,8 +31,6 @@ LIBS += zlib.lib
 #    LIBS += libtorrent-rasterbar \
 #            libboost_system-mt
 #}
-#LIBS += libcrypto libssl
-#LIBS += libz
 
 # Disable to use Boost auto-linking
 DEFINES += BOOST_ALL_NO_LIB

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for qbittorrent v4.2.5.
+# Generated by GNU Autoconf 2.69 for qbittorrent v4.3.1.
 #
 # Report bugs to <bugs.qbittorrent.org>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='qbittorrent'
 PACKAGE_TARNAME='qbittorrent'
-PACKAGE_VERSION='v4.2.5'
-PACKAGE_STRING='qbittorrent v4.2.5'
+PACKAGE_VERSION='v4.3.1'
+PACKAGE_STRING='qbittorrent v4.3.1'
 PACKAGE_BUGREPORT='bugs.qbittorrent.org'
 PACKAGE_URL='https://www.qbittorrent.org/'
 
@@ -1302,7 +1302,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures qbittorrent v4.2.5 to adapt to many kinds of systems.
+\`configure' configures qbittorrent v4.3.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1373,7 +1373,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of qbittorrent v4.2.5:";;
+     short | recursive ) echo "Configuration of qbittorrent v4.3.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1509,7 +1509,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-qbittorrent configure v4.2.5
+qbittorrent configure v4.3.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1648,7 +1648,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by qbittorrent $as_me v4.2.5, which was
+It was created by qbittorrent $as_me v4.3.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3826,7 +3826,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='qbittorrent'
- VERSION='v4.2.5'
+ VERSION='v4.3.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5292,12 +5292,12 @@ if test -n "$libtorrent_CFLAGS"; then
     pkg_cv_libtorrent_CFLAGS="$libtorrent_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.1.10\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.1.10") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.2") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_libtorrent_CFLAGS=`$PKG_CONFIG --cflags "libtorrent-rasterbar >= 1.1.10" 2>/dev/null`
+  pkg_cv_libtorrent_CFLAGS=`$PKG_CONFIG --cflags "libtorrent-rasterbar >= 1.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -5309,12 +5309,12 @@ if test -n "$libtorrent_LIBS"; then
     pkg_cv_libtorrent_LIBS="$libtorrent_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.1.10\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.1.10") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.2") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_libtorrent_LIBS=`$PKG_CONFIG --libs "libtorrent-rasterbar >= 1.1.10" 2>/dev/null`
+  pkg_cv_libtorrent_LIBS=`$PKG_CONFIG --libs "libtorrent-rasterbar >= 1.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -5335,14 +5335,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtorrent-rasterbar >= 1.1.10" 2>&1`
+	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtorrent-rasterbar >= 1.2" 2>&1`
         else
-	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtorrent-rasterbar >= 1.1.10" 2>&1`
+	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtorrent-rasterbar >= 1.2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$libtorrent_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (libtorrent-rasterbar >= 1.1.10) were not met:
+	as_fn_error $? "Package requirements (libtorrent-rasterbar >= 1.2) were not met:
 
 $libtorrent_PKG_ERRORS
 
@@ -6343,7 +6343,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by qbittorrent $as_me v4.2.5, which was
+This file was extended by qbittorrent $as_me v4.3.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6401,7 +6401,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-qbittorrent config.status v4.2.5
+qbittorrent config.status v4.3.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -7659,7 +7659,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by qbittorrent $as_me v4.2.5, which was
+This file was extended by qbittorrent $as_me v4.3.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7717,7 +7717,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-qbittorrent config.status v4.2.5
+qbittorrent config.status v4.3.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([qbittorrent], [v4.2.5], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
+AC_INIT([qbittorrent], [v4.3.1], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_CC
@@ -178,7 +178,7 @@ AC_MSG_NOTICE([Boost.System LIB: "$BOOST_SYSTEM_LIB"])
 LIBS="$BOOST_SYSTEM_LIB $LIBS"
 
 PKG_CHECK_MODULES(libtorrent,
-                  [libtorrent-rasterbar >= 1.1.10],
+                  [libtorrent-rasterbar >= 1.2],
                   [CXXFLAGS="$libtorrent_CFLAGS $CXXFLAGS"
                   LIBS="$libtorrent_LIBS $LIBS"])
 

dist/CMakeLists.txt

@@ -1,12 +1,7 @@
-find_package(Qt5Widgets ${requiredQtVersion}) # to conditionally install desktop-related files
-
-if (APPLE)
+if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     add_subdirectory(mac)
-else (APPLE)
-    if (UNIX)
+elseif (UNIX AND (NOT APPLE))
     add_subdirectory(unix)
-    endif (UNIX)
-    if (WIN32)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
     add_subdirectory(windows)
-    endif (WIN32)
-endif (APPLE)
+endif()

dist/mac/CMakeLists.txt

@@ -0,0 +1 @@
+# empty

dist/mac/Info.plist

@@ -55,7 +55,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.2.5</string>
+	<string>4.3.0</string>
 	<key>CFBundleExecutable</key>
 	<string>@EXECUTABLE@</string>
 	<key>CFBundleIdentifier</key>

dist/unix/CMakeLists.txt

@@ -1,48 +1,56 @@
-if (NOT Qt5Widgets_FOUND)
-    feature_option(SYSTEMD "Install systemd service file (headless only)" OFF)
 if (SYSTEMD)
-        if (NOT Systemd_SERVICES_INSTALL_DIR)
+    if (NOT SYSTEMD_SERVICES_INSTALL_DIR)
         find_package(Systemd)
-            if (NOT Systemd_FOUND)
-                message(FATAL_ERROR "Could not locate systemd services install dir."
-                " Either pass -DSystemd_SERVICES_INSTALL_DIR=/path/to/systemd/services option or install systemd pkg-config")
-            endif(NOT Systemd_FOUND)
-        endif(NOT Systemd_SERVICES_INSTALL_DIR)
+        if (NOT SYSTEMD_FOUND)
+            message(
+                FATAL_ERROR
+                "Could not locate systemd services install dir."
+                " Either pass the -DSYSTEMD_SERVICES_INSTALL_DIR=/path/to/systemd/services option"
+                " or install systemd pkg-config"
+            )
+        endif()
+    endif()
     set(EXPAND_BINDIR ${CMAKE_INSTALL_FULL_BINDIR})
     configure_file(systemd/qbittorrent-nox@.service.in ${CMAKE_CURRENT_BINARY_DIR}/qbittorrent-nox@.service @ONLY)
-        install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qbittorrent-nox@.service
-            DESTINATION ${Systemd_SERVICES_INSTALL_DIR}
-            COMPONENT data)
-    endif(SYSTEMD)
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qbittorrent-nox@.service"
+        DESTINATION ${SYSTEMD_SERVICES_INSTALL_DIR}
+        COMPONENT data
+    )
 endif()
 
-if (Qt5Widgets_FOUND)
-    list(APPEND MAN_FILES ${qBittorrent_SOURCE_DIR}/doc/qbittorrent.1)
-else (Qt5Widgets_FOUND)
-    list(APPEND MAN_FILES ${qBittorrent_SOURCE_DIR}/doc/qbittorrent-nox.1)
-endif (Qt5Widgets_FOUND)
+if (GUI)
+    list(APPEND MAN_FILES ${PROJECT_SOURCE_DIR}/doc/qbittorrent.1)
+else()
+    list(APPEND MAN_FILES ${PROJECT_SOURCE_DIR}/doc/qbittorrent-nox.1)
+endif()
 
 install(FILES ${MAN_FILES}
     DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
-        COMPONENT doc)
+    COMPONENT doc
+)
 
-if (Qt5Widgets_FOUND)
+if (GUI)
     install(DIRECTORY menuicons/
         DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor
-            FILES_MATCHING PATTERN "*.png")
+        COMPONENT data
+        FILES_MATCHING PATTERN "*.png"
+    )
 
     install(FILES org.qbittorrent.qBittorrent.desktop
         DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/
-            COMPONENT data)
+        COMPONENT data
+    )
 
     install(FILES org.qbittorrent.qBittorrent.appdata.xml
         DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo/
-            COMPONENT data)
+        COMPONENT data
+    )
 
     install(FILES
-            ${qBittorrent_SOURCE_DIR}/src/icons/skin/qbittorrent-tray.svg
-            ${qBittorrent_SOURCE_DIR}/src/icons/skin/qbittorrent-tray-dark.svg
-            ${qBittorrent_SOURCE_DIR}/src/icons/skin/qbittorrent-tray-light.svg
+        ${PROJECT_SOURCE_DIR}/src/icons/qbittorrent-tray.svg
+        ${PROJECT_SOURCE_DIR}/src/icons/qbittorrent-tray-dark.svg
+        ${PROJECT_SOURCE_DIR}/src/icons/qbittorrent-tray-light.svg
         DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/status
-        COMPONENT data)
+        COMPONENT data
+    )
 endif()

dist/unix/org.qbittorrent.qBittorrent.appdata.xml

@@ -74,6 +74,6 @@
   <url type="translate">https://github.com/qbittorrent/qBittorrent/wiki/How-to-translate-qBittorrent</url>
   <content_rating type="oars-1.1"/>
   <releases>
-    <release version="4.2.5" date="2020-04-25"/>
+    <release version="4.3.1" date="2020-11-25"/>
   </releases>
 </component>

dist/unix/org.qbittorrent.qBittorrent.desktop

@@ -11,8 +11,6 @@ Type=Application
 StartupNotify=false
 StartupWMClass=qbittorrent
 Keywords=bittorrent;torrent;magnet;download;p2p;
-
-# Translations
 Comment[oc]=Telecargar e partejar de fichièrs amb BitTorrent
 GenericName[oc]=Client BitTorrent
 Name[oc]=qBittorrent
@@ -22,8 +20,8 @@ Name[af]=qBittorrent
 Comment[ar]=نزّل وشارك الملفات عبر كيوبت‎تورنت
 GenericName[ar]=عميل بت‎تورنت
 Name[ar]=كيوبت‎تورنت
-Comment[be]=Сцягванне і раздача файлаў праз пратакол BitTorrent
-GenericName[be]=BitTorrent-кліент
+Comment[be]=Спампоўванне і раздача файлаў праз пратакол BitTorrent
+GenericName[be]=Кліент BitTorrent
 Name[be]=qBittorrent
 Comment[bg]=Сваляне и споделяне на файлове чрез BitTorrent
 GenericName[bg]=BitTorrent клиент
@@ -34,19 +32,19 @@ Name[bn]=কিউবি্টটরেন্ট
 Comment[bs]=Preuzmi i dijeli datoteke preko BitTorrent-a
 GenericName[bs]=BitTorrent klijent
 Name[bs]=qBittorrent
-Comment[ca]=Baixeu i compartiu fitxers mitjançant BitTorrent
+Comment[ca]=Baixeu i compartiu fitxers amb el BitTorrent
 GenericName[ca]=Client de BitTorrent
 Name[ca]=qBittorrent
 Comment[cs]=Stahování a sdílení souborů přes síť BitTorrent
 GenericName[cs]=BitTorrent klient
 Name[cs]=qBittorrent
 Comment[da]=Download og del filer over BitTorrent
-GenericName[da]=BitTorrent klient
+GenericName[da]=BitTorrent-klient
 Name[da]=qBittorrent
 Comment[de]=Über BitTorrent Dateien herunterladen und teilen
 GenericName[de]=BitTorrent Client
 Name[de]=qBittorrent
-Comment[el]=Κάντε λήψη και ανταλάξτε αρχεία μέσω BitTorrent
+Comment[el]=Κάντε λήψη και ανταλλάξτε αρχεία μέσω BitTorrent
 GenericName[el]=Πελάτης BitTorrent
 Name[el]=qBittorrent
 Comment[en_GB]=Download and share files over BitTorrent
@@ -55,7 +53,7 @@ Name[en_GB]=qBittorrent
 Comment[es]=Descargue y comparta archivos por BitTorrent
 GenericName[es]=Cliente BitTorrent
 Name[es]=qBittorrent
-Comment[eu]=Jeitsi eta elkarbanatu agiriak BitTorrent-en
+Comment[eu]=Jeitsi eta elkarbanatu agiriak BitTorrent bidez
 GenericName[eu]=BitTorrent bezeroa
 Name[eu]=qBittorrent
 Comment[fa]=دانلود و به اشتراک گذاری فایل های بوسیله  بیت تورنت
@@ -97,15 +95,18 @@ Name[ja]=qBittorrent
 Comment[ka]=ჩამოტვირთე და გააზიარე ფაილები Bittorrent-ის საშუალებით
 GenericName[ka]=BitTorrent კლიენტი
 Name[ka]=qBittorrent
-Comment[ko]=비트토런트를 통해 파일을 다운로드하고 공유합니다
+Comment[ko]=비트토런트를 통해 파일을 받고 공유합니다
 GenericName[ko]=비트토런트 클라이언트
-Name[ko]=큐빗토런트
+Name[ko]=qBittorrent
 Comment[zh]=通过 BitTorrent 下载和分享文件
 GenericName[zh]=BitTorrent 客户端
 Name[zh]=qBittorrent
 Comment[lt]=Atsisiųskite bei dalinkitės failais BitTorrent tinkle
 GenericName[lt]=BitTorrent klientas
 Name[lt]=qBittorrent
+Comment[mk]=Превземајте и споделувајте фајлови преку BitTorrent
+GenericName[mk]=BitTorrent клиент
+Name[mk]=qBittorrent
 Comment[nb]=Last ned og del filer over BitTorrent
 GenericName[nb]=BitTorrent-klient
 Name[nb]=qBittorrent
@@ -113,7 +114,7 @@ Comment[nqo]=ߞߐߕߐ߯ߘߐ ߟߎ߬ ߟߊߖߌ߰ ߞߊ߬ ߓߊ߲߫ ߞߵߊ߬ߟߎ߬ ߘ
 GenericName[nqo]=ߓߌߙߏߙߍ߲ߕ ߕߣߐ߬ߓߐ߬ߟߊ
 Name[nqo]=ߞߎ߳ߓߌߕߏߙߍ߲ߕ
 Comment[nl]=Bestanden downloaden en delen via BitTorrent
-GenericName[nl]=BitTorrent-cliënt
+GenericName[nl]=BitTorrent-client
 Name[nl]=qBittorrent
 Comment[pl]=Pobieraj i dziel się plikami przez BitTorrent
 GenericName[pl]=Klient BitTorrent
@@ -127,8 +128,8 @@ Name[pt_BR]=qBittorrent
 Comment[ro]=Descărcați și partajați fișiere prin BitTorrent
 GenericName[ro]=Client BitTorrent
 Name[ro]=qBittorrent
-Comment[ru]=Скачивайте и делитесь файлами с помощью BitTorrent
-GenericName[ru]=BitTorrent-клиент
+Comment[ru]=Обмен файлами по сети BitTorrent
+GenericName[ru]=Клиент сети BitTorrent
 Name[ru]=qBittorrent
 Comment[sk]=Sťahovanie a zdieľanie súborov prostredníctvom siete BitTorrent
 GenericName[sk]=Klient siete BitTorrent
@@ -146,16 +147,19 @@ Name[sv]=qBittorrent
 Comment[uz@Latn]=BitTorrent orqali fayllarni yuklab olish va baham ko‘rish
 GenericName[uz@Latn]=BitTorrent mijozi
 Name[uz@Latn]=qBittorrent
-Comment[te]=క్యు  బిట్ టొరెంట్ తో ఫైల్స్ దిగుమతి చేసుకోండి , పంచుకోండి
-GenericName[te]=క్యు  బిట్ టొరెంట్ క్లయింట్ 
-Name[te]=క్యు  బిట్ టొరెంట్
+Comment[ltg]=Atsasyuteit i daleit failus ar BitTorrent
+GenericName[ltg]=BitTorrent klients
+Name[ltg]=qBittorrent
 Comment[hi_IN]= अपनी फाइलें BitTorrent के माध्यम से डाउनलोड आैर साॅझा करें
 GenericName[hi_IN]=BitTorrent उपभोक्ता
 Name[hi_IN]=qBittorrent
 Comment[tr]=Dosyaları BitTorrent üzerinden indirin ve paylaşın
 GenericName[tr]=BitTorrent istemcisi
 Name[tr]=qBittorrent
-Comment[uk]=Завантажувати і обмінюватися файлами через BitTorrent
+Comment[ur]=BitTorrent پر فائلوں کو ڈاؤن لوڈ کریں اور اشتراک کریں
+GenericName[ur]=قیو بٹ ٹورنٹ   کلائنٹ
+Name[ur]=قیو بٹ ٹورنٹ
+Comment[uk]=Завантажуйте та поширюйте файли через BitTorrent
 GenericName[uk]=BitTorrent-клієнт
 Name[uk]=qBittorrent
 Comment[vi]=Tải về và chia sẻ các tập tin thông qua BitTorrent
@@ -179,9 +183,15 @@ Name[eo]=qBittorrent
 Comment[mn_MN]=BitTorrent ашиглан файлуудыг татаж түгээх
 GenericName[mn_MN]=BitTorrent үйлчлүүлэгч
 Name[mn_MN]=qBittorrent
+Comment[ta]=BitTorrent வழியாக கோப்புகளை பதிவிறக்க மற்றும் பகிர
+GenericName[ta]=BitTorrent வாடிக்கையாளர்
+Name[ta]=qBittorrent
 Comment[ne_NP]=फाइलहरू डाउनलोड गर्नुहोस् र BitTorrent मा साझा गर्नुहोस्
 GenericName[ne_NP]=BitTorrent क्लाइन्ट
 Name[ne_NP]=qBittorrent
+Comment[te]=క్యు  బిట్ టొరెంట్ తో ఫైల్స్ దిగుమతి చేసుకోండి , పంచుకోండి
+GenericName[te]=క్యు  బిట్ టొరెంట్ క్లయింట్
+Name[te]=క్యు  బిట్ టొరెంట్
 Comment[en_AU]=Download and share files over BitTorrent
 GenericName[en_AU]=BitTorrent client
 Name[en_AU]=qBittorrent

dist/unix/systemd/qbittorrent-nox@.service.in

@@ -1,5 +1,5 @@
 [Unit]
-Description=qBittorrenti-nox service for user %I
+Description=qBittorrent-nox service for user %I
 Documentation=man:qbittorrent-nox(1)
 Wants=network-online.target
 After=network-online.target nss-lookup.target

dist/windows/CMakeLists.txt

@@ -1 +1,4 @@
-install(FILES qt.conf DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(FILES qt.conf
+    DESTINATION ${CMAKE_INSTALL_BINDIR}
+    COMPONENT runtime
+)

dist/windows/README.txt

@@ -8,7 +8,8 @@ TRANSLATORS:
    english message to help you with the translation.
 4. Edit only the part inside the quotation marks(""). Unless you know
    what you are doing.
-5. Save the files with utf8 encoding and BOM.
+5. Save the files with UTF-8 encoding, without BOM
+   (this should be the default in any modern text editor).
 6. Submit your changes: 1) as a pull request to the official git repo or
    2) open an issue to the bugtracker and attach them or 3) via email or
    4)the same way you provide the translations for qbt itself

dist/windows/installer-translations/afrikaans.nsi

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_AFRIKAANS} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_AFRIKAANS} "Disable Windows path length limit (
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_AFRIKAANS} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_ALBANIAN} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_ALBANIAN} "Disable Windows path length limit (2
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_ALBANIAN} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_ARABIC} "qBittorrent (مطلوب)"
@@ -20,7 +20,7 @@ LangString inst_pathlimit ${LANG_ARABIC} "Disable Windows path length limit (260
 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_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
 LangString inst_uninstall_question ${LANG_ARABIC} "يوجد نسخة سابقة من البرنامج. سيتم إزالتها دون حذف إعدادات المستخدم"
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_ARABIC} "جاري ازالة النسخة السابقة من البرنامج"

dist/windows/installer-translations/basque.nsi

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_BASQUE} "qBittorrent (beharrezkoa)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_BASQUE} "Disable Windows path length limit (260
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_BASQUE} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_BELARUSIAN} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_BELARUSIAN} "Disable Windows path length limit
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_BELARUSIAN} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_BOSNIAN} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_BOSNIAN} "Disable Windows path length limit (26
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_BOSNIAN} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_BRETON} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_BRETON} "Disable Windows path length limit (260
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_BRETON} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_BULGARIAN} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_BULGARIAN} "Disable Windows path length limit (
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_BULGARIAN} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_CATALAN} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_CATALAN} "Disable Windows path length limit (26
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_CATALAN} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_CROATIAN} "qBittorrent (neophodno)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_CROATIAN} "Disable Windows path length limit (2
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_CROATIAN} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_CZECH} "qBittorrent (vyžadováno)"
@@ -20,7 +20,7 @@ LangString inst_pathlimit ${LANG_CZECH} "Disable Windows path length limit (260
 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_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
 LangString inst_uninstall_question ${LANG_CZECH} "Předchozí instalace byla nalezena. Bude odinstalována ale uživatelská nastavení budou zachována."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_CZECH} "Odinstalace předchozí verze."

dist/windows/installer-translations/danish.nsi

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_DANISH} "qBittorrent (påkrævet)"
@@ -20,7 +20,7 @@ LangString inst_pathlimit ${LANG_DANISH} "Disable Windows path length limit (260
 LangString inst_firewallinfo ${LANG_DANISH} "Tilføjer Windows Firewall-regel"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_DANISH} "qBittorrent kører. Luk venligst programmet inden 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_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
 LangString inst_uninstall_question ${LANG_DANISH} "En tidligere installation blev registreret. Den vil blive afinstalleret uden at brugerindstillingerne slettes."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_DANISH} "Afinstallerer tidligere version."

dist/windows/installer-translations/dutch.nsi

@@ -1,59 +1,59 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
-LangString inst_qbt_req ${LANG_DUTCH} "qBittorrent (required)"
+LangString inst_qbt_req ${LANG_DUTCH} "qBittorrent (vereist)"
 ;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_dekstop ${LANG_DUTCH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_DUTCH} "Bureaublad-snelkoppeling aanmaken"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
-LangString inst_startmenu ${LANG_DUTCH} "Create Start Menu Shortcut"
+LangString inst_startmenu ${LANG_DUTCH} "Startmenu-snelkoppeling aanmaken"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"
-LangString inst_startup ${LANG_DUTCH} "Start qBittorrent on Windows start up"
+LangString inst_startup ${LANG_DUTCH} "qBittorrent starten bij opstarten van Windows"
 ;LangString inst_torrent ${LANG_ENGLISH} "Open .torrent files with qBittorrent"
-LangString inst_torrent ${LANG_DUTCH} "Open .torrent files with qBittorrent"
+LangString inst_torrent ${LANG_DUTCH} "Torrentbestanden openen met qBittorrent"
 ;LangString inst_magnet ${LANG_ENGLISH} "Open magnet links with qBittorrent"
-LangString inst_magnet ${LANG_DUTCH} "Open magnet links with qBittorrent"
+LangString inst_magnet ${LANG_DUTCH} "Magneetkoppelingen openen met qBittorrent"
 ;LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule"
-LangString inst_firewall ${LANG_DUTCH} "Add Windows Firewall rule"
+LangString inst_firewall ${LANG_DUTCH} "Uitzondering aan Windows Firewall toevoegen"
 ;LangString inst_pathlimit ${LANG_ENGLISH} "Disable Windows path length limit (260 character MAX_PATH limitation, requires Windows 10 1607 or later)"
-LangString inst_pathlimit ${LANG_DUTCH} "Disable Windows path length limit (260 character MAX_PATH limitation, requires Windows 10 1607 or later)"
+LangString inst_pathlimit ${LANG_DUTCH} "De Windows-begrenzing voor padlengte uitschakelen (MAX_PATH-begrenzing tot 260 tekens, Windows 10 1607 of nieuwer is nodig)"
 ;LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule"
-LangString inst_firewallinfo ${LANG_DUTCH} "Adding Windows Firewall rule"
+LangString inst_firewallinfo ${LANG_DUTCH} "Uitzondering aan Windows Firewall toevoegen"
 ;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_warning ${LANG_DUTCH} "qBittorrent is actief. Sluit het af voordat u deze update installeert."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_DUTCH} "De huidige versie zal verwijderd worden. Gebruikersinstellingen en torrents blijven intact."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
-LangString inst_unist ${LANG_DUTCH} "Uninstalling previous version."
+LangString inst_unist ${LANG_DUTCH} "Vorige versie verwijderen."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
-LangString launch_qbt ${LANG_DUTCH} "Launch qBittorrent."
+LangString launch_qbt ${LANG_DUTCH} "qBittorrent starten."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
-LangString inst_requires_64bit ${LANG_DUTCH} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_DUTCH} "Dit installatieprogramma werkt alleen in 64-bit Windows-versies."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_DUTCH} "This qBittorrent version requires at least Windows 7."
+LangString inst_requires_win7 ${LANG_DUTCH} "Deze versie van qBittorrent vereist ten minste Windows 7."
 
 
 ;------------------------------------
 ;Uninstaller strings
 
 ;LangString remove_files ${LANG_ENGLISH} "Remove files"
-LangString remove_files ${LANG_DUTCH} "Remove files"
+LangString remove_files ${LANG_DUTCH} "Bestanden verwijderen"
 ;LangString remove_shortcuts ${LANG_ENGLISH} "Remove shortcuts"
-LangString remove_shortcuts ${LANG_DUTCH} "Remove shortcuts"
+LangString remove_shortcuts ${LANG_DUTCH} "Snelkoppelingen verwijderen"
 ;LangString remove_associations ${LANG_ENGLISH} "Remove file associations"
-LangString remove_associations ${LANG_DUTCH} "Remove file associations"
+LangString remove_associations ${LANG_DUTCH} "Bestandsassociaties verwijderen"
 ;LangString remove_registry ${LANG_ENGLISH} "Remove registry keys"
-LangString remove_registry ${LANG_DUTCH} "Remove registry keys"
+LangString remove_registry ${LANG_DUTCH} "Registersleutels verwijderen"
 ;LangString remove_conf ${LANG_ENGLISH} "Remove configuration files"
-LangString remove_conf ${LANG_DUTCH} "Remove configuration files"
+LangString remove_conf ${LANG_DUTCH} "Configuratiebestanden verwijderen"
 ;LangString remove_firewall ${LANG_ENGLISH} "Remove Windows Firewall rule"
-LangString remove_firewall ${LANG_DUTCH} "Remove Windows Firewall rule"
+LangString remove_firewall ${LANG_DUTCH} "Uitzondering uit Windows Firewall verwijderen"
 ;LangString remove_firewallinfo ${LANG_ENGLISH} "Removing Windows Firewall rule"
-LangString remove_firewallinfo ${LANG_DUTCH} "Removing Windows Firewall rule"
+LangString remove_firewallinfo ${LANG_DUTCH} "Uitzondering uit Windows Firewall verwijderen"
 ;LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data"
-LangString remove_cache ${LANG_DUTCH} "Remove torrents and cached data"
+LangString remove_cache ${LANG_DUTCH} "Torrents en cachegegevens verwijderen"
 ;LangString uninst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before uninstalling."
-LangString uninst_warning ${LANG_DUTCH} "qBittorrent is running. Please close the application before uninstalling."
+LangString uninst_warning ${LANG_DUTCH} "qBittorrent is actief. Sluit het af voordat u het verwijdert."
 ;LangString uninst_tor_warn ${LANG_ENGLISH} "Not removing .torrent association. It is associated with:"
-LangString uninst_tor_warn ${LANG_DUTCH} "Not removing .torrent association. It is associated with:"
+LangString uninst_tor_warn ${LANG_DUTCH} ".torrent-associatie wordt niet verwijderd. Ze is gekoppeld met:"
 ;LangString uninst_mag_warn ${LANG_ENGLISH} "Not removing magnet association. It is associated with:"
-LangString uninst_mag_warn ${LANG_DUTCH} "Not removing magnet association. It is associated with:"
+LangString uninst_mag_warn ${LANG_DUTCH} "Magneetkoppeling-associatie wordt niet verwijderd. Ze is gekoppeld met:"

dist/windows/installer-translations/english.nsi

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_ENGLISH} "Disable Windows path length limit (26
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_ESPERANTO} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_ESPERANTO} "Disable Windows path length limit (
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_ESPERANTO} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_ESTONIAN} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_ESTONIAN} "Disable Windows path length limit (2
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_ESTONIAN} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_FARSI} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_FARSI} "Disable Windows path length limit (260
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_FARSI} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_FINNISH} "qBittorrent (pakollinen)"
@@ -20,7 +20,7 @@ LangString inst_pathlimit ${LANG_FINNISH} "Disable Windows path length limit (26
 LangString inst_firewallinfo ${LANG_FINNISH} "Lisätään sääntö Windowsin Palomuuriin"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_FINNISH} "qBittorrent on käynnissä. Sulje ohjelma ennen asennusta."
-;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} "Current version will be uninstalled. User settings and torrents will remain intact."
 LangString inst_uninstall_question ${LANG_FINNISH} "Aiempi asennus löydettiin. Se poistetaan poistamatta käyttäjän asetuksia."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_FINNISH} "Poistetaan aiempi asennus."

dist/windows/installer-translations/french.nsi

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_FRENCH} "qBittorrent (requis)"
@@ -20,7 +20,7 @@ LangString inst_pathlimit ${LANG_FRENCH} "Disable Windows path length limit (260
 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 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_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
 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."

dist/windows/installer-translations/galician.nsi

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_GALICIAN} "qBittorrent (necesario)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_GALICIAN} "Disable Windows path length limit (2
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_GALICIAN} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_GERMAN} "qBittorrent (erforderlich)"
@@ -20,7 +20,7 @@ LangString inst_pathlimit ${LANG_GERMAN} "Deaktiviere die Windows-Pfadlängenbes
 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_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
 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."

dist/windows/installer-translations/greek.nsi

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_GREEK} "qBittorrent (απαιτείται)"
@@ -20,7 +20,7 @@ LangString inst_pathlimit ${LANG_GREEK} "Disable Windows path length limit (260
 LangString inst_firewallinfo ${LANG_GREEK} "Προστίθεται κανόνας εξαίρεσης στο Τείχος Προστασίας των Windows"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_GREEK} "Το 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_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
 LangString inst_uninstall_question ${LANG_GREEK} "Ανιχνεύθηκε προηγούμενη εγκατάσταση. Θα απεγκατασταθεί χωρίς να διαγραφούν οι ρυθμίσεις του χρήστη."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_GREEK} "Γίνεται απεγκατάσταση της προηγούμενης έκδοσης."

dist/windows/installer-translations/hebrew.nsi

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_HEBREW} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_HEBREW} "Disable Windows path length limit (260
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_HEBREW} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_HUNGARIAN} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_HUNGARIAN} "Disable Windows path length limit (
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_HUNGARIAN} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_ICELANDIC} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_ICELANDIC} "Disable Windows path length limit (
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_ICELANDIC} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_INDONESIAN} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_INDONESIAN} "Disable Windows path length limit
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_INDONESIAN} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_IRISH} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_IRISH} "Disable Windows path length limit (260
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_IRISH} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_ITALIAN} "qBittorrent (necessario)"
@@ -7,7 +7,7 @@ LangString inst_dekstop ${LANG_ITALIAN} "Crea icone sul desktop"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_ITALIAN} "Crea gruppo programmi"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"
-LangString inst_startup ${LANG_ITALIAN} "Avvia qBittorrent all'avvio di Windows"
+LangString inst_startup ${LANG_ITALIAN} "Esegui qBittorrent all'avvio di Windows"
 ;LangString inst_torrent ${LANG_ENGLISH} "Open .torrent files with qBittorrent"
 LangString inst_torrent ${LANG_ITALIAN} "Apri file .torrent con qBittorrent"
 ;LangString inst_magnet ${LANG_ENGLISH} "Open magnet links with qBittorrent"
@@ -15,21 +15,21 @@ LangString inst_magnet ${LANG_ITALIAN} "Apri collegamenti magnet con qBittorrent
 ;LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule"
 LangString inst_firewall ${LANG_ITALIAN} "Aggiungi regola al firewall di Windows"
 ;LangString inst_pathlimit ${LANG_ENGLISH} "Disable Windows path length limit (260 character MAX_PATH limitation, requires Windows 10 1607 or later)"
-LangString inst_pathlimit ${LANG_ITALIAN} "Disable Windows path length limit (260 character MAX_PATH limitation, requires Windows 10 1607 or later)"
+LangString inst_pathlimit ${LANG_ITALIAN} "Disabilita limite percorso Windows (limite MAX_PATH max 260 caratterin, richiede Windows 10 versione 1607 o successive)"
 ;LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule"
 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_warning ${LANG_ITALIAN} "qBittorrent è in esecuzione.%n%nChiudi l'applicazione qBittorrent prima della nuova installazione."
+;LangString inst_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_ITALIAN} "L'attuale versione di qBittorrent verrà disinstallata.%n%nLe impostazioni utente e i torrent rimanno invariati."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
-LangString inst_unist ${LANG_ITALIAN} "Disinstallazione versione precedente."
+LangString inst_unist ${LANG_ITALIAN} "Disinstallazione versione precedente di qBittorrent."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
-LangString launch_qbt ${LANG_ITALIAN} "Esegui qBittorrent."
+LangString launch_qbt ${LANG_ITALIAN} "Esegui qBittorrent"
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
-LangString inst_requires_64bit ${LANG_ITALIAN} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_ITALIAN} "Questo installer di qBittorrent funziona solo con Windows a 64bit."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_ITALIAN} "This qBittorrent version requires at least Windows 7."
+LangString inst_requires_win7 ${LANG_ITALIAN} "Questa versione di qBittorrent richiede Windows 7 o versioni successive."
 
 
 ;------------------------------------
@@ -52,7 +52,7 @@ LangString remove_firewallinfo ${LANG_ITALIAN} "Rimozione regola dal firewall di
 ;LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data"
 LangString remove_cache ${LANG_ITALIAN} "Rimuovi torrent e dati nella cache"
 ;LangString uninst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before uninstalling."
-LangString uninst_warning ${LANG_ITALIAN} "qBittorrent è in esecuzione. Chiudi l'applicazione prima della disinstallazione."
+LangString uninst_warning ${LANG_ITALIAN} "qBittorrent è in esecuzione.%n%nChiudi qBittorrent prima della disinstallazione."
 ;LangString uninst_tor_warn ${LANG_ENGLISH} "Not removing .torrent association. It is associated with:"
 LangString uninst_tor_warn ${LANG_ITALIAN} "Associazione file .torrent non rimossa. File associati con:"
 ;LangString uninst_mag_warn ${LANG_ENGLISH} "Not removing magnet association. It is associated with:"

dist/windows/installer-translations/japanese.nsi

@@ -20,7 +20,7 @@ LangString inst_pathlimit ${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_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
 LangString inst_uninstall_question ${LANG_JAPANESE} "以前のインストールが検出されました。ユーザー設定を削除せずにアンインストールします。"
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_JAPANESE} "以前のバージョンをアンインストールしています。"

dist/windows/installer-translations/korean.nsi

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_KOREAN} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_KOREAN} "Disable Windows path length limit (260
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_KOREAN} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_KURDISH} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_KURDISH} "Disable Windows path length limit (26
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_KURDISH} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_LATVIAN} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_LATVIAN} "Disable Windows path length limit (26
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_LATVIAN} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_LITHUANIAN} "qBittorrent (reikalingas)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_LITHUANIAN} "Disable Windows path length limit
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_LITHUANIAN} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_LUXEMBOURGISH} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_LUXEMBOURGISH} "Disable Windows path length lim
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_LUXEMBOURGISH} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_MACEDONIAN} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_MACEDONIAN} "Disable Windows path length limit
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_MACEDONIAN} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_MALAY} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_MALAY} "Disable Windows path length limit (260
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_MALAY} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_MONGOLIAN} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_MONGOLIAN} "Disable Windows path length limit (
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_MONGOLIAN} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_NORWEGIAN} "qBittorrent (kreves)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_NORWEGIAN} "Disable Windows path length limit (
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_NORWEGIAN} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_NORWEGIANNYNORSK} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_NORWEGIANNYNORSK} "Disable Windows path length
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_NORWEGIANNYNORSK} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_POLISH} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_POLISH} "Disable Windows path length limit (260
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_POLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_PORTUGUESE} "qBittorrent (obrigatório)"
@@ -20,7 +20,7 @@ LangString inst_pathlimit ${LANG_PORTUGUESE} "Disable Windows path length limit
 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_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
 LangString inst_uninstall_question ${LANG_PORTUGUESE} "Uma antiga instalação foi encontrada.Essa mesma será desinstalada sem apagar as definições do usuário."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_PORTUGUESE} "A desinstalar versão anterior."

dist/windows/installer-translations/portugueseBR.nsi

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_PORTUGUESEBR} "qBittorrent (requerido)"
@@ -20,7 +20,7 @@ LangString inst_pathlimit ${LANG_PORTUGUESEBR} "Disable Windows path length limi
 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_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
 LangString inst_uninstall_question ${LANG_PORTUGUESEBR} "Uma instalação anterior foi detectada. Ela será desistalada sem deletar as configurações de usuário."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_PORTUGUESEBR} "Desinstalando versão anterior."

dist/windows/installer-translations/romanian.nsi

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_ROMANIAN} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_ROMANIAN} "Disable Windows path length limit (2
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_ROMANIAN} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_RUSSIAN} "qBittorrent (обязательно)"
@@ -20,7 +20,7 @@ LangString inst_pathlimit ${LANG_RUSSIAN} "Снять ограничение Win
 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_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
 LangString inst_uninstall_question ${LANG_RUSSIAN} "Обнаружена предыдущая установка. Она будет деинсталлирована без удаления пользовательских настроек."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_RUSSIAN} "Деинсталлируется старая версия."

dist/windows/installer-translations/serbian.nsi

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_SERBIAN} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_SERBIAN} "Disable Windows path length limit (26
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_SERBIAN} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_SERBIANLATIN} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_SERBIANLATIN} "Disable Windows path length limi
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_SERBIANLATIN} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_SIMPCHINESE} "qBittorrent (必要)"
@@ -20,7 +20,7 @@ LangString inst_pathlimit ${LANG_SIMPCHINESE} "Disable Windows path length limit
 LangString inst_firewallinfo ${LANG_SIMPCHINESE} "正在添加Windows防火墙规则"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_SIMPCHINESE} "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_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
 LangString inst_uninstall_question ${LANG_SIMPCHINESE} "检测到以前的安装。 它将被卸载但不删除用户设置。"
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_SIMPCHINESE} "卸载以前的版本。"

dist/windows/installer-translations/slovak.nsi

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_SLOVAK} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_SLOVAK} "Disable Windows path length limit (260
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_SLOVAK} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_SLOVENIAN} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_SLOVENIAN} "Disable Windows path length limit (
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_SLOVENIAN} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_SPANISH} "qBittorrent (necesario)"
@@ -20,7 +20,7 @@ LangString inst_pathlimit ${LANG_SPANISH} "Disable Windows path length limit (26
 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_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
 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."

dist/windows/installer-translations/spanishinternational.nsi

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_SPANISHINTERNATIONAL} "qBittorrent (necesario)"
@@ -20,7 +20,7 @@ LangString inst_pathlimit ${LANG_SPANISHINTERNATIONAL} "Disable Windows path len
 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_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
 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."

dist/windows/installer-translations/swedish.nsi

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_SWEDISH} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_SWEDISH} "Disable Windows path length limit (26
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_SWEDISH} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_THAI} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_THAI} "Disable Windows path length limit (260 c
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_THAI} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_TRADCHINESE} "qBittorrent (必要)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_TRADCHINESE} "Disable Windows path length limit
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_TRADCHINESE} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_TURKISH} "qBittorrent (zorunlu)"
@@ -20,7 +20,7 @@ LangString inst_pathlimit ${LANG_TURKISH} "Windows yol uzunluğu sınırını et
 LangString inst_firewallinfo ${LANG_TURKISH} "Windows Güvenlik Duvarı kuralı ekleniyor"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_TURKISH} "qBittorrent çalışıyor. Lütfen yüklemeden önce uygulamayı kapatı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_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
 LangString inst_uninstall_question ${LANG_TURKISH} "Önceki bir kurulum algılandı. Kullanıcı ayarları silinmeden kaldırılacaktır."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_TURKISH} "Önceki sürüm kaldırılıyor."

dist/windows/installer-translations/ukrainian.nsi

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_UKRAINIAN} "qBittorrent (необхідний)"
@@ -20,7 +20,7 @@ LangString inst_pathlimit ${LANG_UKRAINIAN} "Disable Windows path length limit (
 LangString inst_firewallinfo ${LANG_UKRAINIAN} "Додаємо правило до брандмауера"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_UKRAINIAN} "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_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
 LangString inst_uninstall_question ${LANG_UKRAINIAN} "Виявлено попередню інсталяцію. Її буде видалено за виключенням користувацьких налаштувань."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_UKRAINIAN} "Видалення попередньої версії."

dist/windows/installer-translations/uzbek.nsi

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_UZBEK} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_UZBEK} "Disable Windows path length limit (260
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_UZBEK} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-;Installer strings
+;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_WELSH} "qBittorrent (required)"
@@ -20,8 +20,8 @@ LangString inst_pathlimit ${LANG_WELSH} "Disable Windows path length limit (260
 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_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
+LangString inst_uninstall_question ${LANG_WELSH} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;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

@@ -1,4 +1,4 @@
-Var uninstallerPath
+Var uninstallerPath
 
 Section "-hidden"