Bump to 4.3.5

An updated/fixed version of the installer language file.

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: "https://www.qbittorrent.org/donate.php"

.github/workflows/ci.yaml

@@ -4,20 +4,13 @@ name: GitHub Actions CI
 # 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 ]
+on: [pull_request, push]
 
 env:
-  # Qt: 5.15.0
-  # libtorrent: RC_1_2 HEAD, 1.2.10
-  VCPKG_COMMIT: 32eccc18191fbb57b159784a1724d2d00613ae82
+  VCPKG_COMMIT: e4ce66eecfd3e5cca5eac06c971921bf8e37cf88
   VCPKG_DEST_MACOS: /Users/runner/qbt_tools/vcpkg
   VCPKG_DEST_WIN: C:\qbt_tools\vcpkg
-  LIBTORRENT_VERSION_TAG: libtorrent-1.2.10
+  LIBTORRENT_VERSION_TAG: v1.2.12
 
 jobs:
 
@@ -26,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-18.04]
+        os: [ubuntu-20.04]
         qbt_gui: ["GUI=ON", "GUI=OFF"]
       fail-fast: false
 
@@ -72,7 +65,7 @@ jobs:
     - name: upload artifact as zip
       uses: actions/upload-artifact@v2
       with:
-        name: qBittorrent-CI-Ubuntu_${{ matrix.os }}-${{ matrix.qbt_gui }}
+        name: qBittorrent-CI_${{ matrix.os }}-x64_${{ matrix.qbt_gui }}
         path: |
           build/compile_commands.json
           build/target_graph.dot
@@ -125,10 +118,15 @@ jobs:
           "qt5-svg:x64-windows-static-release",
           "qt5-tools:x64-windows-static-release",
           "qt5-winextras:x64-windows-static-release"
+        ${{ env.RUNVCPKG_VCPKG_ROOT }}/vcpkg.exe upgrade `
+            --overlay-triplets=${{ github.workspace }}/triplets_overlay `
+            --overlay-ports=${{ github.workspace }}/vcpkg `
+            --no-dry-run
         foreach($package in $packages)
         {
           ${{ env.RUNVCPKG_VCPKG_ROOT }}/vcpkg.exe install $package `
             --overlay-triplets=${{ github.workspace }}/triplets_overlay `
+            --overlay-ports=${{ github.workspace }}/vcpkg `
             --clean-after-build
         }
 
@@ -151,7 +149,7 @@ jobs:
     - name: upload artifact as zip
       uses: actions/upload-artifact@v2
       with:
-        name: qBittorrent-CI-Windows_x64-static-release
+        name: qBittorrent-CI_Windows-x64
         path: |
           build/compile_commands.json
           build/target_graph.dot
@@ -178,11 +176,11 @@ jobs:
       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
+    # - automake is needed for the installation the vcpkg installation of fontconfig, a dependency of qt5-base
     - name: install additional required packages with homebrew
       shell: bash
       run: |
-        brew install ninja pkg-config
+        brew install automake ninja
 
     - name: setup vcpkg (cached, if possible)
       uses: lukka/run-vcpkg@v4
@@ -197,14 +195,7 @@ jobs:
         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
+          -Value "set(VCPKG_BUILD_TYPE release)","set(VCPKG_OSX_DEPLOYMENT_TARGET 10.15)"
 
     - name: install dependencies via vcpkg
       run: |
@@ -215,10 +206,15 @@ jobs:
           "qt5-svg:x64-osx-release",
           "qt5-tools:x64-osx-release",
           "qt5-macextras:x64-osx-release"
+        ${{ env.RUNVCPKG_VCPKG_ROOT }}/vcpkg upgrade `
+            --overlay-triplets=${{ github.workspace }}/triplets_overlay `
+            --overlay-ports=${{ github.workspace }}/vcpkg `
+            --no-dry-run
         foreach($package in $packages)
         {
           ${{ env.RUNVCPKG_VCPKG_ROOT }}/vcpkg install $package `
             --overlay-triplets=${{ github.workspace }}/triplets_overlay `
+            --overlay-ports=${{ github.workspace }}/vcpkg `
             --clean-after-build
         }
 
@@ -236,7 +232,7 @@ jobs:
     - name: upload artifact as zip
       uses: actions/upload-artifact@v2
       with:
-        name: qBittorrent-CI-macOS_x64-static-release_${{ matrix.qbt_gui }}
+        name: qBittorrent-CI_macOS_${{ matrix.qbt_gui }}
         path: |
           build/compile_commands.json
           build/target_graph.dot

.github/workflows/file_health.sh

@@ -12,62 +12,72 @@ regressions=0
 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_trailing_newline='configure'
 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"
+echo -e "\n*** 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)") \
+    | tee >(echo -e "--> Files not encoded in UTF-8: found" "$(wc -l < /dev/stdin)" "regression(s)\n") \
     | 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"
+echo -e "\n*** 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)") \
+    | tee >(echo -e "--> Files encoded in UTF-8 with BOM: found" "$(wc -l < /dev/stdin)" "regression(s)\n") \
     | 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"
+echo -e "\n*** 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)") \
+    | tee >(echo -e "--> Usage of CR byte: found" "$(wc -l < /dev/stdin)" "regression(s)\n") \
     | 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"
+echo -e "\n*** 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)") \
+    | tee >(echo -e "--> Trailing whitespace in lines: found" "$(wc -l < /dev/stdin)" "regression(s)\n") \
     | 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"
+echo -e "\n*** 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 \
+    | grep -E -v -e "${exclusions_trailing_newline}" \
     | 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)") \
+    | tee >(echo -e "--> Too many trailing newlines: found" "$(wc -l < /dev/stdin)" "regression(s)\n") \
     | 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"
+echo -e "\n*** 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)") \
+    | tee >(echo -e "--> No trailing newline: found" "$(wc -l < /dev/stdin)" "regression(s)\n") \
+    | xargs -I my_input -0 bash -c 'echo "my_input"; test "$(echo -n "my_input" | wc -l)" -eq 0'
+regressions=$((regressions+$?))
+
+echo -e "\n*** Detect translation closing tag in new line ***\n"
+
+grep --exclude-dir={.git,build} -nri "^</translation>" | sort \
+    | cut -d ":" -f 1,2 \
+    | tee >(echo -e "--> Translation closing tag in new line: found" "$(wc -l < /dev/stdin)" "regression(s)\n") \
     | 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)."
+    echo "\nFile health regressions found. Please fix them (or add them as exclusions)."
 else
     echo "All OK, no file health regressions found."
 fi

.github/workflows/file_health.yaml

@@ -1,17 +1,12 @@
 name: GitHub Actions file health check
 
-on:
-  push:
-    branches: [ '**' ]
-  pull_request:
-    types: [edited, opened, reopened, synchronize]
-    branches: [ '**' ]
+on: [pull_request, push]
 
 jobs:
   check_file_health:
     name: Check file health
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
     - name: checkout repository

.github/workflows/webui_ci.yaml

@@ -0,0 +1,31 @@
+name: WebUI CI
+
+on: [pull_request, push]
+
+jobs:
+  check_webui:
+    name: Check WebUI
+    runs-on: ubuntu-20.04
+    defaults:
+      run:
+        working-directory: src/webui/www
+
+    steps:
+    - name: checkout repository
+      uses: actions/checkout@v2
+
+    - name: setup nodejs
+      uses: actions/setup-node@v2
+      with:
+        node-version: '14'
+
+    - name: install tools
+      run: npm install
+
+    - name: lint code
+      run: npm run lint
+
+    - name: format code
+      run: |
+        npm run format
+        git diff --exit-code

.gitignore

@@ -4,6 +4,7 @@ src/qbittorrent
 src/qbittorrent-nox
 src/release
 src/debug
+src/base/version.h
 CMakeLists.txt.user*
 qbittorrent.pro.user*
 conf.pri

.travis.yml

@@ -4,7 +4,8 @@ os:
   - linux
   - osx
 
-dist: bionic
+dist: focal
+osx_image: xcode12.2
 
 env:
   matrix:
@@ -16,6 +17,11 @@ env:
     - secure: "OI9CUjj4lTb0HwwIZU5PbECU3hLlAL6KC8KsbwohG8/O3j5fLcnmDsK4Ad9us5cC39sS11Jcd1kDP2qRcCuST/glVNhLkcjKkiQerOfd5nQ/qL4JYfz/1mfP5mdpz9jHKzpLUIG+TXkbSTjP6VVmsb5KPT+3pKEdRFZB+Pu9+J8="
     - coverity_branch: coverity_scan
 
+jobs:
+  include:
+  - env: libt_branch=RC_2_0 gui=true build_system=qmake
+    os: linux
+
 notifications:
   email:
     on_success: change
@@ -39,8 +45,7 @@ addons:
   apt:
     sources:
       # sources list: https://github.com/travis-ci/apt-source-safelist/blob/master/ubuntu.json
-      - sourceline: 'ppa:qbittorrent-team/qbt-libtorrent-travisci'
-      - sourceline: 'deb https://apt.kitware.com/ubuntu/ bionic main'
+      - sourceline: 'deb https://apt.kitware.com/ubuntu/ focal 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
@@ -69,6 +74,8 @@ before_install:
       # 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"
+
+      export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib"
     fi
   - |
     if [ "$TRAVIS_OS_NAME" = "osx" ]; then
@@ -99,8 +106,8 @@ install:
 
       brew update > /dev/null
       brew upgrade cmake
-      brew install ccache colormake boost openssl qt zlib
-      brew link --force qt zlib
+      brew install ccache colormake boost openssl qt@5 zlib
+      brew link --force qt@5 zlib
 
       if [ "$build_system" = "cmake" ]; then
         sudo ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs
@@ -114,20 +121,34 @@ install:
       ccache -V && ccache --show-stats && ccache --zero-stats
     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_2" ] && [ "$TRAVIS_OS_NAME" = "osx" ]; then
-      # 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
+    if [ "$libt_branch" = "RC_1_2" ]; then
       pushd "$HOME"
       git clone --single-branch --branch RC_1_2 https://github.com/arvidn/libtorrent.git
       cd libtorrent
-      git checkout tags/v1.2.10
+      git checkout tags/v1.2.12
 
-      cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_STANDARD=14 -Ddeprecated-functions=OFF -DOPENSSL_ROOT_DIR="$openssl_root_path" ./
+      cmake \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_CXX_STANDARD=17 \
+        -Ddeprecated-functions=OFF \
+        -DOPENSSL_ROOT_DIR="$openssl_root_path" \
+        ./
+      make
+      sudo make install
+      popd
+    elif [ "$libt_branch" = "RC_2_0" ]; then
+      pushd "$HOME"
+      git clone --single-branch --branch RC_2_0 https://github.com/arvidn/libtorrent.git
+      cd libtorrent
+      git checkout tags/v2.0.2
+      git submodule update --init --recursive
+
+      cmake \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_CXX_STANDARD=17 \
+        -Ddeprecated-functions=OFF \
+        -DOPENSSL_ROOT_DIR="$openssl_root_path" \
+        ./
       make
       sudo make install
       popd

AUTHORS

@@ -17,19 +17,23 @@ Contributors:
 * Nick Tiskov <daymansmail@gmail.com>
 
 Code from other projects:
-* files src/qtsingleapplication/* src/lineedit/*
+* files src/app/qtlocalpeer/*
   copyright: Nokia Corporation
-  license: LGPL
+  license: mixed
 
-* files src/ico.cpp src/ico.h
-  copyright: Malte Starostik <malte@kde.org>
-  license: LGPL
+* files src/gui/lineedit.*
+  copyright: Trolltech ASA <info@trolltech.com>
+  license: custom
 
 * files src/search_engine/socks.py
   copyright: Dan Haim <negativeiq@users.sourceforge.net>
   license: BSD
 
-* file src/stacktrace_win.h
+* file src/app/stacktrace.h
+  copyright: Timo Bingmann from http://idlebox.net/
+  license: WTFPL v2.0
+
+* file src/app/stacktrace_win.h
   copyright: Quassel Project
   license: GPLv2/3
 
@@ -119,7 +123,7 @@ Translations authors:
   - German: Niels Hoffmann (zentralmaschine@users.sourceforge.net)
   - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net), Stephanos Antaris (santaris@csd.auth.gr), sledgehammer999(hammered999@gmail.com) and Γιάννης Ανθυμίδης Evropi(Transifex)
   - Hebrew: David Deutsch (d.deffo@gmail.com)
-  - Hungarian: Majoros Péter (majoros.j.p@t-online.hu)
+  - Hungarian: Majoros Péter
   - Italian: bovirus (bovirus@live.it) and Matteo Sechi (bu17714@gmail.com)
   - Japanese: Masato Hashimoto (cabezon.hashimoto@gmail.com)
   - Korean: Jin Woo Sin (jin828sin@users.sourceforge.net)

CMakeLists.txt

@@ -3,7 +3,6 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) # Policies <= CMP0097 default t
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
 
 project(qBittorrent
-    VERSION 4.3.1.0
     DESCRIPTION "The qBittorrent BitTorrent client"
     HOMEPAGE_URL "https://www.qbittorrent.org/"
     LANGUAGES CXX
@@ -11,14 +10,15 @@ project(qBittorrent
 
 # 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.2.0)
-set(requiredZlibVersion 1.2.5.2)
+# version requirements - older vesions may work, but you are on your own
+set(minBoostVersion 1.65)
+set(minQtVersion 5.11)
+set(minOpenSSLVersion 1.1.1)
+set(minLibtorrentVersion 1.2.12)
+set(minZlibVersion 1.2.11)
 
 # features (some are platform-specific)
+include(CheckCXXSourceCompiles) # TODO: migrate to CheckSourceCompiles in CMake >= 3.19
 include(FeatureSummary)
 include(FeatureOptionsSetup)
 feature_option(STACKTRACE "Enable stacktraces" ON)
@@ -34,12 +34,22 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
         "Install systemd service file to a directory manually overridable with Systemd_SERVICES_INSTALL_DIR"
         OFF "NOT GUI" OFF
     )
+    if (STACKTRACE)
+        check_cxx_source_compiles(
+            "#include <execinfo.h>
+            int main(){return 0;}"
+            QBITTORRENT_HAS_EXECINFO_H
+        )
+        if (NOT QBITTORRENT_HAS_EXECINFO_H)
+            message(FATAL_ERROR "execinfo.h header file not found.\n"
+                "Please either disable the STACKTRACE feature or use a libc that has this header file, such as glibc (GNU libc)."
+            )
+        endif()
+    endif()
 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.")
-
 include(GNUInstallDirs)
 add_subdirectory(src)
 add_subdirectory(dist)
@@ -49,3 +59,6 @@ if (VERBOSE_CONFIGURE)
 else()
     feature_summary(WHAT ENABLED_FEATURES DISABLED_FEATURES)
 endif()
+
+# Generate version header
+configure_file("src/base/version.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/src/base/version.h" @ONLY)

CODING_GUIDELINES.md

@@ -372,7 +372,7 @@ Example:
 
 ## 8. Include guard
 
-`#pragma once` should be used instead of "include guard" in new code:
+`#pragma once` must be used instead of a "classic include guard":
 
 ```c++
 // examplewidget.h

COPYING

@@ -1,5 +1,6 @@
-qBittorrent is licensed under the GNU General Public License version 2 with the
-addition of the following special exception:
+qBittorrent is licensed under the GNU General Public License either version 2,
+or (at your option) any later version with the addition of the following
+special exception:
 
 In addition, as a special exception, the copyright holders give permission to
 link this program with the OpenSSL project's "OpenSSL" library (or with
@@ -10,6 +11,8 @@ modify file(s), you may extend this exception to your version of the file(s),
 but you are not obligated to do so. If you do not wish to do so, delete this
 exception statement from your version.
 
+See also the AUTHORS file
+
 ----------
 
                     GNU GENERAL PUBLIC LICENSE

Changelog

@@ -1,3 +1,109 @@
+Sun May 02 2021 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.5
+    - BUGFIX: Move cursor to the end when autofilling URL/hash in "Download from URLs" dialog (Chocobo1)
+    - BUGFIX: Sort invalid QDateTime values after valid values (Chocobo1)
+    - BUGFIX: Fix tabChangesFocus attribute in "Edit trackers" dialog (Christoph Rackwitz)
+    - BUGFIX: Update DynDNS register url (zhuangzi926)
+    - BUGFIX: Handle "not enough disk space" error more graciously (glassez)
+    - BUGFIX: Correctly draw progress background with stylesheet (jagannatharjun)
+    - WEBUI: Fix magnet url from the search facility (Chocobo1)
+    - WEBUI: Revise folder monitoring functions (Chocobo1)
+    - WEBUI: Fix magnet url from the browser (brvphoenix)
+    - WEBUI: Allow to specify file indexes in torrents/files API (glassez)
+    - WINDOWS: NSIS: Allow more strings to translated (bovirus, Chocobo1)
+    - WINDOWS: NSIS: Update Italian, German, Estonian, Russian, PortugueseBR translations (bovirus, Henry Water, PriitUring, Долматов Алексей, Felipe)
+    - LINUX: Fix D-Bus Notification `desktop-entry` field (Chocobo1)
+    - MACOS: Don't use executable name as CFBundleName value (Nick Korotysh)
+    - OTHER: Lower Qt requirement to 5.11 (sledgehammer999)
+    - OTHER: Clarify that the license is GPLv2+ (sledgehammer999)
+
+Wed Mar 24 2021 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.4.1
+    - BUGFIX: Correctly draw progress bar (glassez)
+    - WEBUI: Fix javascript code which broke the UI (Chocobo1)
+
+Tue Mar 23 2021 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.4
+    - FEATURE: Add ability to prioritize selected items by shown file order (Chocobo1)
+    - FEATURE: Allow tab to escape the text box in "Edit trackers" dialog (Christoph Rackwitz)
+    - FEATURE: Support sub-sorting in Transferlist (jagannatharjun)
+    - FEATURE: Expose ToS setting from libtorrent (Chocobo1)
+    - FEATURE: Improve tracker entries handling (glassez)
+    - BUGFIX: Drop extension from generated content folder name (glassez)
+    - BUGFIX: Change qBittorrent Updater window title (xavier2k6)
+    - BUGFIX: Validate HTTPS Tracker Certificate by default (an0n666)
+    - BUGFIX: Don't let "program update" dialog steal focus (Chocobo1)
+    - BUGFIX: Disable expand on double click in TorrentContentTreeView (jagannatharjun)
+    - BUGFIX: Add hyperlink to Transifex on translator list (Si Yong Kim)
+    - BUGFIX: Enlarge "speed limit" icon slightly (Chocobo1)
+    - BUGFIX: Don't prevent system sleep due to errored torrents (dyumin)
+    - BUGFIX: Use stable sorting in transfer list (Chocobo1)
+    - BUGFIX: Allow "missing files" torrents to save more resume data (glassez)
+    - BUGFIX: Restart "missing files" torrents after changing location (glassez)
+    - BUGFIX: Show proper string when torrent availability is not available (Chocobo1)
+    - BUGFIX: Apply "Hide zero/infinity values" to "Time Active", "Down/Up Limit" and ETA columns (Chocobo1)
+    - BUGFIX: Fix potential out-of-bounds access (Chocobo1)
+    - BUGFIX: Make SpeedPlotView averager time aware (jagannatharjun)
+    - BUGFIX: Add a 3-Hour graph (jagannatharjun)
+    - BUGFIX: Add an option to disable icons in menus (always disabled on MacOS) (Michał Kopeć)
+    - BUGFIX: Improve detection of filename extension of audio/video files (Chocobo1)
+    - BUGFIX: Various drawing improvements of progress bar (Chocobo1)
+    - BUGFIX: Properly stop torrent creation if aborted (Chocobo1)
+    - BUGFIX: Replace external program parameters in one step (Chocobo1)
+    - BUGFIX: Improve "save resume data" handling (glassez)
+    - BUGFIX: Fix bad IPv6 address format for outgoingInterfaces (treysis)
+    - WEBUI: Properly decode strings (brvphoenix)
+    - WEBUI: Accept "share limits" when adding torrent using WebAPI (glassez)
+    - WEBUI: Add seeding time to the active time column (thalieht)
+    - WEBUI: Fix incorrect seeding time string in General tab (thalieht)
+    - WEBUI: Allow >100 days in WebUI function "friendlyDuration" (thalieht)
+    - WEBUI: Avoid decoding strings repeatedly (brvphoenix)
+    - RSS: Add category button on AutomatedRSSDownloader on GUI (Si Yong Kim)
+    - WINDOWS: NSIS: Update Czech translation (slrslr)
+    - WINDOWS: NSIS: Update Portuguese BR translation (Alex)
+    - WINDOWS: NSIS: Add Estonian translation (PriitUring)
+    - WINDOWS: Allow change-case-only file renaming (glassez)
+    - LINUX: Systemd: wait for mounting of local filesystems (Juraj Oršulić)
+    - OTHER: Raise minimum libtorrent version to 1.2.12 (glassez)
+    - OTHER: Raise minimum Qt version to 5.12 (glassez)
+
+Tue Jan 19 2021 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.3
+    - FEATURE: New languages: Azerbaijani, Estonian
+    - BUGFIX: Unify global speed dialogs for normal/alternative speeds (thalieht)
+    - BUGFIX: Increase maximum global speed limits ~2 GiB/s (thalieht)
+    - BUGFIX: Save fastresume when setting torrent speed limits (thalieht)
+    - BUGFIX: Group several torrent options into one dialog (thalieht)
+    - BUGFIX: Capitalize locale names (Chocobo1)
+    - BUGFIX: Improve content file/folder names handling (glassez)
+    - BUGFIX: Drop notification about move storage finished or failed (glassez)
+    - BUGFIX: Reload "missing files" torrent instead of re-checking (glassez)
+    - BUGFIX: Remember dialog sizes (Chocobo1)
+    - BUGFIX: Improve detection of file extension string (Chocobo1)
+    - WEBUI: Don't call non-existent elements (glassez)
+    - WEBUI: Update "Keep top-level folder" in WebUI options (thalieht)
+    - MACOS: QMake: Raise minimal macOS target version to 10.14 (glassez)
+    - LINUX: Use legacy 'data' directory only as a fallback (lbilli)
+    - OTHER: Bump project requirement to C++17 (Chocobo1)
+
+Sun Dec 27 2020 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.3.2
+    - FEATURE: Allow to add root folder to torrent content (glassez)
+    - FEATURE: "HTTPS tracker validation" option is available on all platforms with latest libtorrent (Chocobo1)
+    - FEATURE: Option for supporting internationalized domain names (IDNs) (Chocobo1)
+    - BUGFIX: Fix broken sorting on some columns (Chocobo1)
+    - BUGFIX: Fix availability per file value (Chocobo1)
+    - BUGFIX: Fix status of torrents without metadata (sledgehammer999)
+    - BUGFIX: Don't try to remove folders for a torrent without metadata (sledgehammer999)
+    - BUGFIX: Lift upper limit of "Max concurrent HTTP announces" option (Chocobo1)
+    - BUGFIX: Add links to libtorrent documentation (Chocobo1)
+    - BUGFIX: Move "embedded tracker" options to qbt section (Chocobo1)
+    - BUGFIX: Properly handle "Append extension" option changing (glassez)
+    - BUGFIX: Correctly save paused torrent state (glassez)
+    - BUGFIX: Fix bug of "move storage job" can be performed multiple times (glassez)
+    - WEBUI: Add ability to use 'shift+delete' to delete torrents (Chocobo1)
+    - WEBUI: Allow to attach tags while adding torrents (Jesse Chan)
+    - WEBUI: Bump version to 2.6.2 (Jesse Chan)
+    - WEBUI: Remove unnecessary restriction on input length (Chocobo1)
+    - WINDOWS: NSIS: Update Russian translation (Andrei Stepanov)
+    - WINDOWS:  NSIS: Update Italian translation (Alessandro Simonelli)
+    - OTHER: Drop support for building with libtorrent < 1.2.11 (Vladimir Golovnev)
+
 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)

INSTALL

@@ -3,23 +3,27 @@ qBittorrent - A BitTorrent client in C++ / Qt
 
 1) Install these dependencies:
 
-  - Boost >= 1.40
+  - Boost >= 1.65
 
-  - libtorrent-rasterbar >= 1.2 (by Arvid Norberg)
+  - libtorrent-rasterbar >= 1.2.12 (by Arvid Norberg)
       * https://www.libtorrent.org/
       * Be careful: another library (the one used by rTorrent) uses a similar name
 
-  - OpenSSL >= 1.0
+  - OpenSSL >= 1.1.1
 
-  - Qt >= 5.9.0
+  - Qt >= 5.12
 
-  - zlib >= 1.2.5.2
+  - zlib >= 1.2.11
 
-  - pkg-config (compile-time only)
+  - pkg-config (compile-time only on *nix systems)
 
   - Python >= 3.5.0 (optional, runtime only)
       * Required by the internal search engine
 
+Dependency version numbers are bumped every once in a while to keep the range of properly tested configurations manageable, even if not strictly required to build.
+You may be able to build with older versions of (some of) the dependencies other than the minimum versions specified in the build scripts, but support for such builds is not provided - you are on your own.
+Please ensure you are building with an officially supported configuration when reporting bugs.
+
 2a) Compile and install qBittorrent with Qt graphical interface
 
   $ ./configure

build_dist.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# get version numbers
+versionSrc="src/base/version.h.in"
+versionMajor="$(grep -Po '(?<=QBT_VERSION_MAJOR )\d+' "$versionSrc")"
+versionMinor="$(grep -Po '(?<=QBT_VERSION_MINOR )\d+' "$versionSrc")"
+versionBugfix="$(grep -Po '(?<=QBT_VERSION_BUGFIX )\d+' "$versionSrc")"
+versionBuild="$(grep -Po '(?<=QBT_VERSION_BUILD )\d+' "$versionSrc")"
+versionStatus="$(grep -Po '(?<=QBT_VERSION_STATUS ")\w+' "$versionSrc")"
+
+if [ "$versionBuild" != "0" ]; then
+    projectVersion="$versionMajor.$versionMinor.$versionBugfix.$versionBuild$versionStatus"
+else
+    projectVersion="$versionMajor.$versionMinor.$versionBugfix$versionStatus"
+fi
+
+# pack archives
+git archive --format=tar --prefix="qbittorrent-$projectVersion/" HEAD | gzip -9 > "qbittorrent-$projectVersion.tar.gz"
+git archive --format=tar --prefix="qbittorrent-$projectVersion/" HEAD | xz -9 > "qbittorrent-$projectVersion.tar.xz"

cmake/Modules/MacroQbtCommonConfig.cmake

@@ -7,47 +7,16 @@ 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
+    # Full C++ 17 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
+        cxx_std_17
     )
 
-    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
@@ -90,6 +59,12 @@ macro(qbt_common_config)
         endif()
     endif()
 
+    if ((CXX_COMPILER_ID STREQUAL "Clang") OR (CXX_COMPILER_ID STREQUAL "AppleClang"))
+        target_compile_options(qbt_common_cfg INTERFACE
+            -Wno-range-loop-analysis
+        )
+    endif()
+
     if (MINGW)
         target_link_options(qbt_common_cfg INTERFACE $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:LINKER:--dynamicbase>)
     endif()
@@ -101,8 +76,12 @@ macro(qbt_common_config)
     endif()
 
     if (MSVC)
-        target_compile_options(qbt_common_cfg INTERFACE /guard:cf)
-        target_link_options(qbt_common_cfg INTERFACE /guard:cf
+        target_compile_options(qbt_common_cfg INTERFACE
+            /guard:cf
+            /utf-8
+        )
+        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>

configure.ac

@@ -1,6 +1,8 @@
-AC_INIT([qbittorrent], [v4.3.1], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
+AC_INIT([qbittorrent], [v4.3.5], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
+: ${CFLAGS=""}
+: ${CXXFLAGS=""}
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_SED
@@ -139,7 +141,7 @@ AS_IF([test "x$QT_QMAKE" = "x"],
       [AC_MSG_ERROR([Could not find qmake])
       ])
 AS_IF([test "x$enable_gui" = "xyes"],
-      [PKG_CHECK_MODULES(Qt5Svg, [Qt5Svg >= 5.5.1])
+      [PKG_CHECK_MODULES(Qt5Svg, [Qt5Svg >= 5.11])
       ])
 AC_MSG_CHECKING([whether QtDBus should be enabled])
 AS_CASE(["x$enable_qt_dbus"],
@@ -157,7 +159,7 @@ AS_CASE(["x$enable_qt_dbus"],
         AC_MSG_ERROR([Unknown option "$enable_qt_dbus". Use either "yes" or "no".])])
 
 
-AX_BOOST_BASE([1.40],
+AX_BOOST_BASE([1.65],
               [AC_MSG_NOTICE([Boost CXXFLAGS: "$BOOST_CPPFLAGS"])
                AC_MSG_NOTICE([Boost LDFLAGS: "$BOOST_LDFLAGS"])],
               [AC_MSG_ERROR([Could not find Boost])])
@@ -178,48 +180,48 @@ AC_MSG_NOTICE([Boost.System LIB: "$BOOST_SYSTEM_LIB"])
 LIBS="$BOOST_SYSTEM_LIB $LIBS"
 
 PKG_CHECK_MODULES(libtorrent,
-                  [libtorrent-rasterbar >= 1.2],
+                  [libtorrent-rasterbar >= 1.2.12],
                   [CXXFLAGS="$libtorrent_CFLAGS $CXXFLAGS"
                   LIBS="$libtorrent_LIBS $LIBS"])
 
 PKG_CHECK_MODULES(openssl,
-                  [openssl >= 1.0],
+                  [openssl >= 1.1.1],
                   [CXXFLAGS="$openssl_CFLAGS $CXXFLAGS"
                   LIBS="$openssl_LIBS $LIBS"])
 
 PKG_CHECK_MODULES(zlib,
-                 [zlib >= 1.2.5.2],
+                 [zlib >= 1.2.11],
                  [CXXFLAGS="$zlib_CFLAGS $CXXFLAGS"
                  LIBS="$zlib_LIBS $LIBS"])
 
-# Check if already in >= C++14 mode because of the flags returned by one of the above packages
+# Check if already in >= C++17 mode because of the flags returned by one of the above packages
 TMP_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=""
-AC_MSG_CHECKING([if compiler defaults to C++14 or later mode])
-AC_COMPILE_IFELSE([DETECT_CPP14_PROGRAM()],
+AC_MSG_CHECKING([if compiler defaults to C++17 or later mode])
+AC_COMPILE_IFELSE([DETECT_CPP17_PROGRAM()],
                   [AC_MSG_RESULT([yes])
-                   QBT_CXX14_FOUND="yes"],
+                   QBT_CXX17_FOUND="yes"],
                   [AC_MSG_RESULT([no])
-                   QBT_CXX14_FOUND="no"])
+                   QBT_CXX17_FOUND="no"])
 
-# In case of no, check if the compiler can support at least C++14
+# In case of no, check if the compiler can support at least C++17
 # and if yes, enable it leaving a warning to the user
-AS_IF([test "x$QBT_CXX14_FOUND" = "xno"],
-      [AC_MSG_CHECKING([if compiler supports C++14])
-       CXXFLAGS="-std=c++14"
-       AC_COMPILE_IFELSE([DETECT_CPP14_PROGRAM()],
+AS_IF([test "x$QBT_CXX17_FOUND" = "xno"],
+      [AC_MSG_CHECKING([if compiler supports C++17])
+       CXXFLAGS="-std=c++17"
+       AC_COMPILE_IFELSE([DETECT_CPP17_PROGRAM()],
                         [AC_MSG_RESULT([yes])
-                         AC_MSG_CHECKING([if C++14 is disabled by the set compiler flags])
+                         AC_MSG_CHECKING([if C++17 is disabled by the set compiler flags])
                          # prepend the flag so it won't override conflicting user defined flags
-                         CXXFLAGS="-std=c++14 $TMP_CXXFLAGS"
-                         AC_COMPILE_IFELSE([DETECT_CPP14_PROGRAM()],
+                         CXXFLAGS="-std=c++17 $TMP_CXXFLAGS"
+                         AC_COMPILE_IFELSE([DETECT_CPP17_PROGRAM()],
                                            [AC_MSG_RESULT([no])
-                                            QBT_ADD_CONFIG="$QBT_ADD_CONFIG c++14"
-                                            AC_MSG_WARN([C++14 mode is now force enabled. The C++ mode should match the mode that other libraries were built with, otherwise you'll likely get linking errors.])],
+                                            QBT_ADD_CONFIG="$QBT_ADD_CONFIG c++1z"
+                                            AC_MSG_WARN([C++17 mode is now force enabled. The C++ mode should match the mode that other libraries were built with, otherwise you'll likely get linking errors.])],
                                            [AC_MSG_RESULT([yes])
-                                            AC_MSG_ERROR([The compiler supports C++14 but the user or a dependency has explicitly enabled a lower mode.])])],
+                                            AC_MSG_ERROR([The compiler supports C++17 but the user or a dependency has explicitly enabled a lower mode.])])],
                         [AC_MSG_RESULT([no])
-                         AC_MSG_ERROR([A compiler supporting C++14 is required.])])
+                         AC_MSG_ERROR([A compiler supporting C++17 is required.])])
       ])
 CXXFLAGS="$TMP_CXXFLAGS"
 
@@ -270,9 +272,13 @@ AC_SUBST(QBT_REMOVE_CONFIG)
 AC_SUBST(QBT_ADD_DEFINES)
 AC_SUBST(QBT_REMOVE_DEFINES)
 
-AC_OUTPUT(conf.pri)
+QBT_CONFIG_FILES="conf.pri"
+
 AS_IF([test "x$enable_systemd" = "xyes"],
-      [AC_OUTPUT(dist/unix/systemd/qbittorrent-nox@.service)])
+      [QBT_CONFIG_FILES="$QBT_CONFIG_FILES dist/unix/systemd/qbittorrent-nox@.service"])
+
+AC_CONFIG_FILES(["$QBT_CONFIG_FILES"])
+AC_OUTPUT
 
 AC_MSG_NOTICE([Running qmake to generate the makefile...])
 TOPDIR="$(cd "$(dirname "$0")" && pwd)"

dist/mac/Info.plist

@@ -47,7 +47,7 @@
 		</dict>
 	</array>
 	<key>CFBundleName</key>
-	<string>@EXECUTABLE@</string>
+	<string>qBittorrent</string>
 	<key>CFBundleIconFile</key>
 	<string>qbittorrent_mac.icns</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -55,9 +55,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.3.0</string>
+	<string>4.3.5</string>
 	<key>CFBundleExecutable</key>
-	<string>@EXECUTABLE@</string>
+	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.qbittorrent.qBittorrent</string>
 	<key>LSMinimumSystemVersion</key>
@@ -67,7 +67,7 @@
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2006-2020 The qBittorrent project</string>
+	<string>Copyright © 2006-2021 The qBittorrent project</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>

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.3.1" date="2020-11-25"/>
+    <release version="4.3.5" date="2021-05-02"/>
   </releases>
 </component>

dist/unix/org.qbittorrent.qBittorrent.desktop

@@ -11,6 +11,11 @@ Type=Application
 StartupNotify=false
 StartupWMClass=qbittorrent
 Keywords=bittorrent;torrent;magnet;download;p2p;
+
+# Translations
+
+
+# Translations
 Comment[oc]=Telecargar e partejar de fichièrs amb BitTorrent
 GenericName[oc]=Client BitTorrent
 Name[oc]=qBittorrent
@@ -53,6 +58,9 @@ Name[en_GB]=qBittorrent
 Comment[es]=Descargue y comparta archivos por BitTorrent
 GenericName[es]=Cliente BitTorrent
 Name[es]=qBittorrent
+Comment[et]=Lae alla ja jaga faile üle BitTorrenti
+GenericName[et]=BitTorrent klient
+Name[et]=qBittorrent
 Comment[eu]=Jeitsi eta elkarbanatu agiriak BitTorrent bidez
 GenericName[eu]=BitTorrent bezeroa
 Name[eu]=qBittorrent
@@ -80,13 +88,16 @@ Name[hr]=qBittorrent
 Comment[hu]=Fájlok letöltése és megosztása a BitTorrent hálózaton keresztül
 GenericName[hu]=BitTorrent kliens
 Name[hu]=qBittorrent
+Comment[hy]=Նիշքերի փոխանցում BitTorrent-ի միջոցով
+GenericName[hy]=BitTorrent սպասառու
+Name[hy]=qBittorrent
 Comment[id]=Unduh dan berbagi berkas melalui BitTorrent
 GenericName[id]=Klien BitTorrent
 Name[id]=qBittorrent
 Comment[is]=Sækja og deila skrám yfir BitTorrent
 GenericName[is]=BitTorrent biðlarar
 Name[is]=qBittorrent
-Comment[it]=Client BitTorrent per il download di file via internet
+Comment[it]=Scarica e condividi file tramite BitTorrent
 GenericName[it]=Client BitTorrent
 Name[it]=qBittorrent
 Comment[ja]=BitTorrent でファイルをダウンロードおよび共有します
@@ -95,8 +106,8 @@ Name[ja]=qBittorrent
 Comment[ka]=ჩამოტვირთე და გააზიარე ფაილები Bittorrent-ის საშუალებით
 GenericName[ka]=BitTorrent კლიენტი
 Name[ka]=qBittorrent
-Comment[ko]=비트토런트를 통해 파일을 받고 공유합니다
-GenericName[ko]=비트토런트 클라이언트
+Comment[ko]=비트토렌트를 통해 파일을 받고 공유합니다
+GenericName[ko]=비트토렌트 클라이언트
 Name[ko]=qBittorrent
 Comment[zh]=通过 BitTorrent 下载和分享文件
 GenericName[zh]=BitTorrent 客户端
@@ -107,6 +118,9 @@ Name[lt]=qBittorrent
 Comment[mk]=Превземајте и споделувајте фајлови преку BitTorrent
 GenericName[mk]=BitTorrent клиент
 Name[mk]=qBittorrent
+Comment[en_AU]=Download and share files over BitTorrent
+GenericName[en_AU]=BitTorrent client
+Name[en_AU]=qBittorrent
 Comment[nb]=Last ned og del filer over BitTorrent
 GenericName[nb]=BitTorrent-klient
 Name[nb]=qBittorrent
@@ -122,7 +136,7 @@ Name[pl]=qBittorrent
 Comment[pt]=Transferir e partilhar ficheiros por BitTorrent
 GenericName[pt]=Cliente BitTorrent
 Name[pt]=qBittorrent
-Comment[pt_BR]=Baixe e compartilhe arquivos por BitTorrent
+Comment[pt_BR]=Baixe e compartilhe arquivos pelo BitTorrent
 GenericName[pt_BR]=Cliente BitTorrent
 Name[pt_BR]=qBittorrent
 Comment[ro]=Descărcați și partajați fișiere prin BitTorrent
@@ -137,6 +151,7 @@ Name[sk]=qBittorrent
 Comment[sl]=Prenesite in delite datoteke preko BitTorrenta
 GenericName[sl]=BitTorrent odjemalec
 Name[sl]=qBittorrent
+Comment[sr]=Преузимајте и делите фајлове преко BitTorrent протокола
 GenericName[sr]=BitTorrent-клијент
 Comment[sr@latin]=Preuzimanje i deljenje fajlova preko BitTorrent-a
 GenericName[sr@latin]=BitTorrent klijent
@@ -150,9 +165,9 @@ Name[uz@Latn]=qBittorrent
 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[hi_IN]=BitTorrent द्वारा फाइल डाउनलोड व सहभाजन
+GenericName[hi_IN]=Bittorrent साधन
+Name[hi_IN]=क्यूबिटटाॅरेंट
 Comment[tr]=Dosyaları BitTorrent üzerinden indirin ve paylaşın
 GenericName[tr]=BitTorrent istemcisi
 Name[tr]=qBittorrent
@@ -165,6 +180,9 @@ Name[uk]=qBittorrent
 Comment[vi]=Tải về và chia sẻ các tập tin thông qua BitTorrent
 GenericName[vi]=Máy trạm dạng BitTorrent
 Name[vi]=qBittorrent
+Comment[az@latin]=Faylları BitTorrent vasitəsilə göndərin və paylaşın
+GenericName[az@latin]=BitTorrent client
+Name[az@latin]=qBittorrent
 Comment[zh_HK]=經由BitTorrent下載並分享檔案
 GenericName[zh_HK]=BitTorrent用戶端
 Name[zh_HK]=qBittorrent
@@ -180,8 +198,8 @@ Name[ms_MY]=qBittorrent
 Comment[eo]=Elŝutu kaj kunhavigu dosierojn per BitTorrent
 GenericName[eo]=BitTorrent-kliento
 Name[eo]=qBittorrent
-Comment[mn_MN]=BitTorrent ашиглан файлуудыг татаж түгээх
-GenericName[mn_MN]=BitTorrent үйлчлүүлэгч
+Comment[mn_MN]=BitTorrent-оор файлуудаа тат, түгээ
+GenericName[mn_MN]=BitTorrent татагч
 Name[mn_MN]=qBittorrent
 Comment[ta]=BitTorrent வழியாக கோப்புகளை பதிவிறக்க மற்றும் பகிர
 GenericName[ta]=BitTorrent வாடிக்கையாளர்
@@ -192,9 +210,9 @@ 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
-Comment[th]=ดาว์นโหลดและแชร์ไฟล์ด้วยบิททอเร้น
+Comment[pt_PT]=Transferir e partilhar ficheiros por BitTorrent
+GenericName[pt_PT]=Cliente BitTorrent
+Name[pt_PT]=qBittorrent
+Comment[th]=ดาวน์โหลดและแชร์ไฟล์ด้วยบิททอเร้น
 GenericName[th]=โปรแกรมบิททอเร้น
 Name[th]=qBittorrent

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

@@ -2,7 +2,7 @@
 Description=qBittorrent-nox service for user %I
 Documentation=man:qbittorrent-nox(1)
 Wants=network-online.target
-After=network-online.target nss-lookup.target
+After=local-fs.target network-online.target nss-lookup.target
 
 [Service]
 Type=simple

dist/windows/installer-translations/afrikaans.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_AFRIKAANS} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_AFRIKAANS} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_AFRIKAANS} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_AFRIKAANS} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/albanian.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_ALBANIAN} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_ALBANIAN} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_ALBANIAN} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_ALBANIAN} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/arabic.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_ARABIC} "تشغيل البرنامج"
 LangString inst_requires_64bit ${LANG_ARABIC} "هذا المثبت يعمل فقط في نسخ ويندوز 64 بت"
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_ARABIC} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_ARABIC} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/basque.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_BASQUE} "Abiarazi qBittorrent."
 LangString inst_requires_64bit ${LANG_BASQUE} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_BASQUE} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_BASQUE} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/belarusian.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_BELARUSIAN} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_BELARUSIAN} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_BELARUSIAN} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_BELARUSIAN} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/bosnian.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_BOSNIAN} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_BOSNIAN} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_BOSNIAN} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_BOSNIAN} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/breton.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_BRETON} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_BRETON} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_BRETON} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_BRETON} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/bulgarian.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_BULGARIAN} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_BULGARIAN} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_BULGARIAN} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_BULGARIAN} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/catalan.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_CATALAN} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_CATALAN} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_CATALAN} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_CATALAN} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/croatian.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_CROATIAN} "Pokreni qBittorrent."
 LangString inst_requires_64bit ${LANG_CROATIAN} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_CROATIAN} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_CROATIAN} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/czech.nsi

@@ -7,7 +7,7 @@ LangString inst_dekstop ${LANG_CZECH} "Vytvořit zástupce na ploše"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_CZECH} "Vytvořit zástupce v nabídce Start"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"
-LangString inst_startup ${LANG_CZECH} "Spusťte aplikaci qBittorrent ve Windows"
+LangString inst_startup ${LANG_CZECH} "Spustit qBittorrent při startu Windows"
 ;LangString inst_torrent ${LANG_ENGLISH} "Open .torrent files with qBittorrent"
 LangString inst_torrent ${LANG_CZECH} "Otevírat .torrent soubory pomocí qBittorrent"
 ;LangString inst_magnet ${LANG_ENGLISH} "Open magnet links with qBittorrent"
@@ -15,9 +15,9 @@ LangString inst_magnet ${LANG_CZECH} "Otevírat odkazy Magnet pomocí qBittorren
 ;LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule"
 LangString inst_firewall ${LANG_CZECH} "Vytvořit pravidlo ve Windows Firewall"
 ;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_CZECH} "Disable Windows path length limit (260 character MAX_PATH limitation, requires Windows 10 1607 or later)"
+LangString inst_pathlimit ${LANG_CZECH} "Vypnout MAX_PATH limit 260 znaků pro cesty (vyžaduje Windows 10 1607 a novější)"
 ;LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule"
-LangString inst_firewallinfo ${LANG_CZECH} "Vytváření pravidla ve Windows Firewall"
+LangString inst_firewallinfo ${LANG_CZECH} "Přidávání pravidla do 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} "Current version will be uninstalled. User settings and torrents will remain intact."
@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_CZECH} "Spustit qBittorrent."
 LangString inst_requires_64bit ${LANG_CZECH} "Tento instalátor funguje pouze v 64-bit Windows."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_CZECH} "Tato verze qBittorrent vyžaduje minimálně Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_CZECH} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/danish.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_DANISH} "Start qBittorrent."
 LangString inst_requires_64bit ${LANG_DANISH} "Dette installationsprogram virker kun i 64-bit Windows versioner."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_DANISH} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_DANISH} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/dutch.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_DUTCH} "qBittorrent starten."
 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} "Deze versie van qBittorrent vereist ten minste Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_DUTCH} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/english.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/esperanto.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_ESPERANTO} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_ESPERANTO} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_ESPERANTO} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_ESPERANTO} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/estonian.nsi

@@ -1,59 +1,60 @@
 ;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
-LangString inst_qbt_req ${LANG_ESTONIAN} "qBittorrent (required)"
+LangString inst_qbt_req ${LANG_ESTONIAN} "qBittorrent (vajalik)"
 ;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_dekstop ${LANG_ESTONIAN} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_ESTONIAN} "Loo Töölaua Otsetee"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
-LangString inst_startmenu ${LANG_ESTONIAN} "Create Start Menu Shortcut"
+LangString inst_startmenu ${LANG_ESTONIAN} "Loo Start Menüü Otsetee"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"
-LangString inst_startup ${LANG_ESTONIAN} "Start qBittorrent on Windows start up"
+LangString inst_startup ${LANG_ESTONIAN} "Käivita qBittorrent Windowsi käivitamisel"
 ;LangString inst_torrent ${LANG_ENGLISH} "Open .torrent files with qBittorrent"
-LangString inst_torrent ${LANG_ESTONIAN} "Open .torrent files with qBittorrent"
+LangString inst_torrent ${LANG_ESTONIAN} "Ava .torrent failid qBittorrentiga"
 ;LangString inst_magnet ${LANG_ENGLISH} "Open magnet links with qBittorrent"
-LangString inst_magnet ${LANG_ESTONIAN} "Open magnet links with qBittorrent"
+LangString inst_magnet ${LANG_ESTONIAN} "Ava magnet lingid qBittorrentiga"
 ;LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule"
-LangString inst_firewall ${LANG_ESTONIAN} "Add Windows Firewall rule"
+LangString inst_firewall ${LANG_ESTONIAN} "Lisa reegel Windowsi Tulemüüri"
 ;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_ESTONIAN} "Disable Windows path length limit (260 character MAX_PATH limitation, requires Windows 10 1607 or later)"
+LangString inst_pathlimit ${LANG_ESTONIAN} "Keela Windowsi kaustade pikkuse limiit (260 karakterit MAX_PATH limiit, vajalik Windows 10 1607 või uuemat)"
 ;LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule"
-LangString inst_firewallinfo ${LANG_ESTONIAN} "Adding Windows Firewall rule"
+LangString inst_firewallinfo ${LANG_ESTONIAN} "Lisatakse Windowsi Tulemüüri reegel"
 ;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_warning ${LANG_ESTONIAN} "qBittorrent töötab. Palun sulge see programm, enne installi."
 ;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_uninstall_question ${LANG_ESTONIAN} "Praegune versioon desinstallitakse. Kasutaja sätted ja torrenti failid jäetakse alles."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
-LangString inst_unist ${LANG_ESTONIAN} "Uninstalling previous version."
+LangString inst_unist ${LANG_ESTONIAN} "Desinstallitakse eelmist versiooni."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
-LangString launch_qbt ${LANG_ESTONIAN} "Launch qBittorrent."
+LangString launch_qbt ${LANG_ESTONIAN} "Käivita qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
-LangString inst_requires_64bit ${LANG_ESTONIAN} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_ESTONIAN} "See installer töötab ainult 64-bit Windowsi versioonides."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_ESTONIAN} "This qBittorrent version requires at least Windows 7."
-
+LangString inst_requires_win7 ${LANG_ESTONIAN} "Selle qBittorrenti versiooni jaoks on vajalik vähemalt Windows 7."
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_ESTONIAN} "Desinstalli qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings
 
 ;LangString remove_files ${LANG_ENGLISH} "Remove files"
-LangString remove_files ${LANG_ESTONIAN} "Remove files"
+LangString remove_files ${LANG_ESTONIAN} "Eemalda failid"
 ;LangString remove_shortcuts ${LANG_ENGLISH} "Remove shortcuts"
-LangString remove_shortcuts ${LANG_ESTONIAN} "Remove shortcuts"
+LangString remove_shortcuts ${LANG_ESTONIAN} "Eemalda otseteed"
 ;LangString remove_associations ${LANG_ENGLISH} "Remove file associations"
-LangString remove_associations ${LANG_ESTONIAN} "Remove file associations"
+LangString remove_associations ${LANG_ESTONIAN} "Eemalda failide seotus"
 ;LangString remove_registry ${LANG_ENGLISH} "Remove registry keys"
-LangString remove_registry ${LANG_ESTONIAN} "Remove registry keys"
+LangString remove_registry ${LANG_ESTONIAN} "Eemalda registri võtmed"
 ;LangString remove_conf ${LANG_ENGLISH} "Remove configuration files"
-LangString remove_conf ${LANG_ESTONIAN} "Remove configuration files"
+LangString remove_conf ${LANG_ESTONIAN} "Eemalda seadistuste failid"
 ;LangString remove_firewall ${LANG_ENGLISH} "Remove Windows Firewall rule"
-LangString remove_firewall ${LANG_ESTONIAN} "Remove Windows Firewall rule"
+LangString remove_firewall ${LANG_ESTONIAN} "Eemalda Windowsi Tulemüüri reegel"
 ;LangString remove_firewallinfo ${LANG_ENGLISH} "Removing Windows Firewall rule"
-LangString remove_firewallinfo ${LANG_ESTONIAN} "Removing Windows Firewall rule"
+LangString remove_firewallinfo ${LANG_ESTONIAN} "Eemaldatakse Windowsi Tulemüüri reegel"
 ;LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data"
-LangString remove_cache ${LANG_ESTONIAN} "Remove torrents and cached data"
+LangString remove_cache ${LANG_ESTONIAN} "Eemalda torrentid ja ajutised andmed"
 ;LangString uninst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before uninstalling."
-LangString uninst_warning ${LANG_ESTONIAN} "qBittorrent is running. Please close the application before uninstalling."
+LangString uninst_warning ${LANG_ESTONIAN} "qBittorrent töötab. Palun sulge programm, enne uninstallimist."
 ;LangString uninst_tor_warn ${LANG_ENGLISH} "Not removing .torrent association. It is associated with:"
-LangString uninst_tor_warn ${LANG_ESTONIAN} "Not removing .torrent association. It is associated with:"
+LangString uninst_tor_warn ${LANG_ESTONIAN} "Ei eemaldata .torrent seotust. Mis on seotud:"
 ;LangString uninst_mag_warn ${LANG_ENGLISH} "Not removing magnet association. It is associated with:"
-LangString uninst_mag_warn ${LANG_ESTONIAN} "Not removing magnet association. It is associated with:"
+LangString uninst_mag_warn ${LANG_ESTONIAN} "Ei eemaldata magnetitega seotust. Mis on seotud:"

dist/windows/installer-translations/farsi.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_FARSI} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_FARSI} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_FARSI} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_FARSI} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/finnish.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_FINNISH} "Käynnistä qBittorrent."
 LangString inst_requires_64bit ${LANG_FINNISH} "Tämä asennusohjelma toimii vain 64-bittisellä Windowsin versiolla."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_FINNISH} "Tämä qBittorrent versio tarvitsee vähintään Windows 7:n."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_FINNISH} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/french.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_FRENCH} "Lancer qBittorrent."
 LangString inst_requires_64bit ${LANG_FRENCH} "Cet installateur ne fonctionne que dans les versions 64 bits de Windows."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_FRENCH} "Cette version de qBittorrent nécessite au moins Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_FRENCH} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/galician.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_GALICIAN} "Iniciar qBittorrent."
 LangString inst_requires_64bit ${LANG_GALICIAN} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_GALICIAN} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_GALICIAN} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/german.nsi

@@ -7,7 +7,7 @@ LangString inst_dekstop ${LANG_GERMAN} "Verknüpfung auf dem Desktop erstellen"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_GERMAN} "Eintrag im Startmenü erstellen"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"
-LangString inst_startup ${LANG_GERMAN} "qBittorrent mit Windows mitstarten"
+LangString inst_startup ${LANG_GERMAN} "qBittorrent mit Windows starten"
 ;LangString inst_torrent ${LANG_ENGLISH} "Open .torrent files with qBittorrent"
 LangString inst_torrent ${LANG_GERMAN} "Öffne .torrent-Dateien mit qBittorrent"
 ;LangString inst_magnet ${LANG_ENGLISH} "Open magnet links with qBittorrent"
@@ -29,8 +29,9 @@ LangString launch_qbt ${LANG_GERMAN} "Starte qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_GERMAN} "Diese Installation funktioniert nur mit einer 64-bit Version von Windows."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_GERMAN} "Diese Version von qBittorrent erfordert zumindest Windows 7."
-
+LangString inst_requires_win7 ${LANG_GERMAN} "Diese Version von qBittorrent erfordert mindestens Windows 7."
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_GERMAN} "qBittorrent deinstallieren"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/greek.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_GREEK} "Εκκίνηση του qBittorrent."
 LangString inst_requires_64bit ${LANG_GREEK} "Αυτό το αρχείο εγκατάστασης λειτουργεί μόνο σε 64-bit εκδόσεις των Windows."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_GREEK} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_GREEK} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/hebrew.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_HEBREW} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_HEBREW} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_HEBREW} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_HEBREW} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/hungarian.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_HUNGARIAN} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_HUNGARIAN} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_HUNGARIAN} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_HUNGARIAN} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/icelandic.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_ICELANDIC} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_ICELANDIC} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_ICELANDIC} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_ICELANDIC} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/indonesian.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_INDONESIAN} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_INDONESIAN} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_INDONESIAN} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_INDONESIAN} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/irish.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_IRISH} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_IRISH} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_IRISH} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_IRISH} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/italian.nsi

@@ -3,9 +3,9 @@
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_ITALIAN} "qBittorrent (necessario)"
 ;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_dekstop ${LANG_ITALIAN} "Crea icone sul desktop"
+LangString inst_dekstop ${LANG_ITALIAN} "Crea collegamento sul Desktop"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
-LangString inst_startmenu ${LANG_ITALIAN} "Crea gruppo programmi"
+LangString inst_startmenu ${LANG_ITALIAN} "Aggiungi al menu Start"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"
 LangString inst_startup ${LANG_ITALIAN} "Esegui qBittorrent all'avvio di Windows"
 ;LangString inst_torrent ${LANG_ENGLISH} "Open .torrent files with qBittorrent"
@@ -15,22 +15,23 @@ 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} "Disabilita limite percorso Windows (limite MAX_PATH max 260 caratterin, richiede Windows 10 versione 1607 o successive)"
+LangString inst_pathlimit ${LANG_ITALIAN} "Disabilita limite lunghezza percorsi Windows (limite MAX_PATH di 260 caratteri, 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.%n%nChiudi l'applicazione qBittorrent prima della nuova installazione."
+LangString inst_warning ${LANG_ITALIAN} "qBittorrent è in esecuzione. Chiudilo prima di procedere con l'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_uninstall_question ${LANG_ITALIAN} "La versione attuale verrà disinstallata. Le impostazioni utente e i torrent rimarranno invariati."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
-LangString inst_unist ${LANG_ITALIAN} "Disinstallazione versione precedente di qBittorrent."
+LangString inst_unist ${LANG_ITALIAN} "Disinstallazione versione precedente."
 ;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} "Questo installer di qBittorrent funziona solo con Windows a 64bit."
+LangString inst_requires_64bit ${LANG_ITALIAN} "Questo installer funziona solo con versioni di Windows a 64bit."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_ITALIAN} "Questa versione di qBittorrent richiede Windows 7 o versioni successive."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_ITALIAN} "Disinstalla qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings
@@ -42,7 +43,7 @@ LangString remove_shortcuts ${LANG_ITALIAN} "Rimuovi collegamenti"
 ;LangString remove_associations ${LANG_ENGLISH} "Remove file associations"
 LangString remove_associations ${LANG_ITALIAN} "Rimuovi associazione file"
 ;LangString remove_registry ${LANG_ENGLISH} "Remove registry keys"
-LangString remove_registry ${LANG_ITALIAN} "Rimuovi chiavi registro"
+LangString remove_registry ${LANG_ITALIAN} "Rimuovi chiavi di registro"
 ;LangString remove_conf ${LANG_ENGLISH} "Remove configuration files"
 LangString remove_conf ${LANG_ITALIAN} "Rimuovi file di configurazione"
 ;LangString remove_firewall ${LANG_ENGLISH} "Remove Windows Firewall rule"
@@ -52,7 +53,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.%n%nChiudi qBittorrent prima della disinstallazione."
+LangString uninst_warning ${LANG_ITALIAN} "qBittorrent è in esecuzione. Chiudilo prima di procedere con la 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

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_JAPANESE} "qBittorrent を起動"
 LangString inst_requires_64bit ${LANG_JAPANESE} "このインストーラーは 64 ビット版の Windows でのみ実行できます。"
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_JAPANESE} "このバージョンの qBittorrent には Windows 7 以降が必要です。"
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_JAPANESE} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/korean.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_KOREAN} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_KOREAN} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_KOREAN} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_KOREAN} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/kurdish.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_KURDISH} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_KURDISH} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_KURDISH} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_KURDISH} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/latvian.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_LATVIAN} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_LATVIAN} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_LATVIAN} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_LATVIAN} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/lithuanian.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_LITHUANIAN} "Paleisti qBittorrent."
 LangString inst_requires_64bit ${LANG_LITHUANIAN} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_LITHUANIAN} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_LITHUANIAN} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/luxembourgish.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_LUXEMBOURGISH} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_LUXEMBOURGISH} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_LUXEMBOURGISH} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_LUXEMBOURGISH} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/macedonian.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_MACEDONIAN} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_MACEDONIAN} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_MACEDONIAN} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_MACEDONIAN} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/malay.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_MALAY} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_MALAY} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_MALAY} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_MALAY} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/mongolian.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_MONGOLIAN} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_MONGOLIAN} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_MONGOLIAN} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_MONGOLIAN} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/norwegian.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_NORWEGIAN} "Sett i gang qBittorrent."
 LangString inst_requires_64bit ${LANG_NORWEGIAN} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_NORWEGIAN} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_NORWEGIAN} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/norwegiannynorsk.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_NORWEGIANNYNORSK} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_NORWEGIANNYNORSK} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_NORWEGIANNYNORSK} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_NORWEGIANNYNORSK} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/polish.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_POLISH} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_POLISH} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_POLISH} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_POLISH} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/portuguese.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_PORTUGUESE} "Iniciar qBittorrent."
 LangString inst_requires_64bit ${LANG_PORTUGUESE} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_PORTUGUESE} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_PORTUGUESE} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/portugueseBR.nsi

@@ -5,32 +5,33 @@ LangString inst_qbt_req ${LANG_PORTUGUESEBR} "qBittorrent (requerido)"
 ;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
 LangString inst_dekstop ${LANG_PORTUGUESEBR} "Criar Atalho no Desktop"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
-LangString inst_startmenu ${LANG_PORTUGUESEBR} "Criar Atalho no Menu"
+LangString inst_startmenu ${LANG_PORTUGUESEBR} "Criar Atalho no Menu Iniciar"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"
 LangString inst_startup ${LANG_PORTUGUESEBR} "Iniciar o qBittorrent na inicialização do Windows"
 ;LangString inst_torrent ${LANG_ENGLISH} "Open .torrent files with qBittorrent"
-LangString inst_torrent ${LANG_PORTUGUESEBR} "Abrir arquivos .torrent com qBittorrent"
+LangString inst_torrent ${LANG_PORTUGUESEBR} "Abrir arquivos .torrent com o qBittorrent"
 ;LangString inst_magnet ${LANG_ENGLISH} "Open magnet links with qBittorrent"
-LangString inst_magnet ${LANG_PORTUGUESEBR} "Abrir links magnéticos com qBittorrent"
+LangString inst_magnet ${LANG_PORTUGUESEBR} "Abrir links magnet com o qBittorrent"
 ;LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule"
 LangString inst_firewall ${LANG_PORTUGUESEBR} "Adicionar regra no firewall do 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_PORTUGUESEBR} "Disable Windows path length limit (260 character MAX_PATH limitation, requires Windows 10 1607 or later)"
+LangString inst_pathlimit ${LANG_PORTUGUESEBR} "Desativar limite de comprimento do caminho do Windows (limite MAX_PATH de 260 caracteres, requer Windows 10 1067 ou superior)"
 ;LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule"
 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_warning ${LANG_PORTUGUESEBR} "O qBittorrent está em execução. Por favor feche o aplicativo antes de instalar."
 ;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_uninstall_question ${LANG_PORTUGUESEBR} "A versão atual será desinstalada. As configurações e os torrentes do usuário permanecerão intactos."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
-LangString inst_unist ${LANG_PORTUGUESEBR} "Desinstalando versão anterior."
+LangString inst_unist ${LANG_PORTUGUESEBR} "Desinstalando a versão anterior."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
-LangString launch_qbt ${LANG_PORTUGUESEBR} "Executar qBittorrent."
+LangString launch_qbt ${LANG_PORTUGUESEBR} "Executar o qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
-LangString inst_requires_64bit ${LANG_PORTUGUESEBR} "This installer works only in 64-bit Windows versions."
+LangString inst_requires_64bit ${LANG_PORTUGUESEBR} "Este instalador só funciona nas versões 64 bits do Windows."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
-LangString inst_requires_win7 ${LANG_PORTUGUESEBR} "This qBittorrent version requires at least Windows 7."
-
+LangString inst_requires_win7 ${LANG_PORTUGUESEBR} "Esta versão do qBittorrent requer no mínimo o Windows 7."
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_PORTUGUESEBR} "Desinstalar o qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings
@@ -40,20 +41,20 @@ LangString remove_files ${LANG_PORTUGUESEBR} "Remover arquivos"
 ;LangString remove_shortcuts ${LANG_ENGLISH} "Remove shortcuts"
 LangString remove_shortcuts ${LANG_PORTUGUESEBR} "Remover atalhos"
 ;LangString remove_associations ${LANG_ENGLISH} "Remove file associations"
-LangString remove_associations ${LANG_PORTUGUESEBR} "Remover associação de arquivos"
+LangString remove_associations ${LANG_PORTUGUESEBR} "Remover associações dos arquivos"
 ;LangString remove_registry ${LANG_ENGLISH} "Remove registry keys"
-LangString remove_registry ${LANG_PORTUGUESEBR} "Remover registros"
+LangString remove_registry ${LANG_PORTUGUESEBR} "Remover chaves do registro"
 ;LangString remove_conf ${LANG_ENGLISH} "Remove configuration files"
-LangString remove_conf ${LANG_PORTUGUESEBR} "Remover configurações"
+LangString remove_conf ${LANG_PORTUGUESEBR} "Remover os arquivos das configurações"
 ;LangString remove_firewall ${LANG_ENGLISH} "Remove Windows Firewall rule"
-LangString remove_firewall ${LANG_PORTUGUESEBR} "Remover regras do firewall do Windows"
+LangString remove_firewall ${LANG_PORTUGUESEBR} "Remover regra do Firewall do Windows"
 ;LangString remove_firewallinfo ${LANG_ENGLISH} "Removing Windows Firewall rule"
-LangString remove_firewallinfo ${LANG_PORTUGUESEBR} "Removendo regras do firewall do Windows"
+LangString remove_firewallinfo ${LANG_PORTUGUESEBR} "Removendo regra do Firewall do Windows"
 ;LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data"
-LangString remove_cache ${LANG_PORTUGUESEBR} "Remover torrents e dados em cache"
+LangString remove_cache ${LANG_PORTUGUESEBR} "Remover os torrentes e dados no cache"
 ;LangString uninst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before uninstalling."
-LangString uninst_warning ${LANG_PORTUGUESEBR} "qBittorrent está rodando. Por favor feche a aplicação antes de desinstalar."
+LangString uninst_warning ${LANG_PORTUGUESEBR} "O qBittorrent está em execução. Por favor feche o aplicativo antes de desinstalar."
 ;LangString uninst_tor_warn ${LANG_ENGLISH} "Not removing .torrent association. It is associated with:"
-LangString uninst_tor_warn ${LANG_PORTUGUESEBR} "Não removendo associação com .torrent. Está associado com:"
+LangString uninst_tor_warn ${LANG_PORTUGUESEBR} "Não removendo a associação com o .torrent. Está associado com:"
 ;LangString uninst_mag_warn ${LANG_ENGLISH} "Not removing magnet association. It is associated with:"
-LangString uninst_mag_warn ${LANG_PORTUGUESEBR} "Não removendo associação com links magnéticos. Está associado com:"
+LangString uninst_mag_warn ${LANG_PORTUGUESEBR} "Não removendo a associação com o magnet. Está associado com:"

dist/windows/installer-translations/romanian.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_ROMANIAN} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_ROMANIAN} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_ROMANIAN} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_ROMANIAN} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/russian.nsi

@@ -21,16 +21,17 @@ 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} "Current version will be uninstalled. User settings and torrents will remain intact."
-LangString inst_uninstall_question ${LANG_RUSSIAN} "Обнаружена предыдущая установка. Она будет деинсталлирована без удаления пользовательских настроек."
+LangString inst_uninstall_question ${LANG_RUSSIAN} "Текущая версия будет удалена. Пользовательские настройки и торренты останутся нетронутыми."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
-LangString inst_unist ${LANG_RUSSIAN} "Деинсталлируется старая версия."
+LangString inst_unist ${LANG_RUSSIAN} "Удаляется старая версия."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
 LangString launch_qbt ${LANG_RUSSIAN} "Запустить qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 LangString inst_requires_64bit ${LANG_RUSSIAN} "Этот установщик работает только на 64-битных версиях Windows."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_RUSSIAN} "Для работы этой версии qBittorrent требуется Windows 7 или выше."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_RUSSIAN} "Удалить qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings
@@ -52,7 +53,7 @@ LangString remove_firewallinfo ${LANG_RUSSIAN} "Удаление из списк
 ;LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data"
 LangString remove_cache ${LANG_RUSSIAN} "Удалить сохранённые торрент-файлы"
 ;LangString uninst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before uninstalling."
-LangString uninst_warning ${LANG_RUSSIAN} "qBittorrent запущен. Пожалуйста, закройте qBittorrent и перезапустите программу удаления."
+LangString uninst_warning ${LANG_RUSSIAN} "qBittorrent запущен. Пожалуйста, закройте qBittorrent перед удалением."
 ;LangString uninst_tor_warn ${LANG_ENGLISH} "Not removing .torrent association. It is associated with:"
 LangString uninst_tor_warn ${LANG_RUSSIAN} "Ассоциации торрент-файлов не сброшены. Уже ассоциированы с:"
 ;LangString uninst_mag_warn ${LANG_ENGLISH} "Not removing magnet association. It is associated with:"

dist/windows/installer-translations/serbian.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_SERBIAN} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_SERBIAN} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_SERBIAN} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_SERBIAN} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/serbianlatin.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_SERBIANLATIN} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_SERBIANLATIN} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_SERBIANLATIN} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_SERBIANLATIN} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/simpchinese.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_SIMPCHINESE} "启动 qBittorrent."
 LangString inst_requires_64bit ${LANG_SIMPCHINESE} "此安装程序只能在64位的Windows上工作。"
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_SIMPCHINESE} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_SIMPCHINESE} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/slovak.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_SLOVAK} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_SLOVAK} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_SLOVAK} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_SLOVAK} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/slovenian.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_SLOVENIAN} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_SLOVENIAN} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_SLOVENIAN} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_SLOVENIAN} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/spanish.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_SPANISH} "Iniciar qBittorrent."
 LangString inst_requires_64bit ${LANG_SPANISH} "Este instalador solo funciona en versiones de 64-bit de Windows."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_SPANISH} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_SPANISH} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/spanishinternational.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_SPANISHINTERNATIONAL} "Iniciar qBittorrent."
 LangString inst_requires_64bit ${LANG_SPANISHINTERNATIONAL} "Este instalador solo funciona en versiones de 64-bit de Windows."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_SPANISHINTERNATIONAL} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_SPANISHINTERNATIONAL} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/swedish.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_SWEDISH} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_SWEDISH} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_SWEDISH} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_SWEDISH} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/thai.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_THAI} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_THAI} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_THAI} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_THAI} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/tradchinese.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_TRADCHINESE} "啟動 qBittorrent"
 LangString inst_requires_64bit ${LANG_TRADCHINESE} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_TRADCHINESE} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_TRADCHINESE} "移除 qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/turkish.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_TURKISH} "qBittorrent'i başlat"
 LangString inst_requires_64bit ${LANG_TURKISH} "Bu yükleyici sadece 64-bit Windows sürümlerinde çalışır."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_TURKISH} "Bu qBittorrent sürümü en az Windows 7 gerektirir."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_TURKISH} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/ukrainian.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_UKRAINIAN} "Запустити qBittorrent."
 LangString inst_requires_64bit ${LANG_UKRAINIAN} "Ця програма установки працює тільки в 64-розрядних версіях Windows."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_UKRAINIAN} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_UKRAINIAN} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/uzbek.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_UZBEK} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_UZBEK} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_UZBEK} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_UZBEK} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/welsh.nsi

@@ -30,7 +30,8 @@ LangString launch_qbt ${LANG_WELSH} "Launch qBittorrent."
 LangString inst_requires_64bit ${LANG_WELSH} "This installer works only in 64-bit Windows versions."
 ;LangString inst_requires_win7 ${LANG_ENGLISH} "This qBittorrent version requires at least Windows 7."
 LangString inst_requires_win7 ${LANG_WELSH} "This qBittorrent version requires at least Windows 7."
-
+;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
+LangString inst_uninstall_link_description ${LANG_WELSH} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer.nsi

@@ -78,7 +78,7 @@ Section $(inst_startmenu) ;"Create Start Menu Shortcut"
 
   CreateDirectory "$SMPROGRAMS\qBittorrent"
   CreateShortCut "$SMPROGRAMS\qBittorrent\qBittorrent.lnk" "$INSTDIR\qbittorrent.exe"
-  CreateShortCut "$SMPROGRAMS\qBittorrent\Uninstall.lnk" "$INSTDIR\uninst.exe"
+  CreateShortCut "$SMPROGRAMS\qBittorrent\$(inst_uninstall_link_description).lnk" "$INSTDIR\uninst.exe"
 
 SectionEnd
 

dist/windows/options.nsi

@@ -28,7 +28,7 @@ XPStyle on
 !define CSIDL_LOCALAPPDATA '0x1C' ;Local Application Data path
 
 ; Program specific
-!define PROG_VERSION "4.3.1"
+!define PROG_VERSION "4.3.5"
 
 !define MUI_FINISHPAGE_RUN
 !define MUI_FINISHPAGE_RUN_FUNCTION PageFinishRun
@@ -51,7 +51,7 @@ XPStyle on
 ;Installer Version Information
 VIAddVersionKey "ProductName" "qBittorrent"
 VIAddVersionKey "CompanyName" "The qBittorrent project"
-VIAddVersionKey "LegalCopyright" "Copyright ©2006-2020 The qBittorrent project"
+VIAddVersionKey "LegalCopyright" "Copyright ©2006-2021 The qBittorrent project"
 VIAddVersionKey "FileDescription" "qBittorrent - A Bittorrent Client"
 VIAddVersionKey "FileVersion" "${PROG_VERSION}"
 

m4/qbittorrent.m4

@@ -5,9 +5,9 @@
 # Sets the QT_QMAKE variable to the path of Qt5 qmake if found.
 # --------------------------------------
 AC_DEFUN([FIND_QT5],
-[PKG_CHECK_EXISTS([Qt5Core >= 5.9.0],
+[PKG_CHECK_EXISTS([Qt5Core >= 5.11],
                  [PKG_CHECK_VAR(QT_QMAKE,
-                                [Qt5Core >= 5.9.0],
+                                [Qt5Core >= 5.11],
                                 [host_bins])
                  ])
 
@@ -18,7 +18,7 @@ AS_IF([test -f "$QT_QMAKE/qmake"],
                              [QT_QMAKE=""])
               ])
 
-AC_MSG_CHECKING([for Qt5 qmake >= 5.9.0])
+AC_MSG_CHECKING([for Qt5 qmake >= 5.11])
 AS_IF([test "x$QT_QMAKE" != "x"],
       [AC_MSG_RESULT([$QT_QMAKE])],
       [AC_MSG_RESULT([not found])]
@@ -29,23 +29,23 @@ AS_IF([test "x$QT_QMAKE" != "x"],
 # Sets the HAVE_QTDBUS variable to true or false.
 # --------------------------------------
 AC_DEFUN([FIND_QTDBUS],
-       [AC_MSG_CHECKING([for Qt5DBus >= 5.9.0])
-       PKG_CHECK_EXISTS([Qt5DBus >= 5.9.0],
+       [AC_MSG_CHECKING([for Qt5DBus >= 5.11])
+       PKG_CHECK_EXISTS([Qt5DBus >= 5.11],
                         [AC_MSG_RESULT([found])
                          HAVE_QTDBUS=[true]],
                         [AC_MSG_RESULT([not found])
                          HAVE_QTDBUS=[false]])
 ])
 
-# DETECT_CPP14_PROGRAM()
-# Detects if at least C++14 mode is enabled.
+# DETECT_CPP17_PROGRAM()
+# Detects if at least C++17 mode is enabled.
 # --------------------------------------
-AC_DEFUN([DETECT_CPP14_PROGRAM],
+AC_DEFUN([DETECT_CPP17_PROGRAM],
        [AC_LANG_PROGRAM([[
             #ifndef __cplusplus
             #error "This is not a C++ compiler"
-            #elif __cplusplus < 201402L
-            #error "This is not a C++14 compiler"
+            #elif __cplusplus < 201703L
+            #error "This is not a C++17 compiler"
             #endif]],
             [[]])
 ])

macxconf.pri

@@ -7,6 +7,8 @@ else {
     include(conf.pri)
 }
 
+QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.14
+
 LIBS += -framework Carbon -framework IOKit -framework AppKit
 
 QT_LANG_PATH = ../dist/qt-translations

qbittorrent.pro

@@ -4,19 +4,6 @@ SUBDIRS += src
 
 include(version.pri)
 
-# Make target to create release tarball. Use 'make tarball'
-tarball.commands += rm -fR ../$${PROJECT_NAME}-$${PROJECT_VERSION}/ &&
-tarball.commands += git clone . ../$${PROJECT_NAME}-$${PROJECT_VERSION} &&
-tarball.commands += rm -fR ../$${PROJECT_NAME}-$${PROJECT_VERSION}/.git &&
-tarball.commands += rm -f ../$${PROJECT_NAME}-$${PROJECT_VERSION}/.gitignore &&
-tarball.commands += cd .. &&
-tarball.commands += tar czf $${PROJECT_NAME}-$${PROJECT_VERSION}.tar.gz $${PROJECT_NAME}-$${PROJECT_VERSION} &&
-tarball.commands += tar cf $${PROJECT_NAME}-$${PROJECT_VERSION}.tar $${PROJECT_NAME}-$${PROJECT_VERSION} &&
-tarball.commands += xz -f $${PROJECT_NAME}-$${PROJECT_VERSION}.tar &&
-tarball.commands += rm -fR $${PROJECT_NAME}-$${PROJECT_VERSION}
-
-QMAKE_EXTRA_TARGETS += tarball
-
 # For Qt Creator beautifier
 DISTFILES += \
     uncrustify.cfg

src/CMakeLists.txt

@@ -1,12 +1,12 @@
 if (UNIX AND (NOT APPLE) AND (NOT CYGWIN))
-    find_package(LibtorrentRasterbar QUIET ${requiredLibtorrentVersion} COMPONENTS torrent-rasterbar)
+    find_package(LibtorrentRasterbar QUIET ${minLibtorrentVersion} COMPONENTS torrent-rasterbar)
     if (NOT LibtorrentRasterbar_FOUND)
         include(FindPkgConfig)
-        pkg_check_modules(LIBTORRENT_RASTERBAR IMPORTED_TARGET GLOBAL "libtorrent-rasterbar>=${requiredLibtorrentVersion}")
+        pkg_check_modules(LIBTORRENT_RASTERBAR IMPORTED_TARGET GLOBAL "libtorrent-rasterbar>=${minLibtorrentVersion}")
         if (NOT LIBTORRENT_RASTERBAR_FOUND)
             message(
                 FATAL_ERROR
-                "Package LibtorrentRasterbar >= ${requiredLibtorrentVersion} not found"
+                "Package LibtorrentRasterbar >= ${minLibtorrentVersion} not found"
                 " with CMake or pkg-config.\n- Set LibtorrentRasterbar_DIR to a directory containing"
                 " a LibtorrentRasterbarConfig.cmake file or add the installation prefix of LibtorrentRasterbar"
                 " to CMAKE_PREFIX_PATH.\n- Alternatively, make sure there is a valid libtorrent-rasterbar.pc"
@@ -18,9 +18,9 @@ if (UNIX AND (NOT APPLE) AND (NOT CYGWIN))
         # force a fake package to show up in the feature summary
         set_property(GLOBAL APPEND PROPERTY
             PACKAGES_FOUND
-            "LibtorrentRasterbar via pkg-config (required version >= ${requiredLibtorrentVersion})"
+            "LibtorrentRasterbar via pkg-config (version >= ${minLibtorrentVersion})"
         )
-        set_package_properties("LibtorrentRasterbar via pkg-config (required version >= ${requiredLibtorrentVersion})"
+        set_package_properties("LibtorrentRasterbar via pkg-config (version >= ${minLibtorrentVersion})"
             PROPERTIES
             TYPE REQUIRED
         )
@@ -28,16 +28,16 @@ if (UNIX AND (NOT APPLE) AND (NOT CYGWIN))
         set_package_properties(LibtorrentRasterbar PROPERTIES TYPE REQUIRED)
     endif()
 else()
-    find_package(LibtorrentRasterbar ${requiredLibtorrentVersion} REQUIRED COMPONENTS torrent-rasterbar)
+    find_package(LibtorrentRasterbar ${minLibtorrentVersion} REQUIRED COMPONENTS torrent-rasterbar)
 endif()
 # force variable type so that it always shows up in ccmake/cmake-gui frontends
 set_property(CACHE LibtorrentRasterbar_DIR PROPERTY TYPE PATH)
-find_package(Boost ${requiredBoostVersion} REQUIRED)
-find_package(OpenSSL ${requiredOpenSSLVersion} REQUIRED)
-find_package(ZLIB ${requiredZlibVersion} REQUIRED)
-find_package(Qt5 ${requiredQtVersion} REQUIRED COMPONENTS Core Network Xml LinguistTools)
+find_package(Boost ${minBoostVersion} REQUIRED)
+find_package(OpenSSL ${minOpenSSLVersion} REQUIRED)
+find_package(ZLIB ${minZlibVersion} REQUIRED)
+find_package(Qt5 ${minQtVersion} REQUIRED COMPONENTS Core Network Xml LinguistTools)
 if (DBUS)
-    find_package(Qt5 ${requiredQtVersion} REQUIRED COMPONENTS DBus)
+    find_package(Qt5 ${minQtVersion} REQUIRED COMPONENTS DBus)
     set_package_properties(Qt5DBus PROPERTIES
         DESCRIPTION "Qt5 module for inter-process communication over the D-Bus protocol"
         PURPOSE "Required by the DBUS feature"
@@ -60,11 +60,11 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 add_subdirectory(base)
 
 if (GUI)
-    find_package(Qt5 ${requiredQtVersion} REQUIRED COMPONENTS Widgets Svg)
+    find_package(Qt5 ${minQtVersion} REQUIRED COMPONENTS Widgets Svg)
     if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-        find_package(Qt5 ${requiredQtVersion} REQUIRED COMPONENTS MacExtras)
+        find_package(Qt5 ${minQtVersion} REQUIRED COMPONENTS MacExtras)
     elseif (CMAKE_SYSTEM_NAME STREQUAL "Windows")
-        find_package(Qt5 ${requiredQtVersion} REQUIRED COMPONENTS WinExtras)
+        find_package(Qt5 ${minQtVersion} REQUIRED COMPONENTS WinExtras)
     endif()
     add_subdirectory(gui)
 endif()

src/app/CMakeLists.txt

@@ -61,7 +61,6 @@ target_sources(qbt_app PRIVATE
 
 target_link_libraries(qbt_app PRIVATE
     qbt_base
-    qbt_version_definitions
 )
 
 set_target_properties(qbt_app PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
@@ -84,18 +83,14 @@ set_source_files_properties(
 )
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    # substitute @EXECUTABLE@ in dist/mac/Info.plist
-    get_target_property(EXECUTABLE qbt_app OUTPUT_NAME)
-    configure_file(${qBittorrent_SOURCE_DIR}/dist/mac/Info.plist
-        ${qBittorrent_BINARY_DIR}/dist/mac/pregen.plist @ONLY)
-    file(GENERATE
-        OUTPUT ${qBittorrent_BINARY_DIR}/dist/mac/Info.plist
-        INPUT ${qBittorrent_BINARY_DIR}/dist/mac/pregen.plist
-    )
+    # provide variables for substitution in dist/mac/Info.plist
+    get_target_property(EXECUTABLE_NAME qbt_app OUTPUT_NAME)
+    # This variable name should be changed once qmake is no longer used. Refer to the discussion in PR #14813
+    set(MACOSX_DEPLOYMENT_TARGET ${CMAKE_OSX_DEPLOYMENT_TARGET})
     set_target_properties(qbt_app PROPERTIES
         MACOSX_BUNDLE ON
-        MACOSX_BUNDLE_BUNDLE_NAME "${EXECUTABLE}"
-        MACOSX_BUNDLE_INFO_PLIST ${qBittorrent_BINARY_DIR}/dist/mac/Info.plist
+        MACOSX_BUNDLE_BUNDLE_NAME "qBittorrent"
+        MACOSX_BUNDLE_INFO_PLIST ${qBittorrent_SOURCE_DIR}/dist/mac/Info.plist
     )
     target_sources(qbt_app PRIVATE
         ${QT_TRANSLATIONS}

src/app/application.cpp

@@ -63,7 +63,7 @@
 
 #include "base/bittorrent/infohash.h"
 #include "base/bittorrent/session.h"
-#include "base/bittorrent/torrenthandle.h"
+#include "base/bittorrent/torrent.h"
 #include "base/exceptions.h"
 #include "base/iconprovider.h"
 #include "base/logger.h"
@@ -81,6 +81,7 @@
 #include "base/utils/fs.h"
 #include "base/utils/misc.h"
 #include "base/utils/string.h"
+#include "base/version.h"
 #include "applicationinstancemanager.h"
 #include "filelogger.h"
 
@@ -214,7 +215,7 @@ const QBtCommandLineParameters &Application::commandLineArgs() const
 
 bool Application::isFileLoggerEnabled() const
 {
-    return settings()->loadValue(KEY_FILELOGGER_ENABLED, true).toBool();
+    return settings()->loadValue(KEY_FILELOGGER_ENABLED, true);
 }
 
 void Application::setFileLoggerEnabled(const bool value)
@@ -228,8 +229,8 @@ void Application::setFileLoggerEnabled(const bool value)
 
 QString Application::fileLoggerPath() const
 {
-    return settings()->loadValue(KEY_FILELOGGER_PATH,
-            {specialFolderLocation(SpecialFolder::Data) + LOG_FOLDER}).toString();
+    return settings()->loadValue(KEY_FILELOGGER_PATH
+        , QString {specialFolderLocation(SpecialFolder::Data) + LOG_FOLDER});
 }
 
 void Application::setFileLoggerPath(const QString &path)
@@ -241,7 +242,7 @@ void Application::setFileLoggerPath(const QString &path)
 
 bool Application::isFileLoggerBackup() const
 {
-    return settings()->loadValue(KEY_FILELOGGER_BACKUP, true).toBool();
+    return settings()->loadValue(KEY_FILELOGGER_BACKUP, true);
 }
 
 void Application::setFileLoggerBackup(const bool value)
@@ -253,7 +254,7 @@ void Application::setFileLoggerBackup(const bool value)
 
 bool Application::isFileLoggerDeleteOld() const
 {
-    return settings()->loadValue(KEY_FILELOGGER_DELETEOLD, true).toBool();
+    return settings()->loadValue(KEY_FILELOGGER_DELETEOLD, true);
 }
 
 void Application::setFileLoggerDeleteOld(const bool value)
@@ -265,7 +266,7 @@ void Application::setFileLoggerDeleteOld(const bool value)
 
 int Application::fileLoggerMaxSize() const
 {
-    const int val = settings()->loadValue(KEY_FILELOGGER_MAXSIZEBYTES, DEFAULT_FILELOG_SIZE).toInt();
+    const int val = settings()->loadValue(KEY_FILELOGGER_MAXSIZEBYTES, DEFAULT_FILELOG_SIZE);
     return std::min(std::max(val, MIN_FILELOG_SIZE), MAX_FILELOG_SIZE);
 }
 
@@ -279,7 +280,7 @@ void Application::setFileLoggerMaxSize(const int bytes)
 
 int Application::fileLoggerAge() const
 {
-    const int val = settings()->loadValue(KEY_FILELOGGER_AGE, 1).toInt();
+    const int val = settings()->loadValue(KEY_FILELOGGER_AGE, 1);
     return std::min(std::max(val, 1), 365);
 }
 
@@ -290,7 +291,7 @@ void Application::setFileLoggerAge(const int value)
 
 int Application::fileLoggerAgeType() const
 {
-    const int val = settings()->loadValue(KEY_FILELOGGER_AGETYPE, 1).toInt();
+    const int val = settings()->loadValue(KEY_FILELOGGER_AGETYPE, 1);
     return ((val < 0) || (val > 2)) ? 1 : val;
 }
 
@@ -310,16 +311,8 @@ void Application::processMessage(const QString &message)
         m_paramsQueue.append(params);
 }
 
-void Application::runExternalProgram(const BitTorrent::TorrentHandle *torrent) const
+void Application::runExternalProgram(const BitTorrent::Torrent *torrent) const
 {
-    QString program = Preferences::instance()->getAutoRunProgram().trimmed();
-    program.replace("%N", torrent->name());
-    program.replace("%L", torrent->category());
-
-    QStringList tags = torrent->tags().values();
-    std::sort(tags.begin(), tags.end(), Utils::String::naturalLessThan<Qt::CaseInsensitive>);
-    program.replace("%G", tags.join(','));
-
 #if defined(Q_OS_WIN)
     const auto chopPathSep = [](const QString &str) -> QString
     {
@@ -327,21 +320,74 @@ void Application::runExternalProgram(const BitTorrent::TorrentHandle *torrent) c
             return str.mid(0, (str.length() -1));
         return str;
     };
-    program.replace("%F", chopPathSep(Utils::Fs::toNativePath(torrent->contentPath())));
-    program.replace("%R", chopPathSep(Utils::Fs::toNativePath(torrent->rootPath())));
-    program.replace("%D", chopPathSep(Utils::Fs::toNativePath(torrent->savePath())));
-#else
-    program.replace("%F", Utils::Fs::toNativePath(torrent->contentPath()));
-    program.replace("%R", Utils::Fs::toNativePath(torrent->rootPath()));
-    program.replace("%D", Utils::Fs::toNativePath(torrent->savePath()));
 #endif
-    program.replace("%C", QString::number(torrent->filesCount()));
-    program.replace("%Z", QString::number(torrent->totalSize()));
-    program.replace("%T", torrent->currentTracker());
-    program.replace("%I", torrent->hash());
 
-    Logger *logger = Logger::instance();
-    logger->addMessage(tr("Torrent: %1, running external program, command: %2").arg(torrent->name(), program));
+    QString program = Preferences::instance()->getAutoRunProgram().trimmed();
+
+    for (int i = (program.length() - 2); i >= 0; --i)
+    {
+        if (program[i] != QLatin1Char('%'))
+            continue;
+
+        const ushort specifier = program[i + 1].unicode();
+        switch (specifier)
+        {
+        case u'C':
+            program.replace(i, 2, QString::number(torrent->filesCount()));
+            break;
+        case u'D':
+#if defined(Q_OS_WIN)
+            program.replace(i, 2, chopPathSep(Utils::Fs::toNativePath(torrent->savePath())));
+#else
+            program.replace(i, 2, Utils::Fs::toNativePath(torrent->savePath()));
+#endif
+            break;
+        case u'F':
+#if defined(Q_OS_WIN)
+            program.replace(i, 2, chopPathSep(Utils::Fs::toNativePath(torrent->contentPath())));
+#else
+            program.replace(i, 2, Utils::Fs::toNativePath(torrent->contentPath()));
+#endif
+            break;
+        case u'G':
+            {
+                QStringList tags = torrent->tags().values();
+                std::sort(tags.begin(), tags.end(), Utils::String::naturalLessThan<Qt::CaseInsensitive>);
+                program.replace(i, 2, tags.join(','));
+            }
+            break;
+        case u'I':
+            program.replace(i, 2, torrent->id().toString());
+            break;
+        case u'L':
+            program.replace(i, 2, torrent->category());
+            break;
+        case u'N':
+            program.replace(i, 2, torrent->name());
+            break;
+        case u'R':
+#if defined(Q_OS_WIN)
+            program.replace(i, 2, chopPathSep(Utils::Fs::toNativePath(torrent->rootPath())));
+#else
+            program.replace(i, 2, Utils::Fs::toNativePath(torrent->rootPath()));
+#endif
+            break;
+        case u'T':
+            program.replace(i, 2, torrent->currentTracker());
+            break;
+        case u'Z':
+            program.replace(i, 2, QString::number(torrent->totalSize()));
+            break;
+        default:
+            // do nothing
+            break;
+        }
+
+        // decrement `i` to avoid unwanted replacement, example pattern: "%%N"
+        --i;
+    }
+
+    LogMsg(tr("Torrent: %1, running external program, command: %2").arg(torrent->name(), program));
 
 #if defined(Q_OS_WIN)
     auto programWchar = std::make_unique<wchar_t[]>(program.length() + 1);
@@ -357,7 +403,6 @@ void Application::runExternalProgram(const BitTorrent::TorrentHandle *torrent) c
     for (int i = 1; i < argCount; ++i)
         argList += QString::fromWCharArray(args[i]);
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0))
     QProcess proc;
     proc.setProgram(QString::fromWCharArray(args[0]));
     proc.setArguments(argList);
@@ -383,9 +428,6 @@ void Application::runExternalProgram(const BitTorrent::TorrentHandle *torrent) c
         args->startupInfo->hStdError = nullptr;
     });
     proc.startDetached();
-#else
-    QProcess::startDetached(QString::fromWCharArray(args[0]), argList);
-#endif // QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
 #else // Q_OS_WIN
     // Cannot give users shell environment by default, as doing so could
     // enable command injection via torrent name and other arguments
@@ -404,7 +446,7 @@ void Application::runExternalProgram(const BitTorrent::TorrentHandle *torrent) c
 #endif
 }
 
-void Application::sendNotificationEmail(const BitTorrent::TorrentHandle *torrent)
+void Application::sendNotificationEmail(const BitTorrent::Torrent *torrent)
 {
     // Prepare mail content
     const QString content = tr("Torrent name: %1").arg(torrent->name()) + '\n'
@@ -423,7 +465,7 @@ void Application::sendNotificationEmail(const BitTorrent::TorrentHandle *torrent
                      content);
 }
 
-void Application::torrentFinished(BitTorrent::TorrentHandle *const torrent)
+void Application::torrentFinished(BitTorrent::Torrent *const torrent)
 {
     Preferences *const pref = Preferences::instance();
 
@@ -505,7 +547,7 @@ void Application::processParams(const QStringList &params)
     }
 #endif
     BitTorrent::AddTorrentParams torrentParams;
-    TriStateBool skipTorrentDialog;
+    std::optional<bool> skipTorrentDialog;
 
     for (QString param : params)
     {
@@ -521,7 +563,7 @@ void Application::processParams(const QStringList &params)
 
         if (param.startsWith(QLatin1String("@addPaused=")))
         {
-            torrentParams.addPaused = param.midRef(11).toInt() ? TriStateBool::True : TriStateBool::False;
+            torrentParams.addPaused = (param.midRef(11).toInt() != 0);
             continue;
         }
 
@@ -551,7 +593,7 @@ void Application::processParams(const QStringList &params)
 
         if (param.startsWith(QLatin1String("@skipDialog=")))
         {
-            skipTorrentDialog = param.midRef(12).toInt() ? TriStateBool::True : TriStateBool::False;
+            skipTorrentDialog = (param.midRef(12).toInt() != 0);
             continue;
         }
 
@@ -561,9 +603,7 @@ void Application::processParams(const QStringList &params)
         // be shown and skipTorrentDialog is undefined. The other is when
         // skipTorrentDialog is false, meaning that the application setting
         // should be overridden.
-        const bool showDialogForThisTorrent =
-            ((AddNewTorrentDialog::isEnabled() && skipTorrentDialog == TriStateBool::Undefined)
-             || skipTorrentDialog == TriStateBool::False);
+        const bool showDialogForThisTorrent = !skipTorrentDialog.value_or(!AddNewTorrentDialog::isEnabled());
         if (showDialogForThisTorrent)
             AddNewTorrentDialog::show(param, torrentParams, m_window);
         else

src/app/application.h

@@ -59,7 +59,7 @@ class FileLogger;
 
 namespace BitTorrent
 {
-    class TorrentHandle;
+    class Torrent;
 }
 
 namespace RSS
@@ -112,7 +112,7 @@ protected:
 
 private slots:
     void processMessage(const QString &message);
-    void torrentFinished(BitTorrent::TorrentHandle *const torrent);
+    void torrentFinished(BitTorrent::Torrent *const torrent);
     void allTorrentsFinished();
     void cleanup();
 #if (!defined(DISABLE_GUI) && defined(Q_OS_WIN))
@@ -142,6 +142,6 @@ private:
 
     void initializeTranslation();
     void processParams(const QStringList &params);
-    void runExternalProgram(const BitTorrent::TorrentHandle *torrent) const;
-    void sendNotificationEmail(const BitTorrent::TorrentHandle *torrent);
+    void runExternalProgram(const BitTorrent::Torrent *torrent) const;
+    void sendNotificationEmail(const BitTorrent::Torrent *torrent);
 };

src/app/cmdoptions.cpp

@@ -254,13 +254,13 @@ namespace
             return padUsageText(fullParameter() + QLatin1String("=<true|false>"));
         }
 
-        TriStateBool value(const QString &arg) const
+        std::optional<bool> value(const QString &arg) const
         {
             QStringList parts = arg.split(QLatin1Char('='));
 
             if (parts.size() == 1)
             {
-                return TriStateBool(m_defaultValue);
+                return m_defaultValue;
             }
             if (parts.size() == 2)
             {
@@ -268,11 +268,11 @@ namespace
 
                 if ((val.toUpper() == QLatin1String("TRUE")) || (val == QLatin1String("1")))
                 {
-                    return TriStateBool::True;
+                    return true;
                 }
                 if ((val.toUpper() == QLatin1String("FALSE")) || (val == QLatin1String("0")))
                 {
-                    return TriStateBool::False;
+                    return false;
                 }
             }
 
@@ -282,30 +282,30 @@ namespace
                                             .arg(fullParameter(), QLatin1String("<true|false>")));
         }
 
-        TriStateBool value(const QProcessEnvironment &env) const
+        std::optional<bool> value(const QProcessEnvironment &env) const
         {
             const QString val = env.value(envVarName(), "-1");
 
             if (val.isEmpty())
             {
-                return TriStateBool(m_defaultValue);
+                return m_defaultValue;
             }
             if (val == QLatin1String("-1"))
             {
-                return TriStateBool::Undefined;
+                return std::nullopt;
             }
             if ((val.toUpper() == QLatin1String("TRUE")) || (val == QLatin1String("1")))
             {
-                return TriStateBool::True;
+                return true;
             }
             if ((val.toUpper() == QLatin1String("FALSE")) || (val == QLatin1String("0")))
             {
-                return TriStateBool::False;
+                return false;
             }
 
             qDebug() << QObject::tr("Expected %1 in environment variable '%2', but got '%3'")
                 .arg(QLatin1String("true|false"), envVarName(), val);
-            return TriStateBool::Undefined;
+            return std::nullopt;
         }
 
         bool m_defaultValue;
@@ -374,14 +374,8 @@ QStringList QBtCommandLineParameters::paramList() const
     if (!savePath.isEmpty())
         result.append(QLatin1String("@savePath=") + savePath);
 
-    if (addPaused == TriStateBool::True)
-    {
-        result.append(QLatin1String("@addPaused=1"));
-    }
-    else if (addPaused == TriStateBool::False)
-    {
-        result.append(QLatin1String("@addPaused=0"));
-    }
+    if (addPaused.has_value())
+        result.append(*addPaused ? QLatin1String {"@addPaused=1"} : QLatin1String {"@addPaused=0"});
 
     if (skipChecking)
         result.append(QLatin1String("@skipChecking"));
@@ -395,14 +389,8 @@ QStringList QBtCommandLineParameters::paramList() const
     if (firstLastPiecePriority)
         result.append(QLatin1String("@firstLastPiecePriority"));
 
-    if (skipDialog == TriStateBool::True)
-    {
-        result.append(QLatin1String("@skipDialog=1"));
-    }
-    else if (skipDialog == TriStateBool::False)
-    {
-        result.append(QLatin1String("@skipDialog=0"));
-    }
+    if (skipDialog.has_value())
+        result.append(*skipDialog ? QLatin1String {"@skipDialog=1"} : QLatin1String {"@skipDialog=0"});
 
     result += torrents;
     return result;

src/app/cmdoptions.h

@@ -28,16 +28,14 @@
  * exception statement from your version.
  */
 
-#ifndef APP_OPTIONS_H
-#define APP_OPTIONS_H
+#pragma once
 
+#include <optional>
 #include <stdexcept>
 
 #include <QString>
 #include <QStringList>
 
-#include "base/tristatebool.h"
-
 class QProcessEnvironment;
 
 struct QBtCommandLineParameters
@@ -56,8 +54,8 @@ struct QBtCommandLineParameters
     bool shouldDaemonize;
 #endif
     int webUiPort;
-    TriStateBool addPaused;
-    TriStateBool skipDialog;
+    std::optional<bool> addPaused;
+    std::optional<bool> skipDialog;
     QStringList torrents;
     QString profileDir;
     QString configurationName;
@@ -81,5 +79,3 @@ private:
 
 QBtCommandLineParameters parseCommandLine(const QStringList &args);
 void displayUsage(const QString &prgName);
-
-#endif // APP_OPTIONS_H

src/app/filelogger.cpp

@@ -33,6 +33,7 @@
 #include <QDateTime>
 #include <QDir>
 #include <QTextStream>
+#include <QVector>
 
 #include "base/global.h"
 #include "base/logger.h"

src/app/filelogger.h

@@ -26,8 +26,7 @@
  * exception statement from your version.
  */
 
-#ifndef FILELOGGER_H
-#define FILELOGGER_H
+#pragma once
 
 #include <QFile>
 #include <QObject>
@@ -73,5 +72,3 @@ private:
     QFile m_logFile;
     QTimer m_flusher;
 };
-
-#endif // FILELOGGER_H

src/app/main.cpp

@@ -78,6 +78,7 @@ Q_IMPORT_PLUGIN(QICOPlugin)
 
 #include "base/preferences.h"
 #include "base/profile.h"
+#include "base/version.h"
 #include "application.h"
 #include "cmdoptions.h"
 #include "upgrade.h"
@@ -234,7 +235,7 @@ int main(int argc, char *argv[])
         // 3. https://bugreports.qt.io/browse/QTBUG-46015
 
         qputenv("QT_BEARER_POLL_TIMEOUT", QByteArray::number(-1));
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)) && !defined(DISABLE_GUI)
+#if !defined(DISABLE_GUI)
         // this is the default in Qt6
         app->setAttribute(Qt::AA_DisableWindowContextHelpButton);
 #endif
@@ -250,6 +251,9 @@ int main(int argc, char *argv[])
 
         // On OS X the standard is to not show icons in the menus
         app->setAttribute(Qt::AA_DontShowIconsInMenus);
+#else
+        if (!Preferences::instance()->iconsInMenusEnabled())
+            app->setAttribute(Qt::AA_DontShowIconsInMenus);
 #endif
 
         if (!firstTimeUser)
@@ -377,11 +381,7 @@ void showSplashScreen()
     const QString version = QBT_VERSION;
     painter.setPen(QPen(Qt::white));
     painter.setFont(QFont("Arial", 22, QFont::Black));
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
     painter.drawText(224 - painter.fontMetrics().horizontalAdvance(version), 270, version);
-#else
-    painter.drawText(224 - painter.fontMetrics().width(version), 270, version);
-#endif
     QSplashScreen *splash = new QSplashScreen(splashImg);
     splash->show();
     QTimer::singleShot(1500, splash, &QObject::deleteLater);

src/app/qtlocalpeer/qtlocalpeer.cpp

@@ -152,7 +152,7 @@ bool QtLocalPeer::isClient()
 #endif
     if (!res)
         qWarning("QtSingleCoreApplication: listen on local socket failed, %s", qPrintable(server->errorString()));
-    QObject::connect(server, SIGNAL(newConnection()), SLOT(receiveConnection()));
+    connect(server, &QLocalServer::newConnection, this, &QtLocalPeer::receiveConnection);
     return false;
 }
 

src/app/qtlocalpeer/qtlocalpeer.h

@@ -66,8 +66,7 @@
 ****************************************************************************
 */
 
-#ifndef QTLOCALPEER_H
-#define QTLOCALPEER_H
+#pragma once
 
 #include "qtlockedfile.h"
 
@@ -99,5 +98,3 @@ protected:
 private:
     static const char* ack;
 };
-
-#endif // QTLOCALPEER_H

src/app/qtlocalpeer/qtlockedfile.h

@@ -66,8 +66,7 @@
 ****************************************************************************
 */
 
-#ifndef QTLOCKEDFILE_H
-#define QTLOCKEDFILE_H
+#pragma once
 
 #include <QFile>
 
@@ -112,5 +111,3 @@ namespace QtLP_Private
         LockMode m_lock_mode;
     };
 }
-
-#endif

src/app/stacktrace_win.h

@@ -18,13 +18,13 @@
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
 
-#ifndef STACKTRACE_WIN_H
-#define STACKTRACE_WIN_H
+#pragma once
 
 #include <windows.h>
 #include <dbghelp.h>
 #include <stdio.h>
 
+#include <QCoreApplication>
 #include <QDir>
 #include <QTextStream>
 #ifdef __MINGW32__
@@ -257,7 +257,7 @@ const QString straceWin::getBacktrace()
 
     HANDLE hProcess = GetCurrentProcess();
     HANDLE hThread = GetCurrentThread();
-    SymInitialize(hProcess, NULL, TRUE);
+    SymInitializeW(hProcess, QCoreApplication::applicationDirPath().toStdWString().c_str(), TRUE);
 
     DWORD64 dwDisplacement;
 
@@ -355,5 +355,3 @@ const QString straceWin::getBacktrace()
 #pragma warning(pop)
 #pragma optimize("g", on)
 #endif
-
-#endif // STACKTRACE_WIN_H

src/app/stacktracedialog.cpp

@@ -32,6 +32,7 @@
 #include <QString>
 
 #include "base/utils/misc.h"
+#include "base/version.h"
 #include "ui_stacktracedialog.h"
 
 StacktraceDialog::StacktraceDialog(QWidget *parent)

src/app/stacktracedialog.h

@@ -27,8 +27,7 @@
  *
  */
 
-#ifndef STACKTRACEDIALOG_H
-#define STACKTRACEDIALOG_H
+#pragma once
 
 #include <QDialog>
 
@@ -51,5 +50,3 @@ public:
 private:
     Ui::StacktraceDialog *m_ui;
 };
-
-#endif // STACKTRACEDIALOG_H

src/app/upgrade.cpp

@@ -29,11 +29,15 @@
 #include "upgrade.h"
 
 #include <QFile>
+#include <QMetaEnum>
+#include <QVector>
 
+#include "base/bittorrent/torrentcontentlayout.h"
 #include "base/logger.h"
 #include "base/profile.h"
 #include "base/settingsstorage.h"
 #include "base/utils/fs.h"
+#include "base/utils/string.h"
 
 namespace
 {
@@ -42,8 +46,8 @@ namespace
         const auto migrate = [](const QString &oldKey, const QString &newKey, const QString &savePath)
         {
             SettingsStorage *settingsStorage {SettingsStorage::instance()};
-            const QByteArray oldData {settingsStorage->loadValue(oldKey).toByteArray()};
-            const QString newData {settingsStorage->loadValue(newKey).toString()};
+            const auto oldData {settingsStorage->loadValue<QByteArray>(oldKey)};
+            const auto newData {settingsStorage->loadValue<QString>(newKey)};
             const QString errorMsgFormat {QObject::tr("Migrate preferences failed: WebUI https, file: \"%1\", error: \"%2\"")};
 
             if (!newData.isEmpty() || oldData.isEmpty())
@@ -78,11 +82,32 @@ namespace
             , QLatin1String("Preferences/WebUI/HTTPS/KeyPath")
             , Utils::Fs::toNativePath(configPath + QLatin1String("WebUIPrivateKey.pem")));
     }
+
+    void upgradeTorrentContentLayout()
+    {
+        const QString oldKey {QLatin1String {"BitTorrent/Session/CreateTorrentSubfolder"}};
+        const QString newKey {QLatin1String {"BitTorrent/Session/TorrentContentLayout"}};
+
+        SettingsStorage *settingsStorage {SettingsStorage::instance()};
+        const auto oldData {settingsStorage->loadValue<QVariant>(oldKey)};
+        const auto newData {settingsStorage->loadValue<QString>(newKey)};
+
+        if (!newData.isEmpty() || !oldData.isValid())
+            return;
+
+        const bool createSubfolder = oldData.toBool();
+        const BitTorrent::TorrentContentLayout torrentContentLayout =
+                (createSubfolder ? BitTorrent::TorrentContentLayout::Original : BitTorrent::TorrentContentLayout::NoSubfolder);
+
+        settingsStorage->storeValue(newKey, Utils::String::fromEnum(torrentContentLayout));
+        settingsStorage->removeValue(oldKey);
+    }
 }
 
 bool upgrade(const bool /*ask*/)
 {
     exportWebUIHttpsFiles();
+    upgradeTorrentContentLayout();
     return true;
 }
 
@@ -103,7 +128,7 @@ void handleChangedDefaults(const DefaultPreferencesMode mode)
     SettingsStorage *settingsStorage {SettingsStorage::instance()};
     for (auto it = changedDefaults.cbegin(); it != changedDefaults.cend(); ++it)
     {
-        if (settingsStorage->loadValue(it->name).isNull())
+        if (settingsStorage->loadValue<QVariant>(it->name).isNull())
             settingsStorage->storeValue(it->name, (mode == DefaultPreferencesMode::Legacy ? it->legacy : it->current));
     }
 }