Bump to 4.5.2

Backport changes to v4.5.x branch

.appveyor.yml

@@ -37,6 +37,8 @@ install:
       RMDIR /S /Q "%CACHE_DIR%" & MKDIR "%CACHE_DIR%" &&
       appveyor DownloadFile "%QBT_LIB_URL%" -FileName "c:\qbt_lib.7z" && 7z x "c:\qbt_lib.7z" -o"%CACHE_DIR%" > nul &&
       COPY "c:\version_new" "%CACHE_DIR%\version")
+  # Qt stay compressed in cache
+  - 7z x "%CACHE_DIR%\qt5_64.7z" -o"c:\qbt" > nul
 
 before_build:
   # setup env
@@ -45,12 +47,11 @@ before_build:
   # setup project
   - COPY /Y "%CACHE_DIR%\conf.pri" "%REPO_DIR%"
   # workarounds
-  - MKDIR "c:\qbt"
   - MKLINK /J "c:\qbt\base" "%CACHE_DIR%\base"
 
 build_script:
   - cd "%REPO_DIR%"
-  # lupdate chokes when it parses headers from system includes, especially Boost
+  # lupdate chokes when it parses headers from system inludes, especially Boost
   # it also chokes with the sources from src/app/qtlocalpeer (formerly qtsingleapplication)
   # Workaround: temporarily rename them to run lupdate with the .pro file
   - RENAME conf.pri conf.pri.temp
@@ -68,11 +69,8 @@ after_build:
   - COPY src\release\qbittorrent.exe upload
   - COPY src\release\qbittorrent.pdb upload
   - COPY "%CACHE_DIR%\base\bin\libcrypto-1_1-x64.dll" upload
-  - COPY "%CACHE_DIR%\base\bin\libcrypto-1_1-x64.pdb" upload
   - COPY "%CACHE_DIR%\base\bin\libssl-1_1-x64.dll" upload
-  - COPY "%CACHE_DIR%\base\bin\libssl-1_1-x64.pdb" upload
-  - COPY "%CACHE_DIR%\base\bin\torrent-rasterbar.dll" upload
-  - COPY "%CACHE_DIR%\base\bin\torrent-rasterbar.pdb" upload
+  - COPY "%CACHE_DIR%\base\lib\torrent-rasterbar.dll" upload
   - COPY "%CACHE_DIR%\base\lib\zlib1.dll" upload
   - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Core.dll upload
   - COPY C:\Qt\5.15.2\msvc2019_64\bin\Qt5Gui.dll upload

.clang-tidy

@@ -1,82 +0,0 @@
-Checks: >
-  bugprone-*,
-  cert-*,
-  concurrency-*,
-  cppcoreguidelines-*,
-  misc-*,
-  modernize-*,
-  performance-*,
-  portability-*,
-  readability-*,
-  -# not applicable at all,
-  -bugprone-easily-swappable-parameters,
-  -bugprone-implicit-widening-of-multiplication-result,
-  -bugprone-macro-parentheses,
-  -cppcoreguidelines-avoid-c-arrays,
-  -cppcoreguidelines-avoid-magic-numbers,
-  -cppcoreguidelines-avoid-non-const-global-variables,
-  -cppcoreguidelines-macro-usage,
-  -cppcoreguidelines-non-private-member-variables-in-classes,
-  -cppcoreguidelines-owning-memory,
-  -cppcoreguidelines-pro-bounds-array-to-pointer-decay,
-  -cppcoreguidelines-pro-bounds-constant-array-index,
-  -cppcoreguidelines-pro-bounds-pointer-arithmetic,
-  -cppcoreguidelines-pro-type-const-cast,
-  -cppcoreguidelines-pro-type-reinterpret-cast,
-  -cppcoreguidelines-pro-type-union-access,
-  -cppcoreguidelines-pro-type-vararg,
-  -cppcoreguidelines-special-member-functions,
-  -cppcoreguidelines-virtual-class-destructor,
-  -misc-no-recursion,
-  -misc-non-private-member-variables-in-classes,
-  -misc-unused-parameters,
-  -modernize-avoid-c-arrays,
-  -modernize-pass-by-value,
-  -modernize-use-auto,
-  -modernize-use-nodiscard,
-  -modernize-use-trailing-return-type,
-  -modernize-use-using,
-  -readability-function-cognitive-complexity,
-  -readability-function-size,
-  -readability-identifier-length,
-  -readability-implicit-bool-conversion,
-  -readability-isolate-declaration,
-  -readability-magic-numbers,
-  -readability-named-parameter,
-  -readability-redundant-access-specifiers,
-  -readability-simplify-boolean-expr,
-  -readability-uppercase-literal-suffix,
-  -# only sometimes useful,
-  -bugprone-narrowing-conversions,
-  -cert-dcl58-cpp,
-  -cert-err33-c,
-  -cert-err58-cpp,
-  -clang-analyzer-core.CallAndMessage,
-  -clang-analyzer-cplusplus.NewDelete,
-  -clang-analyzer-cplusplus.NewDeleteLeaks,
-  -concurrency-mt-unsafe,
-  -cppcoreguidelines-init-variables,
-  -cppcoreguidelines-narrowing-conversions,
-  -cppcoreguidelines-prefer-member-initializer,
-  -cppcoreguidelines-pro-type-static-cast-downcast,
-  -misc-definitions-in-headers,
-  -modernize-concat-nested-namespaces,
-  -modernize-loop-convert,
-  -modernize-raw-string-literal,
-  -modernize-unary-static-assert,
-  -performance-no-automatic-move,
-  -readability-convert-member-functions-to-static,
-  -readability-else-after-return,
-  -readability-redundant-declaration,
-  -# obsoleted,
-  -cert-dcl21-cpp
-
-CheckOptions:
-  - { key: cppcoreguidelines-explicit-virtual-functions.IgnoreDestructors, value: true }
-  - { key: modernize-use-override.IgnoreDestructors, value: true }
-  - { key: performance-for-range-copy.AllowedTypes, value: "QJsonValue" }
-  - { key: performance-for-range-copy.WarnOnAllAutoCopies, value: true }
-  - { key: readability-braces-around-statements.ShortStatementLines, value: 3 }
-
-HeaderFilterRegex: ".+/src/.*\\.h"
-WarningsAsErrors: "*"

.gitattributes

@@ -5,5 +5,3 @@ core.eol=lf
 *.png binary
 *.qm binary
 *.zip binary
-
-test/testdata/crlf.txt text eol=crlf

.github/workflows/ci_macos.yaml

@@ -17,12 +17,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        libt_version: ["2.0.9", "1.2.19"]
+        libt_version: ["2.0.8", "1.2.18"]
         qbt_gui: ["GUI=ON", "GUI=OFF"]
-        qt_version: ["5.15.2", "6.5.0"]
+        qt_version: ["5.15.2", "6.4.0"]
         exclude:
-          - libt_version: "1.2.19"
-            qt_version: "6.5.0"
+          - libt_version: "1.2.18"
+            qt_version: "6.4.0"
 
     env:
       boost_path: "${{ github.workspace }}/../boost"
@@ -33,18 +33,14 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install dependencies
-        uses: Wandalen/wretry.action@v1
-        env:
-           HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
-           HOMEBREW_NO_INSTALL_CLEANUP: 1
-        with:
-          attempt_delay: 20000
-          attempt_limit: 6
-          command: |
-            brew update > /dev/null
-            brew install \
-              cmake ninja \
-              openssl@1.1 zlib
+        run: |
+          export \
+            HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 \
+            HOMEBREW_NO_INSTALL_CLEANUP=1
+          brew update > /dev/null
+          brew install \
+            cmake ninja \
+            openssl@1.1 zlib
 
       - name: Setup ccache
         uses: Chocobo1/setup-ccache-action@v1
@@ -56,7 +52,7 @@ jobs:
           curl \
             -L \
             -o "${{ runner.temp }}/boost.tar.bz2" \
-            "https://boostorg.jfrog.io/artifactory/main/release/1.82.0/source/boost_1_82_0.tar.bz2"
+            "https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.tar.bz2"
           tar -xf "${{ runner.temp }}/boost.tar.bz2" -C "${{ github.workspace }}/.."
           mv "${{ github.workspace }}/.."/boost_* "${{ env.boost_path }}"
 
@@ -78,7 +74,6 @@ jobs:
           cmake \
             -B build \
             -G "Ninja" \
-            -DBUILD_SHARED_LIBS=OFF \
             -DCMAKE_BUILD_TYPE=RelWithDebInfo \
             -DCMAKE_CXX_STANDARD=17 \
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
@@ -89,7 +84,7 @@ jobs:
           sudo cmake --install build
 
       - name: Build qBittorrent (Qt5)
-        if: startsWith(matrix.qt_version, 5)
+        if: ${{ startsWith(matrix.qt_version, 5) }}
         run: |
           CXXFLAGS="$CXXFLAGS -Werror -Wno-error=deprecated-declarations" \
           LDFLAGS="$LDFLAGS -gz" \
@@ -108,7 +103,7 @@ jobs:
           cmake --build build --target check
 
       - name: Build qBittorrent (Qt6)
-        if: startsWith(matrix.qt_version, 6)
+        if: ${{ startsWith(matrix.qt_version, 6) }}
         run: |
           CXXFLAGS="$CXXFLAGS -Wno-gnu-zero-variadic-macro-arguments -Werror -Wno-error=deprecated-declarations" \
           LDFLAGS="$LDFLAGS -gz" \
@@ -129,17 +124,7 @@ jobs:
 
       - name: Prepare build artifacts
         run: |
-          # create .dmg
-          appName="qbittorrent"
-          if [ "${{ matrix.qbt_gui }}" = "GUI=OFF" ]; then
-            appName="qbittorrent-nox"
-          fi
-          pushd build
-          macdeployqt "$appName.app" -dmg -no-strip
-          popd
-          # prepare upload folder
           mkdir upload
-          cp "build/$appName.dmg" upload
           mkdir upload/cmake
           cp build/compile_commands.json upload/cmake
           mkdir upload/cmake/libtorrent
@@ -148,5 +133,5 @@ jobs:
       - name: Upload build artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: qBittorrent-CI_macOS_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libt_version }}_Qt-${{ matrix.qt_version }}
+          name: build-info_macOS_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libt_version }}_Qt-${{ matrix.qt_version }}
           path: upload

.github/workflows/ci_ubuntu.yaml

@@ -4,7 +4,6 @@ on: [pull_request, push]
 
 permissions:
   actions: write
-  security-events: write
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -18,11 +17,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        libt_version: ["2.0.9", "1.2.19"]
+        libt_version: ["2.0.8", "1.2.18"]
         qbt_gui: ["GUI=ON", "GUI=OFF"]
         qt_version: ["5.15.2", "6.2.0"]
         exclude:
-          - libt_version: "1.2.19"
+          - libt_version: "1.2.18"
             qt_version: "6.2.0"
 
     steps:
@@ -60,23 +59,14 @@ jobs:
           cmake \
             -B build \
             -G "Ninja" \
-            -DBUILD_SHARED_LIBS=OFF \
             -DCMAKE_BUILD_TYPE=RelWithDebInfo \
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
             -Ddeprecated-functions=OFF
           cmake --build build
           sudo cmake --install build
 
-      # to avoid scanning 3rdparty codebases, initialize it just before building qbt
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
-        if: startsWith(matrix.libt_version, 2) && (matrix.qbt_gui == 'GUI=ON') && startsWith(matrix.qt_version, 6)
-        with:
-          config-file: ./.github/workflows/helper/codeql/cpp.yaml
-          languages: cpp
-
       - name: Build qBittorrent (Qt5)
-        if: startsWith(matrix.qt_version, 5)
+        if: ${{ startsWith(matrix.qt_version, 5) }}
         run: |
           CXXFLAGS="$CXXFLAGS -Werror -Wno-error=deprecated-declarations" \
           LDFLAGS="$LDFLAGS -gz" \
@@ -95,7 +85,7 @@ jobs:
           DESTDIR="qbittorrent" cmake --install build
 
       - name: Build qBittorrent (Qt6)
-        if: startsWith(matrix.qt_version, 6)
+        if: ${{ startsWith(matrix.qt_version, 6) }}
         run: |
           CXXFLAGS="$CXXFLAGS -Werror" \
           LDFLAGS="$LDFLAGS -gz" \
@@ -114,12 +104,6 @@ jobs:
           cmake --build build --target check
           DESTDIR="qbittorrent" cmake --install build
 
-      - name: Run CodeQL analysis
-        uses: github/codeql-action/analyze@v2
-        if: startsWith(matrix.libt_version, 2) && (matrix.qbt_gui == 'GUI=ON') && startsWith(matrix.qt_version, 6)
-        with:
-          category: ${{ github.base_ref || github.ref_name }}
-
       - name: Prepare build artifacts
         run: |
           mkdir upload

.github/workflows/ci_webui.yaml

@@ -2,8 +2,7 @@ name: CI - WebUI
 
 on: [pull_request, push]
 
-permissions:
-  security-events: write
+permissions: {}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
@@ -37,12 +36,3 @@ jobs:
         run: |
           npm run format
           git diff --exit-code
-
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
-        with:
-          config-file: ./.github/workflows/helper/codeql/js.yaml
-          languages: javascript
-
-      - name: Run CodeQL analysis
-        uses: github/codeql-action/analyze@v2

.github/workflows/ci_windows.yaml

@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        libt_version: ["2.0.9", "1.2.19"]
+        libt_version: ["2.0.8", "1.2.18"]
 
     env:
       boost_path: "${{ github.workspace }}/../boost"
@@ -70,7 +70,7 @@ jobs:
       - name: Install boost
         run: |
           aria2c `
-            "https://boostorg.jfrog.io/artifactory/main/release/1.82.0/source/boost_1_82_0.7z" `
+            "https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.7z" `
             -d "${{ runner.temp }}" `
             -o "boost.7z"
           7z x "${{ runner.temp }}/boost.7z" -o"${{ github.workspace }}/.."
@@ -79,7 +79,7 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: "6.5.0"
+          version: "6.4.0"
           archives: qtbase qtsvg qttools
 
       - name: Install libtorrent
@@ -90,35 +90,34 @@ jobs:
             --recurse-submodules `
             https://github.com/arvidn/libtorrent.git
           cd libtorrent
-          $env:CXXFLAGS+=" /guard:cf"
-          $env:LDFLAGS+=" /guard:cf"
           cmake `
             -B build `
             -G "Ninja" `
             -DCMAKE_BUILD_TYPE=RelWithDebInfo `
+            -DCMAKE_CXX_FLAGS=/guard:cf `
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON `
             -DCMAKE_INSTALL_PREFIX="${{ env.libtorrent_path }}" `
             -DCMAKE_TOOLCHAIN_FILE="${{ env.RUNVCPKG_VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" `
             -DBOOST_ROOT="${{ env.boost_path }}" `
             -DBUILD_SHARED_LIBS=OFF `
             -Ddeprecated-functions=OFF `
-            -Dstatic_runtime=OFF `
+            -Dstatic_runtime=ON `
             -DVCPKG_TARGET_TRIPLET=x64-windows-static-release
           cmake --build build
           cmake --install build
 
       - name: Build qBittorrent
         run: |
-          $env:CXXFLAGS+=" /WX"
           cmake `
             -B build `
             -G "Ninja" `
             -DCMAKE_BUILD_TYPE=RelWithDebInfo `
+            -DCMAKE_CXX_FLAGS="/WX" `
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON `
             -DCMAKE_TOOLCHAIN_FILE="${{ env.RUNVCPKG_VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" `
             -DBOOST_ROOT="${{ env.boost_path }}" `
             -DLibtorrentRasterbar_DIR="${{ env.libtorrent_path }}/lib/cmake/LibtorrentRasterbar" `
-            -DMSVC_RUNTIME_DYNAMIC=ON `
+            -DMSVC_RUNTIME_DYNAMIC=OFF `
             -DQT6=ON `
             -DTESTING=ON `
             -DVCPKG_TARGET_TRIPLET=x64-windows-static-release `
@@ -153,8 +152,6 @@ jobs:
           copy "${{ env.Qt6_DIR }}/plugins/sqldrivers/qsqlite.dll" upload/plugins/sqldrivers
           mkdir upload/plugins/styles
           copy "${{ env.Qt6_DIR }}/plugins/styles/qwindowsvistastyle.dll" upload/plugins/styles
-          mkdir upload/plugins/tls
-          copy "${{ env.Qt6_DIR }}/plugins/tls/qschannelbackend.dll" upload/plugins/tls
           # cmake additionals
           mkdir upload/cmake
           copy build/compile_commands.json upload/cmake

.github/workflows/coverity-scan.yml

@@ -26,13 +26,13 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
-          version: "6.5.0"
+          version: "6.4.0"
           archives: icu qtbase qtsvg qttools
 
       - name: Install libtorrent
         run: |
           git clone \
-            --branch "v2.0.9" \
+            --branch "v2.0.8" \
             --depth 1 \
             --recurse-submodules \
             https://github.com/arvidn/libtorrent.git
@@ -69,7 +69,7 @@ jobs:
 
       - name: Submit the result to Coverity Scan
         run: |
-          tar -caf qbittorrent.xz cov-int
+          tar caf qbittorrent.xz cov-int
           curl \
             --form token="${{ secrets.COVERITY_SCAN_TOKEN }}" \
             --form email=sledgehammer999@qbittorrent.org \

.github/workflows/helper/appimage/export_vars.sh

@@ -1,12 +1,10 @@
-#!/bin/sh
-
 # this file is called from AppRun so 'root_dir' will point to where AppRun is
 root_dir="$(readlink -f "$(dirname "$0")")"
 
 # Insert the default values because after the test we prepend our path
 # and it will create problems with DEs (eg KDE) that don't set the variable
 # and rely on the default paths
-if [ -z "${XDG_DATA_DIRS}" ]; then
+if [[ -z ${XDG_DATA_DIRS} ]]; then
     XDG_DATA_DIRS="/usr/local/share/:/usr/share/"
 fi
 

.github/workflows/helper/codeql/cpp.yaml

@@ -1,14 +0,0 @@
-name: "CodeQL config for C++"
-
-queries:
-  - uses: security-and-quality
-
-query-filters:
-  - exclude:
-      id: cpp/commented-out-code
-  - exclude:
-      id: cpp/include-non-header
-  - exclude:
-      id: cpp/loop-variable-changed
-  - exclude:
-      id: cpp/useless-expression

.github/workflows/helper/codeql/js.yaml

@@ -1,11 +0,0 @@
-name: "CodeQL config for Javascript"
-
-paths-ignore:
-  - "**/lib/*"
-
-queries:
-  - uses: security-and-quality
-
-query-filters:
-  - exclude:
-      id: js/superfluous-trailing-arguments

.github/workflows/helper/pre-commit/.typos.toml

@@ -1,18 +0,0 @@
-# https://github.com/crate-ci/typos/blob/master/docs/reference.md
-# https://github.com/crate-ci/typos/blob/master/docs/design.md#identifiers-and-words
-
-# try adding to `identifiers` list first, if doesn't work then `words` list
-
-[default.extend-identifiers]
-additionals = "additionals"
-caf = "caf"
-curren = "curren"
-FO = "FO"
-ket = "ket"
-Q_INVOKABLE = "Q_INVOKABLE"
-switchs = "switchs"
-ths = "ths"
-
-[default.extend-words]
-BA = "BA"
-helo = "helo"

.github/workflows/stale_bot.yaml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Mark and close stale PRs
-        uses: actions/stale@v8
+        uses: actions/stale@v5
         with:
           stale-pr-message: "This PR is stale because it has been 60 days with no activity. This PR will be automatically closed within 7 days if there is no further activity."
           close-pr-message: "This PR was closed because it has been stalled for some time with no activity."

.pre-commit-config.yaml

@@ -3,7 +3,7 @@ repos:
     hooks:
       - id: check-translation-tag
         name: Check newline characters in <translation> tag
-        entry: .github/workflows/helper/pre-commit/check_translation_tag.py
+        entry: .github/workflows/check_translation_tag.py
         language: script
         exclude: |
           (?x)^(
@@ -13,7 +13,7 @@ repos:
           - ts
 
   - repo: https://github.com/pre-commit/pre-commit-hooks.git
-    rev: v4.4.0
+    rev: v4.3.0
     hooks:
     - id: check-json
       name: Check JSON files
@@ -33,19 +33,17 @@ repos:
       args: ["--fix=lf"]
       exclude: |
         (?x)^(
-          src/webui/www/private/css/lib/.* |
-          src/webui/www/private/scripts/lib/.* |
-          test/testdata/crlf.txt
+          compile_commands.json |
+          src/webui/www/private/scripts/lib/.*
         )$
 
     - id: end-of-file-fixer
       name: Check trailing newlines
       exclude: |
         (?x)^(
+          compile_commands.json |
           configure |
-          src/webui/www/private/css/lib/.* |
-          src/webui/www/private/scripts/lib/.* |
-          test/testdata/crlf.txt
+          src/webui/www/private/scripts/lib/.*
         )$
       exclude_types:
         - svg
@@ -55,54 +53,7 @@ repos:
       name: Check trailing whitespaces
       exclude: |
         (?x)^(
-          src/webui/www/private/css/lib/.* |
           src/webui/www/private/scripts/lib/.*
         )$
       exclude_types:
         - ts
-
-  - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.5
-    hooks:
-    - id: codespell
-      name: Check spelling (codespell)
-      args: ["--ignore-words-list", "additionals,curren,fo,ket,superseeding,te,ths"]
-      exclude: |
-        (?x)^(
-          .*\.desktop |
-          .*\.qrc |
-          build-aux/.* |
-          Changelog |
-          dist/windows/installer-translations/.* |
-          m4/.* |
-          src/base/3rdparty/.* |
-          src/searchengine/nova3/socks.py |
-          src/webui/www/private/scripts/lib/.*
-        )$
-      exclude_types:
-        - ts
-
-  - repo: https://github.com/crate-ci/typos
-    rev: v1.15.5
-    hooks:
-    - id: typos
-      name: Check spelling (typos)
-      args: ["--config", ".github/workflows/helper/pre-commit/.typos.toml"]
-      exclude: |
-        (?x)^(
-          .*\.asc |
-          .*\.desktop |
-          .*\.qrc |
-          \.pre-commit-config\.yaml |
-          build-aux/.* |
-          Changelog |
-          configure.* |
-          dist/windows/installer-translations/.* |
-          m4/.* |
-          src/base/3rdparty/.* |
-          src/searchengine/nova3/socks.py |
-          src/webui/www/private/scripts/lib/.*
-        )$
-      exclude_types:
-        - svg
-        - ts

.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[o:sledgehammer999:p:qbittorrent:r:qbittorrent_v46x]
+[o:sledgehammer999:p:qbittorrent:r:qbittorrent_master]
 file_filter  = src/lang/qbittorrent_<lang>.ts
 source_file  = src/lang/qbittorrent_en.ts
 source_lang  = en
@@ -9,7 +9,7 @@ type         = QT
 minimum_perc = 23
 lang_map     = pt: pt_PT, zh: zh_CN
 
-[o:sledgehammer999:p:qbittorrent:r:qbittorrent_webui_v46x]
+[o:sledgehammer999:p:qbittorrent:r:qbittorrent_webui]
 file_filter  = src/webui/www/translations/webui_<lang>.ts
 source_file  = src/webui/www/translations/webui_en.ts
 source_lang  = en

AUTHORS

@@ -29,17 +29,13 @@ Code from other projects:
   copyright: Dan Haim <negativeiq@users.sourceforge.net>
   license: BSD
 
-* files src/webui/www/private/css/lib/vanillaSelectBox.css src/webui/www/private/scripts/lib/vanillaSelectBox.js
-  copyright: Philippe Meyer <pmg.meyer@gmail.com>
-  license: MIT
-
 Images Authors:
 * files: src/icons/qbittorrent-tray.svg
   copyright: Provided by HVS <hvs linuxmail org> (raster first proposal) and Atif Afzal(@atfzl github) <atif5801@gmail.com> (vectorized and modified)
   license: GPLv2+
 
 * files: src/qbittorrent_file.ico src/icons/fileicon.svg
-  copyright: 'unknown.svg' (LGPLv3+) from Oxygen Icon Theme was used as base which was slightly modified and 'qbittorrent-tray.svg' (GPLv2+) was overlaid above it.
+  copyright: 'uknown.svg' (LGPLv3+) from Oxygen Icon Theme was used as base which was slightly modified and 'qbittorrent-tray.svg' (GPLv2+) was overlayed above it.
   license: GPLv3+
 
 * files: src/icons/flags/*.svg

CMakeLists.txt

@@ -11,8 +11,8 @@ set(minBoostVersion 1.71)
 set(minQt5Version 5.15.2)
 set(minQt6Version 6.2)
 set(minOpenSSLVersion 1.1.1)
-set(minLibtorrent1Version 1.2.19)
-set(minLibtorrentVersion 2.0.9)
+set(minLibtorrent1Version 1.2.18)
+set(minLibtorrentVersion 2.0.8)
 set(minZlibVersion 1.2.11)
 
 include(CheckCXXSourceCompiles) # TODO: migrate to CheckSourceCompiles in CMake >= 3.19
@@ -30,21 +30,16 @@ feature_option(STACKTRACE "Enable stacktrace support" ON)
 feature_option(TESTING "Build internal testing suite" OFF)
 feature_option(VERBOSE_CONFIGURE "Show information about PACKAGES_FOUND and PACKAGES_NOT_FOUND in the configure output (only useful for debugging the CMake build scripts)" OFF)
 
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     feature_option_dependent(DBUS
-        "Enable support for notifications and power-management features via D-Bus"
+        "Enable support for notifications and power-management features via D-Bus on Linux"
         ON "GUI" OFF
     )
-endif()
-
-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     feature_option_dependent(SYSTEMD
         "Install systemd service file. Target directory is overridable with `SYSTEMD_SERVICES_INSTALL_DIR` variable"
         OFF "NOT GUI" OFF
     )
-endif()
-
-if (MSVC)
+elseif (MSVC)
     feature_option(MSVC_RUNTIME_DYNAMIC "Use MSVC dynamic runtime library (-MD) instead of static (-MT)" ON)
 endif()
 

CONTRIBUTING.md

@@ -200,7 +200,7 @@ Following these guidelines helps maintainers and the community understand your s
 [coding-guidelines-url]: https://github.com/qbittorrent/qBittorrent/blob/master/CODING_GUIDELINES.md
 [coding-guidelines-git-commit-message-url]: https://github.com/qbittorrent/qBittorrent/blob/master/CODING_GUIDELINES.md#10-git-commit-message
 [commit-message-fix-issue-example-url]: https://github.com/qbittorrent/qBittorrent/commit/c07cd440cd46345297debb47cb260f8688975f50
-[forum-url]: https://forum.qbittorrent.org/
+[forum-url]: http://forum.qbittorrent.org/
 [howto-report-bugs-url]: https://www.chiark.greenend.org.uk/~sgtatham/bugs.html
 [how-to-translate-url]: https://github.com/qbittorrent/qBittorrent/wiki/How-to-translate-qBittorrent
 [merging-vs-rebasing-url]: https://www.atlassian.com/git/tutorials/merging-vs-rebasing

Changelog

@@ -1,86 +1,47 @@
-Mon Nov 20th 2023 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.6.1
-    - FEATURE: Add option to enable previous Add new torrent dialog behavior (glassez)
-    - BUGFIX: Prevent crash due to race condition when adding magnet link (glassez)
-    - BUGFIX: Fix Enter key behavior when add new torrent (glassez)
-    - BUGFIX: Add missing main window icon (iomezk)
-    - BUGFIX: Update size of selected files when selection is changed (glassez)
-    - BUGFIX: Correctly handle changing save path of torrent w/o metadata (glassez)
-    - BUGFIX: Use appropriate icon for "moving" torrents in transfer list (xavier2k6)
-    - WEBUI: Drop WebUI default credentials (glassez)
-    - WEBUI: Add I2P settings to WebUI (thalieht)
-    - WEBUI: Fix duplicate scrollbar on Transfer List (AgentConDier)
-    - WEBUI: Fix .torrent file upload on iPadOS (Vitaly Cheptsov)
-    - WEBUI: Fix incorrect subcategory sorting (Bartu Özen)
-    - WEBUI: Correctly set save path in RSS rules (glassez)
-    - WEBUI: Allow to request torrents count via WebAPI (glassez)
-    - WEBUI: Improve performance of getting torrent numbers via WebAPI (Chocobo1)
-    - WEBUI: Improve free disk space checking for WebAPI (glassez)
-    - WINDOWS: NSIS: Fixed typo in the installer's hungarian translation (MartinKing01)
-    - LINUX: Fix invisible tray icon with Qt5 in Linux (thalieht)
-    - MACOS: Remove "Physical memory (RAM) usage limit" option (Chocobo1)
+Tue Feb 28 2023 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.5.2
+    - BUGFIX: Don't unexpectedly activate queued torrents when prefetching metadata for added magnets (glassez)
+    - BUGFIX: Update the cached torrent state once recheck is started (glassez)
+    - BUGFIX: Be more likely to allow the system to use power saving modes (glassez)
+    - WEBUI: Migrate away from unsafe function (Chocobo1)
+    - WEBUI: Blacklist bad ciphers for TLS in the server (sledgehammer999)
+    - WEBUI: Allow only TLS 1.2+ in the server (sledgehammer999)
+    - WEBUI: Allow to set read-only directory as torrent location (glassez)
+    - WEBUI: Reject requests that contain backslash in path (glassez)
+    - RSS: Prevent RSS folder from being moved into itself (glassez)
+    - WINDOWS: NSIS: Update Turkish, Uzbek translation (Burak Yavuz, shitcod3r)
 
-Sun Oct 22nd 2023 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.6.0
-    - FEATURE: Add (experimental) I2P support (glassez)
-    - FEATURE: Provide UI editor for the default theme (glassez)
-    - FEATURE: Various UI theming improvements (glassez)
-    - FEATURE: Implement torrent tags editing dialog (glassez)
-    - FEATURE: Revamp "Watched folder options" and "Automated RSS downloader" dialog (glassez)
-    - FEATURE: Allow to use another icons in dark mode (glassez)
-    - FEATURE: Allow to add new torrents to queue top (glassez)
-    - FEATURE: Allow to filter torrent list by save path (Tom)
-    - FEATURE: Expose 'socket send/receive buffer size' options (Chocobo1)
-    - FEATURE: Expose 'max torrent file size' setting (Chocobo1)
-    - FEATURE: Expose 'bdecode limits' settings (Chocobo1)
-    - FEATURE: Add options to adjust behavior of merging trackers to existing torrent (glassez)
-    - FEATURE: Add option to stop seeding when torrent has been inactive (Christopher)
-    - FEATURE: Allow to use proxy per subsystem (glassez)
-    - FEATURE: Expand the scope of "Proxy hostname lookup" option (glassez)
-    - FEATURE: Add shortcut for "Ban peer permanently" function (Luka Čelebić)
-    - FEATURE: Add option to auto hide zero status filters (glassez)
-    - FEATURE: Allow to disable confirmation of Pause/Resume All (glassez)
-    - FEATURE: Add alternative shortcut CTRL+E for CTRL+F (Luka Čelebić)
-    - FEATURE: Show filtered port numbers in logs (Hanabishi)
-    - FEATURE: Add button to copy library versions to clipboard (Chocobo1)
-    - BUGFIX: Ensure ongoing storage moving job will be completed when shutting down (Chocobo1)
-    - BUGFIX: Refactored many areas to call non UI blocking code (glassez)
-    - BUGFIX: Various improvements to the SQLite backend (glassez)
-    - BUGFIX: Improve startup window state handling (glassez)
-    - BUGFIX: Use tray icon from system theme only if option is set (glassez)
-    - BUGFIX: Inhibit system sleep while torrents are moving (Sentox6)
-    - BUGFIX: Use hostname instead of domain name in tracker filter list (tearfur)
-    - BUGFIX: Visually validate input path in torrent creator dialog (Chocobo1)
-    - BUGFIX: Disable symlink resolving in Torrent creator (Ignat Loskutov)
-    - BUGFIX: Change default value for `file pool size` and `stop tracker timeout` settings (stalkerok)
-    - BUGFIX: Log when duplicate torrents are being added (glassez)
-    - BUGFIX: Inhibit suspend instead of screen idle (axet)
-    - BUGFIX: Ensure file name is valid when exporting torrents (glassez)
-    - BUGFIX: Open "Save path" if torrent has no metadata (Xu Chao)
-    - BUGFIX: Prevent torrent starting unexpectedly edge case with magnet (Xu Chao)
-    - BUGFIX: Better ergonomics of the "Add new torrent" dialog (Xu Chao, glassez)
-    - WEBUI: Add log viewer (brvphoenix)
-    - WEBUI: WebAPI: Allow to specify session cookie name (glassez)
-    - WEBUI: Improve sync API performance (glassez)
-    - WEBUI: Add filelog settings (brvphoenix)
-    - WEBUI: Add multi-file renaming (loligans)
-    - WEBUI: Add "Add to top of queue" option (thalieht)
-    - WEBUI: Implement subcategories (Bartu Özen)
-    - WEBUI: Set "SameSite=None" if CSRF Protection is disabled (七海千秋)
-    - WEBUI: Show only hosts in tracker filter list (ttys3)
-    - WEBUI: Set Connection status and Speed limits tooltips (Raymond Ha)
-    - WEBUI: set Cross Origin Opener Policy to `same-origin` (Chocobo1)
-    - WEBUI: Fix response for HTTP HEAD method (Chocobo1)
-    - WEBUI: Preserve the network interfaces when connection is down (Fabricio Silva)
-    - WEBUI: Add "Add Tags" field for RSS rules (Matic Babnik)
-    - WEBUI: Fix missing error icon (Trim21)
-    - RSS: Add "Rename rule" button to RSS Downloader (BallsOfSpaghetti)
-    - RSS: Allow to edit RSS feed URL (glassez)
-    - RSS: Allow to assign priority to RSS download rule (glassez)
-    - SEARCH: Use python isolate mode (Chocobo1)
-    - SEARCH: Bump python version minimum requirement to 3.7.0 (Chocobo1)
-    - OTHER: Enable DBUS cmake option on FreeBSD (yuri@FreeBSD)
-    - OTHER: Numerous code improvements and refactorings (glassez, Chocobo1)
+Sun Feb 12 2023 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.5.1
+    - FEATURE: Re-allow to use icons from system theme (glassez)
+    - BUGFIX: Fix Speed limit icon size (Nowshed H. Imran)
+    - BUGFIX: Revise and fix some text colors (Chocobo1, Nowshed H. Imran)
+    - BUGFIX: Correctly load folder based UI theme (glassez)
+    - BUGFIX: Fix crash due to invalid encoding of tracker URLs (glassez)
+    - BUGFIX: Don't drop !qB extension when renaming incomplete file (glassez)
+    - BUGFIX: Correctly count the number of torrents in subcategories (glassez)
+    - BUGFIX: Use "additional trackers" when metadata retrieving (glassez)
+    - BUGFIX: Apply correct tab order to Category options dialog (glassez)
+    - BUGFIX: Add all torrents passed via the command line (glassez)
+    - BUGFIX: Fix startup performance on Qt5 (glassez)
+    - BUGFIX: Automatic move will now overwrite existing files (aka previous behavior) (glassez)
+    - BUGFIX: Some fixes for loading Chinese locales (sledgehammer999)
+    - BUGFIX: New Pause icon color for toolbar/menu (Nowshed H. Imran, sledgehammer999)
+    - BUGFIX: Adjust env variable for PDB discovery (sledgehammer999)
+    - WEBUI: Fix missing "queued" icon (thalieht)
+    - WEBUI: Return paths using platform-independent separator format (glassez)
+    - WEBUI: Change order of accepted types of file input (Jason Carr)
+    - WEBUI: Add missing icons (brvphoenix)
+    - WEBUI: Add "Resume data storage type" option (thalieht)
+    - WEBUI: Make rename file dialog resizable (Torsten Schwarz)
+    - WEBUI: Prevent incorrect line breaking (David Xuang)
+    - WEBUI: Improve hotkeys (Fidel Selva)
+    - WEBUI: Remove suggestions while searching for torrents (Midhun V Nadh)
+    - WEBUI: Expose "IS PRIVATE" flag (sotiris-bos)
+    - WEBUI: Return name/hash/infohash_v1/infohash_v2 torrent properties (qbittorrentfan)
+    - WINDOWS: Correctly detect drive letter in path (glassez)
+    - WINDOWS: NSIS: Update Swedish, Lithuanian translations (Jonatan, Deividas)
+    - LINUX: Fix tray icon issues (glassez)
 
-Unreleased - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.5.0
+Sat Nov 26 2022 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v4.5.0
     - FEATURE: Add `Auto resize columns` functionality (Chocobo1)
     - FEATURE: Allow to use Category paths in `Manual` mode (glassez)
     - FEATURE: Allow to disable Automatic mode when default "temp" path changed (glassez)

INSTALL

@@ -5,7 +5,7 @@ qBittorrent - A BitTorrent client in C++ / Qt
 
   - Boost >= 1.71
 
-  - libtorrent-rasterbar 1.2.19 - 1.2.x || 2.0.9 - 2.0.x
+  - libtorrent-rasterbar 1.2.18 - 1.2.x || 2.0.8 - 2.0.x
       * By Arvid Norberg, https://www.libtorrent.org/
       * Be careful: another library (the one used by rTorrent) uses a similar name
 
@@ -18,7 +18,7 @@ qBittorrent - A BitTorrent client in C++ / Qt
   - pkg-config *
       * Compile-time only on *nix systems
 
-  - Python >= 3.7.0
+  - Python >= 3.5.0
       * Optional, run-time only
       * Used by the bundled search engine
 
@@ -43,7 +43,7 @@ Please ensure you are building with an officially supported configuration when r
   will install and execute qBittorrent.
 
 DOCUMENTATION:
-Please note that there is a "Compilation" section at https://wiki.qbittorrent.org.
+Please note that there is a "Compilation" section at http://wiki.qbittorrent.org.
 
 ------------------------------------------
 sledgehammer999 <sledgehammer999@qbittorrent.org>

README.md

@@ -37,13 +37,13 @@ For more information please visit:
 https://www.qbittorrent.org
 
 or our wiki here:
-https://wiki.qbittorrent.org
+http://wiki.qbittorrent.org
 
 Use the forum for troubleshooting before reporting bugs:
-https://forum.qbittorrent.org
+http://forum.qbittorrent.org
 
 Please report any bug (or feature request) to:
-https://bugs.qbittorrent.org
+http://bugs.qbittorrent.org
 
 Official IRC channel:
 [#qbittorrent on irc.libera.chat](ircs://irc.libera.chat:6697/qbittorrent)

cmake/Modules/CommonConfig.cmake

@@ -101,10 +101,6 @@ if (MSVC)
     endif()
 endif()
 
-if (DBUS)
-    target_compile_definitions(qbt_common_cfg INTERFACE QBT_USES_DBUS)
-endif()
-
 if (LibtorrentRasterbar_VERSION VERSION_GREATER_EQUAL ${minLibtorrentVersion})
     target_compile_definitions(qbt_common_cfg INTERFACE QBT_USES_LIBTORRENT2)
 endif()

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for qbittorrent v4.6.1.
+# Generated by GNU Autoconf 2.71 for qbittorrent v4.5.2.
 #
 # Report bugs to <bugs.qbittorrent.org>.
 #
@@ -611,8 +611,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='qbittorrent'
 PACKAGE_TARNAME='qbittorrent'
-PACKAGE_VERSION='v4.6.1'
-PACKAGE_STRING='qbittorrent v4.6.1'
+PACKAGE_VERSION='v4.5.2'
+PACKAGE_STRING='qbittorrent v4.5.2'
 PACKAGE_BUGREPORT='bugs.qbittorrent.org'
 PACKAGE_URL='https://www.qbittorrent.org/'
 
@@ -1329,7 +1329,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures qbittorrent v4.6.1 to adapt to many kinds of systems.
+\`configure' configures qbittorrent v4.5.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1400,7 +1400,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of qbittorrent v4.6.1:";;
+     short | recursive ) echo "Configuration of qbittorrent v4.5.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1533,7 +1533,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-qbittorrent configure v4.6.1
+qbittorrent configure v4.5.2
 generated by GNU Autoconf 2.71
 
 Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1648,7 +1648,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by qbittorrent $as_me v4.6.1, which was
+It was created by qbittorrent $as_me v4.5.2, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   $ $0$ac_configure_args_raw
@@ -4779,7 +4779,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='qbittorrent'
- VERSION='v4.6.1'
+ VERSION='v4.5.2'
 
 
 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
@@ -5649,7 +5649,7 @@ fi
 then :
   as_fn_error $? "Could not find QtDBus" "$LINENO" 5
 else $as_nop
-  QBT_ADD_CONFIG="$QBT_ADD_CONFIG dbus" QBT_ADD_DEFINES="$QBT_ADD_DEFINES QBT_USES_DBUS"
+  QBT_ADD_CONFIG="$QBT_ADD_CONFIG dbus"
 
 fi ;; #(
   "xno") :
@@ -6024,19 +6024,19 @@ LDFLAGS="$BOOST_LDFLAGS $LDFLAGS"
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libtorrent-rasterbar >= 2.0.9" >&5
-printf %s "checking for libtorrent-rasterbar >= 2.0.9... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libtorrent-rasterbar >= 2.0.8" >&5
+printf %s "checking for libtorrent-rasterbar >= 2.0.8... " >&6; }
 
 if test -n "$libtorrent_CFLAGS"; then
     pkg_cv_libtorrent_CFLAGS="$libtorrent_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 2.0.9\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 2.0.9") 2>&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 2.0.8\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 2.0.8") 2>&5
   ac_status=$?
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_libtorrent_CFLAGS=`$PKG_CONFIG --cflags "libtorrent-rasterbar >= 2.0.9" 2>/dev/null`
+  pkg_cv_libtorrent_CFLAGS=`$PKG_CONFIG --cflags "libtorrent-rasterbar >= 2.0.8" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -6048,12 +6048,12 @@ if test -n "$libtorrent_LIBS"; then
     pkg_cv_libtorrent_LIBS="$libtorrent_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 2.0.9\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 2.0.9") 2>&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 2.0.8\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 2.0.8") 2>&5
   ac_status=$?
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_libtorrent_LIBS=`$PKG_CONFIG --libs "libtorrent-rasterbar >= 2.0.9" 2>/dev/null`
+  pkg_cv_libtorrent_LIBS=`$PKG_CONFIG --libs "libtorrent-rasterbar >= 2.0.8" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -6074,28 +6074,28 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtorrent-rasterbar >= 2.0.9" 2>&1`
+	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtorrent-rasterbar >= 2.0.8" 2>&1`
         else
-	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtorrent-rasterbar >= 2.0.9" 2>&1`
+	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtorrent-rasterbar >= 2.0.8" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$libtorrent_PKG_ERRORS" >&5
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libtorrent-rasterbar >= 1.2.19 libtorrent-rasterbar < 2" >&5
-printf %s "checking for libtorrent-rasterbar >= 1.2.19 libtorrent-rasterbar < 2... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libtorrent-rasterbar >= 1.2.18 libtorrent-rasterbar < 2" >&5
+printf %s "checking for libtorrent-rasterbar >= 1.2.18 libtorrent-rasterbar < 2... " >&6; }
 
 if test -n "$libtorrent_CFLAGS"; then
     pkg_cv_libtorrent_CFLAGS="$libtorrent_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.2.19 libtorrent-rasterbar < 2\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.2.19 libtorrent-rasterbar < 2") 2>&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.2.18 libtorrent-rasterbar < 2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.2.18 libtorrent-rasterbar < 2") 2>&5
   ac_status=$?
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_libtorrent_CFLAGS=`$PKG_CONFIG --cflags "libtorrent-rasterbar >= 1.2.19 libtorrent-rasterbar < 2" 2>/dev/null`
+  pkg_cv_libtorrent_CFLAGS=`$PKG_CONFIG --cflags "libtorrent-rasterbar >= 1.2.18 libtorrent-rasterbar < 2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -6107,12 +6107,12 @@ if test -n "$libtorrent_LIBS"; then
     pkg_cv_libtorrent_LIBS="$libtorrent_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.2.19 libtorrent-rasterbar < 2\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.2.19 libtorrent-rasterbar < 2") 2>&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.2.18 libtorrent-rasterbar < 2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.2.18 libtorrent-rasterbar < 2") 2>&5
   ac_status=$?
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_libtorrent_LIBS=`$PKG_CONFIG --libs "libtorrent-rasterbar >= 1.2.19 libtorrent-rasterbar < 2" 2>/dev/null`
+  pkg_cv_libtorrent_LIBS=`$PKG_CONFIG --libs "libtorrent-rasterbar >= 1.2.18 libtorrent-rasterbar < 2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -6133,14 +6133,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtorrent-rasterbar >= 1.2.19 libtorrent-rasterbar < 2" 2>&1`
+	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtorrent-rasterbar >= 1.2.18 libtorrent-rasterbar < 2" 2>&1`
         else
-	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtorrent-rasterbar >= 1.2.19 libtorrent-rasterbar < 2" 2>&1`
+	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtorrent-rasterbar >= 1.2.18 libtorrent-rasterbar < 2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$libtorrent_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (libtorrent-rasterbar >= 1.2.19 libtorrent-rasterbar < 2) were not met:
+	as_fn_error $? "Package requirements (libtorrent-rasterbar >= 1.2.18 libtorrent-rasterbar < 2) were not met:
 
 $libtorrent_PKG_ERRORS
 
@@ -6177,19 +6177,19 @@ elif test $pkg_failed = untried; then
 printf "%s\n" "no" >&6; }
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libtorrent-rasterbar >= 1.2.19 libtorrent-rasterbar < 2" >&5
-printf %s "checking for libtorrent-rasterbar >= 1.2.19 libtorrent-rasterbar < 2... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libtorrent-rasterbar >= 1.2.18 libtorrent-rasterbar < 2" >&5
+printf %s "checking for libtorrent-rasterbar >= 1.2.18 libtorrent-rasterbar < 2... " >&6; }
 
 if test -n "$libtorrent_CFLAGS"; then
     pkg_cv_libtorrent_CFLAGS="$libtorrent_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.2.19 libtorrent-rasterbar < 2\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.2.19 libtorrent-rasterbar < 2") 2>&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.2.18 libtorrent-rasterbar < 2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.2.18 libtorrent-rasterbar < 2") 2>&5
   ac_status=$?
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_libtorrent_CFLAGS=`$PKG_CONFIG --cflags "libtorrent-rasterbar >= 1.2.19 libtorrent-rasterbar < 2" 2>/dev/null`
+  pkg_cv_libtorrent_CFLAGS=`$PKG_CONFIG --cflags "libtorrent-rasterbar >= 1.2.18 libtorrent-rasterbar < 2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -6201,12 +6201,12 @@ if test -n "$libtorrent_LIBS"; then
     pkg_cv_libtorrent_LIBS="$libtorrent_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.2.19 libtorrent-rasterbar < 2\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.2.19 libtorrent-rasterbar < 2") 2>&5
+    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtorrent-rasterbar >= 1.2.18 libtorrent-rasterbar < 2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libtorrent-rasterbar >= 1.2.18 libtorrent-rasterbar < 2") 2>&5
   ac_status=$?
   printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_libtorrent_LIBS=`$PKG_CONFIG --libs "libtorrent-rasterbar >= 1.2.19 libtorrent-rasterbar < 2" 2>/dev/null`
+  pkg_cv_libtorrent_LIBS=`$PKG_CONFIG --libs "libtorrent-rasterbar >= 1.2.18 libtorrent-rasterbar < 2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -6227,14 +6227,14 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtorrent-rasterbar >= 1.2.19 libtorrent-rasterbar < 2" 2>&1`
+	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtorrent-rasterbar >= 1.2.18 libtorrent-rasterbar < 2" 2>&1`
         else
-	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtorrent-rasterbar >= 1.2.19 libtorrent-rasterbar < 2" 2>&1`
+	        libtorrent_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtorrent-rasterbar >= 1.2.18 libtorrent-rasterbar < 2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$libtorrent_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (libtorrent-rasterbar >= 1.2.19 libtorrent-rasterbar < 2) were not met:
+	as_fn_error $? "Package requirements (libtorrent-rasterbar >= 1.2.18 libtorrent-rasterbar < 2) were not met:
 
 $libtorrent_PKG_ERRORS
 
@@ -7237,7 +7237,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by qbittorrent $as_me v4.6.1, which was
+This file was extended by qbittorrent $as_me v4.5.2, which was
 generated by GNU Autoconf 2.71.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7297,7 +7297,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-qbittorrent config.status v4.6.1
+qbittorrent config.status v4.5.2
 configured by $0, generated by GNU Autoconf 2.71,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([qbittorrent], [v4.6.1], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
+AC_INIT([qbittorrent], [v4.5.2], [bugs.qbittorrent.org], [], [https://www.qbittorrent.org/])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 : ${CFLAGS=""}
@@ -165,7 +165,7 @@ AS_CASE(["x$enable_qt_dbus"],
                FIND_QTDBUS()
                AS_IF([test "x$HAVE_QTDBUS" = "xfalse"],
                      [AC_MSG_ERROR([Could not find QtDBus])],
-                     [QBT_ADD_CONFIG="$QBT_ADD_CONFIG dbus" QBT_ADD_DEFINES="$QBT_ADD_DEFINES QBT_USES_DBUS"]
+                     [QBT_ADD_CONFIG="$QBT_ADD_CONFIG dbus"]
                     )],
         ["xno"],
               [AC_MSG_RESULT([no])
@@ -188,10 +188,10 @@ m4_define([DETECT_BOOST_VERSION_PROGRAM],
                      [[(void) ((void)sizeof(char[1 - 2*!!((BOOST_VERSION) < ($1))]));]])])
 
 PKG_CHECK_MODULES(libtorrent,
-                  [libtorrent-rasterbar >= 2.0.9],
+                  [libtorrent-rasterbar >= 2.0.8],
                   [CXXFLAGS="$libtorrent_CFLAGS $CXXFLAGS" LIBS="$libtorrent_LIBS $LIBS" QBT_ADD_DEFINES="$QBT_ADD_DEFINES QBT_USES_LIBTORRENT2"],
                   [PKG_CHECK_MODULES(libtorrent,
-                                     [libtorrent-rasterbar >= 1.2.19 libtorrent-rasterbar < 2],
+                                     [libtorrent-rasterbar >= 1.2.18 libtorrent-rasterbar < 2],
                                      [CXXFLAGS="$libtorrent_CFLAGS $CXXFLAGS" LIBS="$libtorrent_LIBS $LIBS"])])
 
 PKG_CHECK_MODULES(openssl,

dist/mac/Info.plist

@@ -55,7 +55,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.6.1</string>
+	<string>4.5.2</string>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
@@ -67,7 +67,7 @@
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2006-2023 The qBittorrent project</string>
+	<string>Copyright © 2006-2022 The qBittorrent project</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>

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

@@ -68,12 +68,12 @@
   <update_contact>sledgehammer999@qbittorrent.org</update_contact>
   <developer_name>The qBittorrent Project</developer_name>
   <url type="homepage">https://www.qbittorrent.org/</url>
-  <url type="bugtracker">https://bugs.qbittorrent.org/</url>
+  <url type="bugtracker">http://bugs.qbittorrent.org/</url>
   <url type="donation">https://www.qbittorrent.org/donate</url>
-  <url type="help">https://forum.qbittorrent.org/</url>
+  <url type="help">http://forum.qbittorrent.org/</url>
   <url type="translate">https://github.com/qbittorrent/qBittorrent/wiki/How-to-translate-qBittorrent</url>
   <content_rating type="oars-1.1"/>
   <releases>
-    <release version="4.6.1" date="2023-11-20"/>
+    <release version="4.5.2" date="2023-02-28"/>
   </releases>
 </component>

dist/unix/org.qbittorrent.qBittorrent.desktop

@@ -14,216 +14,216 @@ Keywords=bittorrent;torrent;magnet;download;p2p;
 SingleMainWindow=true
 
 # Translations
-GenericName[af]=BitTorrent kliënt
 Comment[af]=Aflaai en deel lêers oor BitTorrent
+GenericName[af]=BitTorrent kliënt
 Name[af]=qBittorrent
-GenericName[ar]=عميل بت‎تورنت
 Comment[ar]=نزّل وشارك الملفات عبر كيوبت‎تورنت
+GenericName[ar]=عميل بت‎تورنت
 Name[ar]=qBittorrent
-GenericName[be]=Кліент BitTorrent
 Comment[be]=Спампоўванне і раздача файлаў праз пратакол BitTorrent
+GenericName[be]=Кліент BitTorrent
 Name[be]=qBittorrent
-GenericName[bg]=BitTorrent клиент
 Comment[bg]=Сваляне и споделяне на файлове чрез BitTorrent
+GenericName[bg]=BitTorrent клиент
 Name[bg]=qBittorrent
-GenericName[bn]=বিটটরেন্ট ক্লায়েন্ট
 Comment[bn]=বিটটরেন্টে  ফাইল ডাউনলোড এবং শেয়ার করুন
+GenericName[bn]=বিটটরেন্ট ক্লায়েন্ট
 Name[bn]=qBittorrent
-GenericName[zh]=BitTorrent 客户端
 Comment[zh]=通过 BitTorrent 下载和分享文件
+GenericName[zh]=BitTorrent 客户端
 Name[zh]=qBittorrent
-GenericName[bs]=BitTorrent klijent
 Comment[bs]=Preuzmi i dijeli datoteke preko BitTorrent-a
+GenericName[bs]=BitTorrent klijent
 Name[bs]=qBittorrent
-GenericName[ca]=Client de BitTorrent
 Comment[ca]=Baixeu i compartiu fitxers amb el BitTorrent
+GenericName[ca]=Client de BitTorrent
 Name[ca]=qBittorrent
-GenericName[cs]=BitTorrent klient
 Comment[cs]=Stahování a sdílení souborů přes síť BitTorrent
+GenericName[cs]=BitTorrent klient
 Name[cs]=qBittorrent
-GenericName[da]=BitTorrent-klient
 Comment[da]=Download og del filer over BitTorrent
+GenericName[da]=BitTorrent-klient
 Name[da]=qBittorrent
-GenericName[de]=BitTorrent Client
 Comment[de]=Über BitTorrent Dateien herunterladen und teilen
+GenericName[de]=BitTorrent Client
 Name[de]=qBittorrent
-GenericName[el]=BitTorrent client
 Comment[el]=Κάντε λήψη και μοιραστείτε αρχεία μέσω BitTorrent
+GenericName[el]=BitTorrent client
 Name[el]=qBittorrent
-GenericName[en_GB]=BitTorrent client
 Comment[en_GB]=Download and share files over BitTorrent
+GenericName[en_GB]=BitTorrent client
 Name[en_GB]=qBittorrent
-GenericName[es]=Cliente BitTorrent
 Comment[es]=Descargue y comparta archivos por BitTorrent
+GenericName[es]=Cliente BitTorrent
 Name[es]=qBittorrent
-GenericName[et]=BitTorrent klient
 Comment[et]=Lae alla ja jaga faile üle BitTorrenti
+GenericName[et]=BitTorrent klient
 Name[et]=qBittorrent
-GenericName[eu]=BitTorrent bezeroa
 Comment[eu]=Jeitsi eta elkarbanatu agiriak BitTorrent bidez
+GenericName[eu]=BitTorrent bezeroa
 Name[eu]=qBittorrent
-GenericName[fa]=بیت تورنت نسخه کلاینت
 Comment[fa]=دانلود و به اشتراک گذاری فایل های بوسیله  بیت تورنت
+GenericName[fa]=بیت تورنت نسخه کلاینت
 Name[fa]=qBittorrent
-GenericName[fi]=BitTorrent-asiakasohjelma
 Comment[fi]=Lataa ja jaa tiedostoja BitTorrentia käyttäen
+GenericName[fi]=BitTorrent-asiakasohjelma
 Name[fi]=qBittorrent
-GenericName[fr]=Client BitTorrent
 Comment[fr]=Télécharger et partager des fichiers sur BitTorrent
+GenericName[fr]=Client BitTorrent
 Name[fr]=qBittorrent
-GenericName[gl]=Cliente BitTorrent
 Comment[gl]=Descargar e compartir ficheiros co protocolo BitTorrent
+GenericName[gl]=Cliente BitTorrent
 Name[gl]=qBittorrent
-GenericName[gu]=બિટ્ટોરેંટ ક્લાયન્ટ
 Comment[gu]=બિટ્ટોરેંટ પર ફાઈલો ડાઉનલોડ અને શેર કરો
+GenericName[gu]=બિટ્ટોરેંટ ક્લાયન્ટ
 Name[gu]=qBittorrent
-GenericName[he]=לקוח ביטורנט
 Comment[he]=הורד ושתף קבצים על גבי ביטורנט
+GenericName[he]=לקוח ביטורנט
 Name[he]=qBittorrent
-GenericName[hr]=BitTorrent klijent
 Comment[hr]=Preuzmite i dijelite datoteke putem BitTorrenta
+GenericName[hr]=BitTorrent klijent
 Name[hr]=qBittorrent
-GenericName[hu]=BitTorrent kliens
 Comment[hu]=Fájlok letöltése és megosztása a BitTorrent hálózaton keresztül
+GenericName[hu]=BitTorrent kliens
 Name[hu]=qBittorrent
-GenericName[hy]=BitTorrent սպասառու
 Comment[hy]=Նիշքերի փոխանցում BitTorrent-ի միջոցով
+GenericName[hy]=BitTorrent սպասառու
 Name[hy]=qBittorrent
-GenericName[id]=Klien BitTorrent
 Comment[id]=Unduh dan berbagi berkas melalui BitTorrent
+GenericName[id]=Klien BitTorrent
 Name[id]=qBittorrent
-GenericName[is]=BitTorrent biðlarar
 Comment[is]=Sækja og deila skrám yfir BitTorrent
+GenericName[is]=BitTorrent biðlarar
 Name[is]=qBittorrent
-GenericName[it]=Client BitTorrent
 Comment[it]=Scarica e condividi file tramite BitTorrent
+GenericName[it]=Client BitTorrent
 Name[it]=qBittorrent
+Comment[ja]=BitTorrentでファイルをダウンロードおよび共有
 GenericName[ja]=BitTorrentクライアント
-Comment[ja]=BitTorrentでファイルのダウンロードと共有
 Name[ja]=qBittorrent
-GenericName[ka]=BitTorrent კლიენტი
 Comment[ka]=გადმოტვირთეთ და გააზიარეთ ფაილები BitTorrent-ის საშუალებით
+GenericName[ka]=BitTorrent კლიენტი
 Name[ka]=qBittorrent
-GenericName[ko]=BitTorrent 클라이언트
 Comment[ko]=BitTorrent를 통한 파일 내려받기 및 공유
+GenericName[ko]=BitTorrent 클라이언트
 Name[ko]=qBittorrent
-GenericName[lt]=BitTorrent klientas
 Comment[lt]=Atsisiųskite bei dalinkitės failais BitTorrent tinkle
+GenericName[lt]=BitTorrent klientas
 Name[lt]=qBittorrent
-GenericName[mk]=BitTorrent клиент
 Comment[mk]=Превземајте и споделувајте фајлови преку BitTorrent
+GenericName[mk]=BitTorrent клиент
 Name[mk]=qBittorrent
-GenericName[my]=တောရန့်စီမံခန့်ခွဲသည့်အရာ
 Comment[my]=တောရန့်ဖြင့်ဖိုင်များဒေါင်းလုဒ်ဆွဲရန်နှင့်မျှဝေရန်
+GenericName[my]=တောရန့်စီမံခန့်ခွဲသည့်အရာ
 Name[my]=qBittorrent
-GenericName[nb]=BitTorrent-klient
 Comment[nb]=Last ned og del filer over BitTorrent
+GenericName[nb]=BitTorrent-klient
 Name[nb]=qBittorrent
-GenericName[nl]=BitTorrent-client
 Comment[nl]=Bestanden downloaden en delen via BitTorrent
+GenericName[nl]=BitTorrent-client
 Name[nl]=qBittorrent
-GenericName[pl]=Klient BitTorrent
 Comment[pl]=Pobieraj i dziel się plikami przez BitTorrent
+GenericName[pl]=Klient BitTorrent
 Name[pl]=qBittorrent
-GenericName[pt]=Cliente BitTorrent
 Comment[pt]=Transferir e partilhar ficheiros por BitTorrent
+GenericName[pt]=Cliente BitTorrent
 Name[pt]=qBittorrent
-GenericName[pt_BR]=Cliente BitTorrent
 Comment[pt_BR]=Baixe e compartilhe arquivos pelo BitTorrent
+GenericName[pt_BR]=Cliente BitTorrent
 Name[pt_BR]=qBittorrent
-GenericName[ro]=Client BitTorrent
 Comment[ro]=Descărcați și partajați fișiere prin BitTorrent
+GenericName[ro]=Client BitTorrent
 Name[ro]=qBittorrent
-GenericName[ru]=Клиент сети БитТоррент
 Comment[ru]=Обмен файлами по сети БитТоррент
+GenericName[ru]=Клиент сети БитТоррент
 Name[ru]=qBittorrent
-GenericName[sk]=Klient siete BitTorrent
 Comment[sk]=Sťahovanie a zdieľanie súborov prostredníctvom siete BitTorrent
+GenericName[sk]=Klient siete BitTorrent
 Name[sk]=qBittorrent
-GenericName[sl]=BitTorrent odjemalec
 Comment[sl]=Prenesite in delite datoteke preko BitTorrenta
+GenericName[sl]=BitTorrent odjemalec
 Name[sl]=qBittorrent
 Name[sq]=qBittorrent
-GenericName[sr]=BitTorrent-клијент
 Comment[sr]=Преузимајте и делите фајлове преко BitTorrent протокола
+GenericName[sr]=BitTorrent-клијент
 Name[sr]=qBittorrent
-GenericName[sr@latin]=BitTorrent klijent
 Comment[sr@latin]=Preuzimanje i deljenje fajlova preko BitTorrent-a
+GenericName[sr@latin]=BitTorrent klijent
 Name[sr@latin]=qBittorrent
-GenericName[sv]=BitTorrent-klient
 Comment[sv]=Hämta och dela filer över BitTorrent
+GenericName[sv]=BitTorrent-klient
 Name[sv]=qBittorrent
-GenericName[ta]=BitTorrent வாடிக்கையாளர்
 Comment[ta]=BitTorrent வழியாக கோப்புகளை பதிவிறக்க மற்றும் பகிர
+GenericName[ta]=BitTorrent வாடிக்கையாளர்
 Name[ta]=qBittorrent
-GenericName[te]=క్యు  బిట్ టొరెంట్ క్లయింట్
 Comment[te]=క్యు  బిట్ టొరెంట్ తో ఫైల్స్ దిగుమతి చేసుకోండి , పంచుకోండి
+GenericName[te]=క్యు  బిట్ టొరెంట్ క్లయింట్
 Name[te]=qBittorrent
-GenericName[th]=โปรแกรมบิททอเร้นท์
 Comment[th]=ดาวน์โหลดและแชร์ไฟล์ผ่าน BitTorrent
+GenericName[th]=ไคลเอนต์ BitTorrent
 Name[th]=qBittorrent
-GenericName[tr]=BitTorrent istemcisi
 Comment[tr]=Dosyaları BitTorrent üzerinden indirin ve paylaşın
+GenericName[tr]=BitTorrent istemcisi
 Name[tr]=qBittorrent
-GenericName[ur]=قیو بٹ ٹورنٹ   کلائنٹ
 Comment[ur]=BitTorrent پر فائلوں کو ڈاؤن لوڈ کریں اور اشتراک کریں
+GenericName[ur]=قیو بٹ ٹورنٹ   کلائنٹ
 Name[ur]=qBittorrent
-GenericName[uk]=BitTorrent-клієнт
 Comment[uk]=Завантажуйте та поширюйте файли через BitTorrent
+GenericName[uk]=BitTorrent-клієнт
 Name[uk]=qBittorrent
-GenericName[vi]=Máy khách BitTorrent
 Comment[vi]=Tải xuống và chia sẻ tệp qua BitTorrent
+GenericName[vi]=Máy khách BitTorrent
 Name[vi]=qBittorrent
-GenericName[zh_HK]=BitTorrent用戶端
 Comment[zh_HK]=經由BitTorrent下載並分享檔案
+GenericName[zh_HK]=BitTorrent用戶端
 Name[zh_HK]=qBittorrent
-GenericName[zh_TW]=BitTorrent 用戶端
-Comment[zh_TW]=使用 BitTorrent 下載並分享檔案
+Comment[zh_TW]=經由 BitTorrent 下載並分享檔案
+GenericName[zh_TW]=BitTorrent 客戶端
 Name[zh_TW]=qBittorrent
-GenericName[eo]=BitTorrent-kliento
 Comment[eo]=Elŝutu kaj kunhavigu dosierojn per BitTorrent
+GenericName[eo]=BitTorrent-kliento
 Name[eo]=qBittorrent
-GenericName[kk]=BitTorrent клиенті
 Comment[kk]=BitTorrent арқылы файл жүктеу және бөлісу
+GenericName[kk]=BitTorrent клиенті
 Name[kk]=qBittorrent
-GenericName[en_AU]=BitTorrent client
 Comment[en_AU]=Download and share files over BitTorrent
+GenericName[en_AU]=BitTorrent client
 Name[en_AU]=qBittorrent
 Name[rm]=qBittorrent
 Name[jv]=qBittorrent
-GenericName[oc]=Client BitTorrent
 Comment[oc]=Telecargar e partejar de fichièrs amb BitTorrent
+GenericName[oc]=Client BitTorrent
 Name[oc]=qBittorrent
 Name[ug]=qBittorrent
 Name[yi]=qBittorrent
-GenericName[nqo]=ߓߌߙߏߙߍ߲ߕ ߕߣߐ߬ߓߐ߬ߟߊ
 Comment[nqo]=ߞߐߕߐ߯ߘߐ ߟߎ߬ ߟߊߖߌ߰ ߞߊ߬ ߓߊ߲߫ ߞߵߊ߬ߟߎ߬ ߘߐߕߟߊ߫ ߓߌߙߏߙߍ߲ߕ ߞߊ߲߬
+GenericName[nqo]=ߓߌߙߏߙߍ߲ߕ ߕߣߐ߬ߓߐ߬ߟߊ
 Name[nqo]=qBittorrent
-GenericName[uz@Latn]=BitTorrent mijozi
 Comment[uz@Latn]=BitTorrent orqali fayllarni yuklab olish va baham ko‘rish
+GenericName[uz@Latn]=BitTorrent mijozi
 Name[uz@Latn]=qBittorrent
-GenericName[ltg]=BitTorrent klients
 Comment[ltg]=Atsasyuteit i daleit failus ar BitTorrent
+GenericName[ltg]=BitTorrent klients
 Name[ltg]=qBittorrent
-GenericName[hi_IN]=Bittorrent साधन
 Comment[hi_IN]=BitTorrent द्वारा फाइल डाउनलोड व सहभाजन
+GenericName[hi_IN]=Bittorrent साधन
 Name[hi_IN]=qBittorrent
+Comment[az@latin]=Faylları BitTorrent vasitəsilə göndərin və paylaşın
 GenericName[az@latin]=BitTorrent client
-Comment[az@latin]=Faylları BitTorrent vasitəsilə endirin və paylaşın
 Name[az@latin]=qBittorrent
-GenericName[lv_LV]=BitTorrent klients
 Comment[lv_LV]=Lejupielādēt un koplietot failus ar BitTorrent
+GenericName[lv_LV]=BitTorrent klients
 Name[lv_LV]=qBittorrent
-GenericName[ms_MY]=Klien BitTorrent
 Comment[ms_MY]=Muat turun dan kongsi fail melalui BitTorrent
+GenericName[ms_MY]=Klien BitTorrent
 Name[ms_MY]=qBittorrent
-GenericName[mn_MN]=BitTorrent татагч
 Comment[mn_MN]=BitTorrent-оор файлуудаа тат, түгээ
+GenericName[mn_MN]=BitTorrent татагч
 Name[mn_MN]=qBittorrent
-GenericName[ne_NP]=BitTorrent क्लाइन्ट
 Comment[ne_NP]=फाइलहरू डाउनलोड गर्नुहोस् र BitTorrent मा साझा गर्नुहोस्
+GenericName[ne_NP]=BitTorrent क्लाइन्ट
 Name[ne_NP]=qBittorrent
-GenericName[pt_PT]=Cliente BitTorrent
 Comment[pt_PT]=Transferir e partilhar ficheiros por BitTorrent
+GenericName[pt_PT]=Cliente BitTorrent
 Name[pt_PT]=qBittorrent
 Name[si_LK]=qBittorrent

dist/windows/config.nsi

@@ -25,7 +25,7 @@
 ; 4.5.1.3 -> good
 ; 4.5.1.3.2 -> bad
 ; 4.5.0beta -> bad
-!define /ifndef QBT_VERSION "4.6.1"
+!define /ifndef QBT_VERSION "4.5.2"
 
 ; Option that controls the installer's window name
 ; If set, its value will be used like this:
@@ -112,7 +112,7 @@ OutFile "qbittorrent_${QBT_INSTALLER_FILENAME}_setup.exe"
 ;Installer Version Information
 VIAddVersionKey "ProductName" "qBittorrent"
 VIAddVersionKey "CompanyName" "The qBittorrent project"
-VIAddVersionKey "LegalCopyright" "Copyright ©2006-2023 The qBittorrent project"
+VIAddVersionKey "LegalCopyright" "Copyright ©2006-2022 The qBittorrent project"
 VIAddVersionKey "FileDescription" "qBittorrent - A Bittorrent Client"
 VIAddVersionKey "FileVersion" "${QBT_VERSION}"
 

dist/windows/gather_qt_translations.py

@@ -19,7 +19,7 @@ def main() -> int:
     tmp_translations: List[str] = glob.glob(f'{args.qt_translations_folder}/qt_??.qm')
     tmp_translations += glob.glob(f'{args.qt_translations_folder}/qt_??_??.qm')
     tmp_translations += glob.glob(f'{args.qt_translations_folder}/qtbase_??.qm')
-    tmp_translations += glob.glob(f'{args.qt_translations_folder}/qtbase_??_??.qm')
+    tmp_translations += glob.glob(f'{args.qt_translations_folder}qtbase_??_??.qm')
 
     filtered = filter(isNotStub, tmp_translations)
     for file in filtered:

dist/windows/installer-translations/afrikaans.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_AFRIKAANS} "qBittorrent (required)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_AFRIKAANS} "Create Desktop Shortcut"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_AFRIKAANS} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_AFRIKAANS} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/albanian.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_ALBANIAN} "qBittorrent (required)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_ALBANIAN} "Create Desktop Shortcut"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_ALBANIAN} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_ALBANIAN} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/arabic.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_ARABIC} "qBittorrent (مطلوب)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_ARABIC} "وضع اختصار على سطح المكتب"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_ARABIC} "وضع اختصار على سطح المكتب"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_ARABIC} "وضع اختصار في قائمة البداية"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/basque.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_BASQUE} "qBittorrent (beharrezkoa)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_BASQUE} "Sortu Mahaigaineko Lasterbidea"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_BASQUE} "Sortu Mahaigaineko Lasterbidea"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_BASQUE} "Sortu Hasierako Lasterbidea"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/belarusian.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_BELARUSIAN} "qBittorrent (required)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_BELARUSIAN} "Create Desktop Shortcut"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_BELARUSIAN} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_BELARUSIAN} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/bosnian.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_BOSNIAN} "qBittorrent (required)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_BOSNIAN} "Create Desktop Shortcut"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_BOSNIAN} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_BOSNIAN} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/breton.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_BRETON} "qBittorrent (required)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_BRETON} "Create Desktop Shortcut"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_BRETON} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_BRETON} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/bulgarian.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_BULGARIAN} "qBittorrent (required)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_BULGARIAN} "Create Desktop Shortcut"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_BULGARIAN} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_BULGARIAN} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/catalan.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_CATALAN} "qBittorrent (required)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_CATALAN} "Create Desktop Shortcut"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_CATALAN} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_CATALAN} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/croatian.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_CROATIAN} "qBittorrent (neophodno)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_CROATIAN} "Kreiraj prečac na radnoj površini"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_CROATIAN} "Kreiraj prečac na radnoj površini"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_CROATIAN} "Kreiraj prečac u početnom meniju"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/czech.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_CZECH} "qBittorrent (vyžadováno)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_CZECH} "Vytvořit zástupce na ploše"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+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"

dist/windows/installer-translations/danish.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_DANISH} "qBittorrent (påkrævet)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_DANISH} "Opret skrivebordsgenvej"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_DANISH} "Opret skrivebordsgenvej"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_DANISH} "Opret genvej i menuen Start"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/dutch.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_DUTCH} "qBittorrent (vereist)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_DUTCH} "Snelkoppeling aanmaken op bureaublad"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_DUTCH} "Snelkoppeling aanmaken op bureaublad"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_DUTCH} "Snelkoppeling aanmaken in startmenu"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/english.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/esperanto.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_ESPERANTO} "qBittorrent (required)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_ESPERANTO} "Create Desktop Shortcut"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_ESPERANTO} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_ESPERANTO} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/estonian.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_ESTONIAN} "qBittorrent (vajalik)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_ESTONIAN} "Loo Töölaua Otsetee"
+;LangString inst_dekstop ${LANG_ENGLISH} "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} "Loo Start Menüü Otsetee"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/farsi.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_FARSI} "qBittorrent (required)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_FARSI} "Create Desktop Shortcut"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_FARSI} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_FARSI} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/finnish.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_FINNISH} "qBittorrent (pakollinen)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_FINNISH} "Luo pikakuvake työpöydälle"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_FINNISH} "Luo pikakuvake työpöydälle"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_FINNISH} "Luo pikakuvake aloitusvalikkoon"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/french.nsi

@@ -2,12 +2,12 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_FRENCH} "qBittorrent (requis)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_FRENCH} "Créer un Raccourci sur le Bureau"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_FRENCH} "Créer un Raccourci sur le Bureau"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_FRENCH} "Créer un Raccourci dans le Menu Démarrer"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"
-LangString inst_startup ${LANG_FRENCH} "Démarrer qBittorrent au démarrage de Windows"
+LangString inst_startup ${LANG_FRENCH} "Démarrez qBittorrent au démarrage de Windows"
 ;LangString inst_torrent ${LANG_ENGLISH} "Open .torrent files with qBittorrent"
 LangString inst_torrent ${LANG_FRENCH} "Ouvrir les fichiers .torrent avec qBittorrent"
 ;LangString inst_magnet ${LANG_ENGLISH} "Open magnet links with qBittorrent"
@@ -15,7 +15,7 @@ LangString inst_magnet ${LANG_FRENCH} "Ouvrir les liens magnet avec qBittorrent"
 ;LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule"
 LangString inst_firewall ${LANG_FRENCH} "Ajouter une règle au Pare-Feu de 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_FRENCH} "Désactiver la limite de taille des chemins de Windows (limite MAX_PATH de 260 caractères, nécessite Windows 10 1607 ou plus)"
+LangString inst_pathlimit ${LANG_FRENCH} "Désactiver la limite de taille du chemin de Windows (limitation de MAX_PATH 260 caractères, nécessite Windows 10 1607 ou plus)"
 ;LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_FRENCH} "Ajout d'une règle au Pare-Feu de Windows"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
@@ -31,7 +31,7 @@ LangString inst_requires_64bit ${LANG_FRENCH} "Cet installateur ne fonctionne qu
 ;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_requires_win10 ${LANG_ENGLISH} "This installer requires at least Windows 10 1809."
-LangString inst_requires_win10 ${LANG_FRENCH}  "Cet installateur nécessite au moins Windows 10 1809."
+LangString inst_requires_win10 ${LANG_FRENCH}  "This installer requires at least Windows 10 1809."
 ;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
 LangString inst_uninstall_link_description ${LANG_FRENCH} "Désinstaller qBittorrent"
 
@@ -53,9 +53,9 @@ LangString remove_firewall ${LANG_FRENCH} "Supprimer la règle du Pare-Feu de Wi
 ;LangString remove_firewallinfo ${LANG_ENGLISH} "Removing Windows Firewall rule"
 LangString remove_firewallinfo ${LANG_FRENCH} "Suppression de la règle du Pare-Feu de Windows"
 ;LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data"
-LangString remove_cache ${LANG_FRENCH} "Supprimer les torrents et données en cache"
+LangString remove_cache ${LANG_FRENCH} "Supprimer les torrents et données cachées"
 ;LangString uninst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before uninstalling."
-LangString uninst_warning ${LANG_FRENCH} "qBittorrent est en cours d'exécution. Fermez l'application avant de la désinstaller."
+LangString uninst_warning ${LANG_FRENCH} "qBittorrent est en cours d'exécution. Veuillez fermer l'application avant la désinstallation."
 ;LangString uninst_tor_warn ${LANG_ENGLISH} "Not removing .torrent association. It is associated with:"
 LangString uninst_tor_warn ${LANG_FRENCH} "Ne peut pas supprimer l'association du .torrent. Elle est associée avec :"
 ;LangString uninst_mag_warn ${LANG_ENGLISH} "Not removing magnet association. It is associated with:"

dist/windows/installer-translations/galician.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_GALICIAN} "qBittorrent (necesario)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_GALICIAN} "Crear atallo no escritorio"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_GALICIAN} "Crear atallo no escritorio"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_GALICIAN} "Crear atallo no menú de inicio"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/german.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_GERMAN} "qBittorrent (erforderlich)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_GERMAN} "Verknüpfung auf dem Desktop erstellen"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+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"

dist/windows/installer-translations/greek.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_GREEK} "qBittorrent (απαιτείται)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_GREEK} "Δημιουργία συντόμευσης στην Επιφάνεια Εργασίας"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_GREEK} "Δημιουργία συντόμευσης στην Επιφάνεια Εργασίας"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_GREEK} "Δημιουργία συντόμευσης στο Μενού Έναρξης"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/hebrew.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_HEBREW} "qBittorrent (required)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_HEBREW} "Create Desktop Shortcut"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_HEBREW} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_HEBREW} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/hungarian.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_HUNGARIAN} "qBittorrent (kötelező)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_HUNGARIAN} "Asztali parancsikon létrehozása"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_HUNGARIAN} "Asztali parancsikon létrehozása"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_HUNGARIAN} "Start menüben parancsikon létrehozása"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"
@@ -19,7 +19,7 @@ LangString inst_pathlimit ${LANG_HUNGARIAN} "A Windows elérési útvonalak hoss
 ;LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_HUNGARIAN} "Windows Tűzfal szabály hozzáadása folyamatban"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
-LangString inst_warning ${LANG_HUNGARIAN} "A qBittorrent fut. Kérem zárja be az alkalmazást a telepítés előtt."
+LangString inst_warning ${LANG_HUNGARIAN} "A qBittorrent fut. Kérem zárjba be az alkalmazást a telepítés előtt."
 ;LangString inst_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
 LangString inst_uninstall_question ${LANG_HUNGARIAN} "A jelenlegi verzió el lesz távolítva. A felhasználói beállítások és a torrentek megmaradnak."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."

dist/windows/installer-translations/icelandic.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_ICELANDIC} "qBittorrent (required)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_ICELANDIC} "Create Desktop Shortcut"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_ICELANDIC} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_ICELANDIC} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/indonesian.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_INDONESIAN} "qBittorrent (wajib)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_INDONESIAN} "Buat Pintasan Desktop"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_INDONESIAN} "Buat Pintasan Desktop"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_INDONESIAN} "Buat Pintasan Menu"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/irish.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_IRISH} "qBittorrent (required)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_IRISH} "Create Desktop Shortcut"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_IRISH} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_IRISH} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/italian.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_ITALIAN} "qBittorrent (necessario)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_ITALIAN} "Crea collegamento sul Desktop"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_ITALIAN} "Crea collegamento sul Desktop"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_ITALIAN} "Aggiungi al menu Start"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/japanese.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_JAPANESE} "qBittorrent (必須)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_JAPANESE} "デスクトップにショートカットを作成"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_JAPANESE} "デスクトップにショートカットを作成"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_JAPANESE} "スタートメニューにショートカットを作成"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/korean.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_KOREAN} "qBittorrent (필요)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_KOREAN} "바탕화면 바로 가기 만들기"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_KOREAN} "바탕화면 바로 가기 만들기"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_KOREAN} "시작 메뉴 바로 가기 만들기"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/kurdish.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_KURDISH} "qBittorrent (required)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_KURDISH} "Create Desktop Shortcut"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_KURDISH} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_KURDISH} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/latvian.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_LATVIAN} "qBittorrent (nepieciešams)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_LATVIAN} "Izveidot saīsni uz darbvirsmas"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_LATVIAN} "Izveidot saīsni uz darbvirsmas"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_LATVIAN} "Izveidot izvēlnes Sākt saīsnes"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/lithuanian.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_LITHUANIAN} "qBittorrent (reikalingas)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_LITHUANIAN} "Sukurti nuorodą darbalaukyje"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_LITHUANIAN} "Sukurti nuorodą darbalaukyje"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_LITHUANIAN} "Sukurti Pradėti meniu nuorodą"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/luxembourgish.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_LUXEMBOURGISH} "qBittorrent (required)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_LUXEMBOURGISH} "Create Desktop Shortcut"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_LUXEMBOURGISH} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_LUXEMBOURGISH} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/macedonian.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_MACEDONIAN} "qBittorrent (required)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_MACEDONIAN} "Create Desktop Shortcut"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_MACEDONIAN} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_MACEDONIAN} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/malay.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_MALAY} "qBittorrent (required)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_MALAY} "Create Desktop Shortcut"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_MALAY} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_MALAY} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/mongolian.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_MONGOLIAN} "qBittorrent (required)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_MONGOLIAN} "Create Desktop Shortcut"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_MONGOLIAN} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_MONGOLIAN} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/norwegian.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_NORWEGIAN} "qBittorrent (kreves)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_NORWEGIAN} "Opprett Skrivebordssnarvei"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_NORWEGIAN} "Opprett Skrivebordssnarvei"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_NORWEGIAN} "Opprett Startmeny-snarvei"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/norwegiannynorsk.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_NORWEGIANNYNORSK} "qBittorrent (required)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_NORWEGIANNYNORSK} "Create Desktop Shortcut"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_NORWEGIANNYNORSK} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_NORWEGIANNYNORSK} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/polish.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_POLISH} "qBittorrent (wymagany)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_POLISH} "Utwórz skrót na pulpicie"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_POLISH} "Utwórz skrót na pulpicie"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_POLISH} "Utwórz skrót w menu Start"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/portuguese.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_PORTUGUESE} "qBittorrent (obrigatório)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_PORTUGUESE} "Criar atalho no ambiente de trabalho"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_PORTUGUESE} "Criar atalho no ambiente de trabalho"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_PORTUGUESE} "Criar atalho no menu Iniciar"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/portugueseBR.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_PORTUGUESEBR} "qBittorrent (requerido)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_PORTUGUESEBR} "Criar Atalho no Desktop"
+;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 Iniciar"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/romanian.nsi

@@ -1,62 +1,62 @@
 ;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
-LangString inst_qbt_req ${LANG_ROMANIAN} "qBittorrent (obligatoriu)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_ROMANIAN} "Creați o comandă rapidă pe Desktop"
+LangString inst_qbt_req ${LANG_ROMANIAN} "qBittorrent (required)"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_ROMANIAN} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
-LangString inst_startmenu ${LANG_ROMANIAN} "Creați o comandă rapidă în meniul Start"
+LangString inst_startmenu ${LANG_ROMANIAN} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"
-LangString inst_startup ${LANG_ROMANIAN} "Porniți qBittorrent la pornirea Windows"
+LangString inst_startup ${LANG_ROMANIAN} "Start qBittorrent on Windows start up"
 ;LangString inst_torrent ${LANG_ENGLISH} "Open .torrent files with qBittorrent"
-LangString inst_torrent ${LANG_ROMANIAN} "Deschideți fișierele .torrent cu qBittorrent"
+LangString inst_torrent ${LANG_ROMANIAN} "Open .torrent files with qBittorrent"
 ;LangString inst_magnet ${LANG_ENGLISH} "Open magnet links with qBittorrent"
-LangString inst_magnet ${LANG_ROMANIAN} "Deschideți linkurile magnet cu qBittorrent"
+LangString inst_magnet ${LANG_ROMANIAN} "Open magnet links with qBittorrent"
 ;LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule"
-LangString inst_firewall ${LANG_ROMANIAN} "Adăugați regula Windows Firewall"
+LangString inst_firewall ${LANG_ROMANIAN} "Add Windows Firewall rule"
 ;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_ROMANIAN} "Dezactivați limita de lungime a căii Windows (260 de caractere limită MAX_PATH, necesită Windows 10 1607 sau o versiune ulterioară)"
+LangString inst_pathlimit ${LANG_ROMANIAN} "Disable Windows path length limit (260 character MAX_PATH limitation, requires Windows 10 1607 or later)"
 ;LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule"
-LangString inst_firewallinfo ${LANG_ROMANIAN} "Adăugarea regulii Windows Firewall"
+LangString inst_firewallinfo ${LANG_ROMANIAN} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
-LangString inst_warning ${LANG_ROMANIAN} "qBittorrent rulează. Vă rugăm să închideți aplicația înainte de instalare."
+LangString inst_warning ${LANG_ROMANIAN} "qBittorrent is running. Please close the application before installing."
 ;LangString inst_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
-LangString inst_uninstall_question ${LANG_ROMANIAN} "Versiunea actuală va fi dezinstalată. Setările utilizatorului și torrentele vor rămâne intacte."
+LangString inst_uninstall_question ${LANG_ROMANIAN} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
-LangString inst_unist ${LANG_ROMANIAN} "Se dezinstalează versiunea anterioară."
+LangString inst_unist ${LANG_ROMANIAN} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
-LangString launch_qbt ${LANG_ROMANIAN} "Lansați qBittorrent."
+LangString launch_qbt ${LANG_ROMANIAN} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
-LangString inst_requires_64bit ${LANG_ROMANIAN} "Acest program de instalare funcționează doar pe versiunile Windows pe 64 de biți."
+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} "Această versiune de qBittorrent necesită cel puțin Windows 7."
+LangString inst_requires_win7 ${LANG_ROMANIAN} "This qBittorrent version requires at least Windows 7."
 ;LangString inst_requires_win10 ${LANG_ENGLISH} "This installer requires at least Windows 10 1809."
-LangString inst_requires_win10 ${LANG_ROMANIAN}  "Acest program de instalare necesită cel puțin Windows 10 1809."
+LangString inst_requires_win10 ${LANG_ROMANIAN}  "This installer requires at least Windows 10 1809."
 ;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
-LangString inst_uninstall_link_description ${LANG_ROMANIAN} "Dezinstalați qBittorrent"
+LangString inst_uninstall_link_description ${LANG_ROMANIAN} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings
 
 ;LangString remove_files ${LANG_ENGLISH} "Remove files"
-LangString remove_files ${LANG_ROMANIAN} "Eliminați fișierele"
+LangString remove_files ${LANG_ROMANIAN} "Remove files"
 ;LangString remove_shortcuts ${LANG_ENGLISH} "Remove shortcuts"
-LangString remove_shortcuts ${LANG_ROMANIAN} "Eliminați comenzile rapide"
+LangString remove_shortcuts ${LANG_ROMANIAN} "Remove shortcuts"
 ;LangString remove_associations ${LANG_ENGLISH} "Remove file associations"
-LangString remove_associations ${LANG_ROMANIAN} "Eliminați asocierile de fișiere"
+LangString remove_associations ${LANG_ROMANIAN} "Remove file associations"
 ;LangString remove_registry ${LANG_ENGLISH} "Remove registry keys"
-LangString remove_registry ${LANG_ROMANIAN} "Eliminați cheile din registru"
+LangString remove_registry ${LANG_ROMANIAN} "Remove registry keys"
 ;LangString remove_conf ${LANG_ENGLISH} "Remove configuration files"
-LangString remove_conf ${LANG_ROMANIAN} "Eliminați fișierele de configurare"
+LangString remove_conf ${LANG_ROMANIAN} "Remove configuration files"
 ;LangString remove_firewall ${LANG_ENGLISH} "Remove Windows Firewall rule"
-LangString remove_firewall ${LANG_ROMANIAN} "Eliminați regula Windows Firewall"
+LangString remove_firewall ${LANG_ROMANIAN} "Remove Windows Firewall rule"
 ;LangString remove_firewallinfo ${LANG_ENGLISH} "Removing Windows Firewall rule"
-LangString remove_firewallinfo ${LANG_ROMANIAN} "Se elimină regula Windows Firewall"
+LangString remove_firewallinfo ${LANG_ROMANIAN} "Removing Windows Firewall rule"
 ;LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data"
-LangString remove_cache ${LANG_ROMANIAN} "Eliminați torrentele și datele din cache"
+LangString remove_cache ${LANG_ROMANIAN} "Remove torrents and cached data"
 ;LangString uninst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before uninstalling."
-LangString uninst_warning ${LANG_ROMANIAN} "qBittorrent rulează. Vă rugăm să închideți aplicația înainte de a o dezinstala."
+LangString uninst_warning ${LANG_ROMANIAN} "qBittorrent is running. Please close the application before uninstalling."
 ;LangString uninst_tor_warn ${LANG_ENGLISH} "Not removing .torrent association. It is associated with:"
-LangString uninst_tor_warn ${LANG_ROMANIAN} "Nu se elimină asocierea .torrent. Este asociat cu:"
+LangString uninst_tor_warn ${LANG_ROMANIAN} "Not removing .torrent association. It is associated with:"
 ;LangString uninst_mag_warn ${LANG_ENGLISH} "Not removing magnet association. It is associated with:"
-LangString uninst_mag_warn ${LANG_ROMANIAN} "Nu se elimină asocierea magnet. Este asociat cu:"
+LangString uninst_mag_warn ${LANG_ROMANIAN} "Not removing magnet association. It is associated with:"

dist/windows/installer-translations/russian.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_RUSSIAN} "qBittorrent (обязательно)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_RUSSIAN} "Создать ярлык на рабочем столе"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_RUSSIAN} "Создать ярлык на рабочем столе"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_RUSSIAN} "Создать ярлык в меню Пуск"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/serbian.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_SERBIAN} "qBittorrent (required)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_SERBIAN} "Create Desktop Shortcut"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_SERBIAN} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_SERBIAN} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/serbianlatin.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_SERBIANLATIN} "qBittorrent (required)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_SERBIANLATIN} "Create Desktop Shortcut"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_SERBIANLATIN} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_SERBIANLATIN} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/simpchinese.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_SIMPCHINESE} "qBittorrent 主程序 (必要)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_SIMPCHINESE} "创建桌面快捷方式"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_SIMPCHINESE} "创建桌面快捷方式"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_SIMPCHINESE} "创建开始菜单快捷方式"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/slovak.nsi

@@ -1,62 +1,62 @@
 ;Installer strings
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
-LangString inst_qbt_req ${LANG_SLOVAK} "qBittorrent (požadované)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_SLOVAK} "Vytvoriť odkaz na pracovnej ploche"
+LangString inst_qbt_req ${LANG_SLOVAK} "qBittorrent (required)"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_SLOVAK} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
-LangString inst_startmenu ${LANG_SLOVAK} "Vytvoriť odkaz v štart menu"
+LangString inst_startmenu ${LANG_SLOVAK} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"
-LangString inst_startup ${LANG_SLOVAK} "Sputiť qBittorrent pri štarte Windowsu"
+LangString inst_startup ${LANG_SLOVAK} "Start qBittorrent on Windows start up"
 ;LangString inst_torrent ${LANG_ENGLISH} "Open .torrent files with qBittorrent"
-LangString inst_torrent ${LANG_SLOVAK} "Otvárať .torrent súbory v qBittorrent"
+LangString inst_torrent ${LANG_SLOVAK} "Open .torrent files with qBittorrent"
 ;LangString inst_magnet ${LANG_ENGLISH} "Open magnet links with qBittorrent"
-LangString inst_magnet ${LANG_SLOVAK} "Otvárať magnet odkazy v qBittorrent"
+LangString inst_magnet ${LANG_SLOVAK} "Open magnet links with qBittorrent"
 ;LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule"
-LangString inst_firewall ${LANG_SLOVAK} "Pridať pravidlo do Windows Firewall"
+LangString inst_firewall ${LANG_SLOVAK} "Add Windows Firewall rule"
 ;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_SLOVAK} "Vypnúť limit dĺžky cesty Windowsu (260 znaková MAX_PATH limitácia, vyžaduje Windows 10 1607 alebo novšie)"
+LangString inst_pathlimit ${LANG_SLOVAK} "Disable Windows path length limit (260 character MAX_PATH limitation, requires Windows 10 1607 or later)"
 ;LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule"
-LangString inst_firewallinfo ${LANG_SLOVAK} "Pridáva sa pravidlo do Windows Firewall"
+LangString inst_firewallinfo ${LANG_SLOVAK} "Adding Windows Firewall rule"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
-LangString inst_warning ${LANG_SLOVAK} "qBittorrent je spustený. Zatvorte prosím aplikáciu pred inštaláciou."
+LangString inst_warning ${LANG_SLOVAK} "qBittorrent is running. Please close the application before installing."
 ;LangString inst_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
-LangString inst_uninstall_question ${LANG_SLOVAK} "Aktuálna verzia bude odinštalovaná. Užívateľské nastavenia a torrenty sa zachovajú."
+LangString inst_uninstall_question ${LANG_SLOVAK} "Current version will be uninstalled. User settings and torrents will remain intact."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
-LangString inst_unist ${LANG_SLOVAK} "Odinštalácia predchádzajúcej verzie."
+LangString inst_unist ${LANG_SLOVAK} "Uninstalling previous version."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
-LangString launch_qbt ${LANG_SLOVAK} "Spustiť qBittorrent."
+LangString launch_qbt ${LANG_SLOVAK} "Launch qBittorrent."
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
-LangString inst_requires_64bit ${LANG_SLOVAK} "Táto inštalácia funguje iba na 64-bitových verziách Windowsu."
+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} "Táto qBittorrent verzia vyžaduje aspoň Windows 7."
+LangString inst_requires_win7 ${LANG_SLOVAK} "This qBittorrent version requires at least Windows 7."
 ;LangString inst_requires_win10 ${LANG_ENGLISH} "This installer requires at least Windows 10 1809."
-LangString inst_requires_win10 ${LANG_SLOVAK}  "Tento inštalátor vyžaduje aspoň Windows 10 1809."
+LangString inst_requires_win10 ${LANG_SLOVAK}  "This installer requires at least Windows 10 1809."
 ;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
-LangString inst_uninstall_link_description ${LANG_SLOVAK} "Odinštalovať qBittorrent"
+LangString inst_uninstall_link_description ${LANG_SLOVAK} "Uninstall qBittorrent"
 
 ;------------------------------------
 ;Uninstaller strings
 
 ;LangString remove_files ${LANG_ENGLISH} "Remove files"
-LangString remove_files ${LANG_SLOVAK} "Odstrániť súbory"
+LangString remove_files ${LANG_SLOVAK} "Remove files"
 ;LangString remove_shortcuts ${LANG_ENGLISH} "Remove shortcuts"
-LangString remove_shortcuts ${LANG_SLOVAK} "Odstrániť odkazy"
+LangString remove_shortcuts ${LANG_SLOVAK} "Remove shortcuts"
 ;LangString remove_associations ${LANG_ENGLISH} "Remove file associations"
-LangString remove_associations ${LANG_SLOVAK} "Odstrániť asociácie súborov"
+LangString remove_associations ${LANG_SLOVAK} "Remove file associations"
 ;LangString remove_registry ${LANG_ENGLISH} "Remove registry keys"
-LangString remove_registry ${LANG_SLOVAK} "Odstrániť kľúče registrov"
+LangString remove_registry ${LANG_SLOVAK} "Remove registry keys"
 ;LangString remove_conf ${LANG_ENGLISH} "Remove configuration files"
-LangString remove_conf ${LANG_SLOVAK} "Odstrániť konfiguračné súbory"
+LangString remove_conf ${LANG_SLOVAK} "Remove configuration files"
 ;LangString remove_firewall ${LANG_ENGLISH} "Remove Windows Firewall rule"
-LangString remove_firewall ${LANG_SLOVAK} "Odstrániť pravidlo z Windows Firewall"
+LangString remove_firewall ${LANG_SLOVAK} "Remove Windows Firewall rule"
 ;LangString remove_firewallinfo ${LANG_ENGLISH} "Removing Windows Firewall rule"
-LangString remove_firewallinfo ${LANG_SLOVAK} "Odstraňuje sa pravidlo z Windows Firewall"
+LangString remove_firewallinfo ${LANG_SLOVAK} "Removing Windows Firewall rule"
 ;LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data"
-LangString remove_cache ${LANG_SLOVAK} "Odstrániť torrenty a dáta z vyrovnávacej pamäti"
+LangString remove_cache ${LANG_SLOVAK} "Remove torrents and cached data"
 ;LangString uninst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before uninstalling."
-LangString uninst_warning ${LANG_SLOVAK} "qBittorrent je spustený. Zatvorte prosím aplikáciu pred odinštaláciou."
+LangString uninst_warning ${LANG_SLOVAK} "qBittorrent is running. Please close the application before uninstalling."
 ;LangString uninst_tor_warn ${LANG_ENGLISH} "Not removing .torrent association. It is associated with:"
-LangString uninst_tor_warn ${LANG_SLOVAK} "Neodstraňuje sa .torrent asociácia. Asociované s:"
+LangString uninst_tor_warn ${LANG_SLOVAK} "Not removing .torrent association. It is associated with:"
 ;LangString uninst_mag_warn ${LANG_ENGLISH} "Not removing magnet association. It is associated with:"
-LangString uninst_mag_warn ${LANG_SLOVAK} "Neodstraňuje sa magnet asociácia. Asociované s:"
+LangString uninst_mag_warn ${LANG_SLOVAK} "Not removing magnet association. It is associated with:"

dist/windows/installer-translations/slovenian.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_SLOVENIAN} "qBittorrent (required)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_SLOVENIAN} "Create Desktop Shortcut"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_SLOVENIAN} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_SLOVENIAN} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/spanish.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_SPANISH} "qBittorrent (necesario)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_SPANISH} "Crear un acceso directo en el escritorio"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_SPANISH} "Crear un acceso directo en el escritorio"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_SPANISH} "Crear un acceso directo en el menú inicio"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/spanishinternational.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_SPANISHINTERNATIONAL} "qBittorrent (necesario)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_SPANISHINTERNATIONAL} "Crear un acceso directo en el escritorio"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_SPANISHINTERNATIONAL} "Crear un acceso directo en el escritorio"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_SPANISHINTERNATIONAL} "Crear un acceso directo en el menú inicio"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/swedish.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_SWEDISH} "qBittorrent (krävs)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_SWEDISH} "Skapa skrivbordsgenväg"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_SWEDISH} "Skapa skrivbordsgenväg"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_SWEDISH} "Skapa startmenygenväg"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/thai.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_THAI} "qBittorrent (required)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_THAI} "Create Desktop Shortcut"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_THAI} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_THAI} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/tradchinese.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_TRADCHINESE} "qBittorrent (必要)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_TRADCHINESE} "建立桌面捷徑"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_TRADCHINESE} "建立桌面捷徑"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_TRADCHINESE} "建立開始功能表捷徑"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/turkish.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_TURKISH} "qBittorrent (zorunlu)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_TURKISH} "Masaüstü Kısayolu oluştur"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_TURKISH} "Masaüstü Kısayolu oluştur"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_TURKISH} "Başlangıç Menüsü Kısayolu oluştur"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"
@@ -15,17 +15,17 @@ LangString inst_magnet ${LANG_TURKISH} "Magnet bağlantılarını qBittorrent il
 ;LangString inst_firewall ${LANG_ENGLISH} "Add Windows Firewall rule"
 LangString inst_firewall ${LANG_TURKISH} "Windows Güvenlik Duvarı kuralı ekle"
 ;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_TURKISH} "Windows yol uzunluğu sınırını etkisizleştir (260 karakterlik MAX_PATH sınırlaması, Windows 10 1607 veya sonrasını gerektirir)"
+LangString inst_pathlimit ${LANG_TURKISH} "Windows yol uzunluğu sınırını etkisizleştir (260 karakter MAX_PATH sınırlaması, Windows 10 1607 veya sonrasını gerektirir)"
 ;LangString inst_firewallinfo ${LANG_ENGLISH} "Adding Windows Firewall rule"
 LangString inst_firewallinfo ${LANG_TURKISH} "Windows Güvenlik Duvarı kuralı ekleniyor"
 ;LangString inst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before installing."
 LangString inst_warning ${LANG_TURKISH} "qBittorrent çalışıyor. Lütfen yüklemeden önce uygulamayı kapatın."
 ;LangString inst_uninstall_question ${LANG_ENGLISH} "Current version will be uninstalled. User settings and torrents will remain intact."
-LangString inst_uninstall_question ${LANG_TURKISH} "Şu anki sürüm kaldırılacaktır. Kullanıcı ayarları ve torrent'ler bozulmadan kalacaktır."
+LangString inst_uninstall_question ${LANG_TURKISH} "Önceki bir kurulum algılandı. Kullanıcı ayarları silinmeden kaldırılacaktır."
 ;LangString inst_unist ${LANG_ENGLISH} "Uninstalling previous version."
 LangString inst_unist ${LANG_TURKISH} "Önceki sürüm kaldırılıyor."
 ;LangString launch_qbt ${LANG_ENGLISH} "Launch qBittorrent."
-LangString launch_qbt ${LANG_TURKISH} "qBittorrent'i başlat."
+LangString launch_qbt ${LANG_TURKISH} "qBittorrent'i başlat"
 ;LangString inst_requires_64bit ${LANG_ENGLISH} "This installer works only in 64-bit Windows versions."
 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."
@@ -53,10 +53,10 @@ LangString remove_firewall ${LANG_TURKISH} "Windows Güvenlik Duvarı kuralını
 ;LangString remove_firewallinfo ${LANG_ENGLISH} "Removing Windows Firewall rule"
 LangString remove_firewallinfo ${LANG_TURKISH} "Windows Güvenlik Duvarı kuralı kaldırılıyor"
 ;LangString remove_cache ${LANG_ENGLISH} "Remove torrents and cached data"
-LangString remove_cache ${LANG_TURKISH} "Torrent'leri ve önbelleklenen verileri kaldır"
+LangString remove_cache ${LANG_TURKISH} "Torrentleri ve önbelleklenen verileri kaldır"
 ;LangString uninst_warning ${LANG_ENGLISH} "qBittorrent is running. Please close the application before uninstalling."
 LangString uninst_warning ${LANG_TURKISH} "qBittorrent çalışıyor. Lütfen kaldırmadan önce uygulamayı kapatın."
 ;LangString uninst_tor_warn ${LANG_ENGLISH} "Not removing .torrent association. It is associated with:"
-LangString uninst_tor_warn ${LANG_TURKISH} ".torrent ilişkilendirmesi kaldırılamıyor. Şununla ilişkilendirildi:"
+LangString uninst_tor_warn ${LANG_TURKISH} ".torrent ilişkilendirmesi kaldırılmıyor. Şununla ilişkilendirildi:"
 ;LangString uninst_mag_warn ${LANG_ENGLISH} "Not removing magnet association. It is associated with:"
-LangString uninst_mag_warn ${LANG_TURKISH} "Magnet ilişkilendirmesi kaldırılamıyor. Şununla ilişkilendirildi:"
+LangString uninst_mag_warn ${LANG_TURKISH} "Magnet ilişkilendirmesi kaldırılmıyor. Şununla ilişkilendirildi:"

dist/windows/installer-translations/ukrainian.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_UKRAINIAN} "qBittorrent (необхідний)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_UKRAINIAN} "Створити ярлик на стільниці"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_UKRAINIAN} "Створити ярлик на стільниці"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_UKRAINIAN} "Створити ярлик в меню Пуск"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/uzbek.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_UZBEK} "qBittorrent (talab qilinadi)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_UZBEK} "Ish Stolida Yorliq Yaratilsin"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_UZBEK} "Ish Stolida Yorliq Yaratilsin"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_UZBEK} "Boshlash Menyusida Yorliq Yaratilsin"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer-translations/welsh.nsi

@@ -2,8 +2,8 @@
 
 ;LangString inst_qbt_req ${LANG_ENGLISH} "qBittorrent (required)"
 LangString inst_qbt_req ${LANG_WELSH} "qBittorrent (required)"
-;LangString inst_desktop ${LANG_ENGLISH} "Create Desktop Shortcut"
-LangString inst_desktop ${LANG_WELSH} "Create Desktop Shortcut"
+;LangString inst_dekstop ${LANG_ENGLISH} "Create Desktop Shortcut"
+LangString inst_dekstop ${LANG_WELSH} "Create Desktop Shortcut"
 ;LangString inst_startmenu ${LANG_ENGLISH} "Create Start Menu Shortcut"
 LangString inst_startmenu ${LANG_WELSH} "Create Start Menu Shortcut"
 ;LangString inst_startup ${LANG_ENGLISH} "Start qBittorrent on Windows start up"

dist/windows/installer.nsi

@@ -65,7 +65,7 @@ Section $(inst_qbt_req) ;"qBittorrent (required)"
 SectionEnd
 
 ; Optional section (can be disabled by the user)
-Section /o $(inst_desktop) ;"Create Desktop Shortcut"
+Section /o $(inst_dekstop) ;"Create Desktop Shortcut"
 
   CreateShortCut "$DESKTOP\qBittorrent.lnk" "$INSTDIR\qbittorrent.exe"
 
@@ -109,7 +109,7 @@ Section $(inst_torrent) ;"Open .torrent files with qBittorrent"
 
   !insertmacro UAC_AsUser_Call Function inst_torrent_user ${UAC_SYNCREGISTERS}|${UAC_SYNCOUTDIR}|${UAC_SYNCINSTDIR}
 
-  System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, p 0, p 0)'
+  System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
 
 SectionEnd
 
@@ -142,7 +142,7 @@ Section $(inst_magnet) ;"Open magnet links with qBittorrent"
 
   !insertmacro UAC_AsUser_Call Function inst_magnet_user ${UAC_SYNCREGISTERS}|${UAC_SYNCOUTDIR}|${UAC_SYNCINSTDIR}
 
-  System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, p 0, p 0)'
+  System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
 
 SectionEnd
 

dist/windows/uninstaller.nsi

@@ -26,17 +26,17 @@ Section "un.$(remove_associations)" ;"un.Remove file associations"
   DetailPrint "$(uninst_tor_warn) $0"
   DeleteRegValue HKLM "Software\Classes\.torrent" ""
   DeleteRegKey /ifempty HKLM "Software\Classes\.torrent"
-  torrent_end:
 
+  torrent_end:
   ReadRegStr $0 HKLM "Software\Classes\magnet\shell\open\command" ""
   StrCmp $0 '"$INSTDIR\qbittorrent.exe" "%1"' 0 magnet_end
   DetailPrint "$(uninst_mag_warn) $0"
   DeleteRegKey HKLM "Software\Classes\magnet"
-  magnet_end:
 
+  magnet_end:
   !insertmacro UAC_AsUser_Call Function un.remove_associations_user ${UAC_SYNCREGISTERS}|${UAC_SYNCOUTDIR}|${UAC_SYNCINSTDIR}
 
-  System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, p 0, p 0)'
+  System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
 SectionEnd
 
 Function un.remove_associations_user
@@ -45,12 +45,13 @@ Function un.remove_associations_user
   DetailPrint "$(uninst_tor_warn) $0"
   DeleteRegValue HKCU "Software\Classes\.torrent" ""
   DeleteRegKey /ifempty HKCU "Software\Classes\.torrent"
-  torrent_end:
 
+  torrent_end:
   ReadRegStr $0 HKCU "Software\Classes\magnet\shell\open\command" ""
   StrCmp $0 '"$INSTDIR\qbittorrent.exe" "%1"' 0 magnet_end
   DetailPrint "$(uninst_mag_warn) $0"
   DeleteRegKey HKCU "Software\Classes\magnet"
+
   magnet_end:
 FunctionEnd
 
@@ -61,7 +62,7 @@ Section "un.$(remove_registry)" ;"un.Remove registry keys"
   DeleteRegKey HKLM "Software\qBittorrent"
   DeleteRegKey HKLM "Software\Classes\qBittorrent"
 
-  System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, p 0, p 0)'
+  System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
 SectionEnd
 
 Section "un.$(remove_firewall)" ;

doc/qbittorrent-nox.1

@@ -42,6 +42,6 @@ number.
 8080).
 .SH BUGS
 .PP
-If you find a bug, please report it at https://bugs.qbittorrent.org
+If you find a bug, please report it at http://bugs.qbittorrent.org
 .SH AUTHORS
 Christophe Dumez <chris@qbittorrent.org>.

doc/qbittorrent-nox.1.md

@@ -38,4 +38,4 @@ the default account user name is "admin" with "adminadmin" as a password.
 
 
 # BUGS
-If you find a bug, please report it at https://bugs.qbittorrent.org
+If you find a bug, please report it at http://bugs.qbittorrent.org

doc/qbittorrent.1

@@ -36,6 +36,6 @@ number.
 8080).
 .SH BUGS
 .PP
-If you find a bug, please report it at https://bugs.qbittorrent.org
+If you find a bug, please report it at http://bugs.qbittorrent.org
 .SH AUTHORS
 Christophe Dumez <chris@qbittorrent.org>.

doc/qbittorrent.1.md

@@ -33,4 +33,4 @@ FAST extension (mainline) and PeX support (utorrent compatible).
 
 
 # BUGS
-If you find a bug, please report it at https://bugs.qbittorrent.org
+If you find a bug, please report it at http://bugs.qbittorrent.org

src/app/application.cpp

@@ -96,30 +96,23 @@
 #include "gui/mainwindow.h"
 #include "gui/shutdownconfirmdialog.h"
 #include "gui/uithememanager.h"
-#include "gui/windowstate.h"
-
-#ifdef Q_OS_WIN
-#include "base/utils/os.h"
-#endif  // Q_OS_WIN
+#include "gui/utils.h"
 #endif // DISABLE_GUI
 
 #ifndef DISABLE_WEBUI
 #include "webui/webui.h"
-#ifdef DISABLE_GUI
-#include "base/utils/password.h"
-#endif
 #endif
 
 namespace
 {
 #define SETTINGS_KEY(name) u"Application/" name
 #define FILELOGGER_SETTINGS_KEY(name) (SETTINGS_KEY(u"FileLogger/") name)
-#define NOTIFICATIONS_SETTINGS_KEY(name) (SETTINGS_KEY(u"GUI/Notifications/"_s) name)
+#define NOTIFICATIONS_SETTINGS_KEY(name) (SETTINGS_KEY(u"GUI/Notifications/"_qs) name)
 
-    const QString LOG_FOLDER = u"logs"_s;
+    const QString LOG_FOLDER = u"logs"_qs;
     const QChar PARAMS_SEPARATOR = u'|';
 
-    const Path DEFAULT_PORTABLE_MODE_PROFILE_DIR {u"profile"_s};
+    const Path DEFAULT_PORTABLE_MODE_PROFILE_DIR {u"profile"_qs};
 
     const int MIN_FILELOG_SIZE = 1024; // 1KiB
     const int MAX_FILELOG_SIZE = 1000 * 1024 * 1024; // 1000MiB
@@ -128,132 +121,34 @@ namespace
 #ifndef DISABLE_GUI
     const int PIXMAP_CACHE_SIZE = 64 * 1024 * 1024;  // 64MiB
 #endif
-
-    QString serializeParams(const QBtCommandLineParameters &params)
-    {
-        QStringList result;
-        // Because we're passing a string list to the currently running
-        // qBittorrent process, we need some way of passing along the options
-        // the user has specified. Here we place special strings that are
-        // almost certainly not going to collide with a file path or URL
-        // specified by the user, and placing them at the beginning of the
-        // string list so that they will be processed before the list of
-        // torrent paths or URLs.
-
-        const BitTorrent::AddTorrentParams &addTorrentParams = params.addTorrentParams;
-
-        if (!addTorrentParams.savePath.isEmpty())
-            result.append(u"@savePath=" + addTorrentParams.savePath.data());
-
-        if (addTorrentParams.addPaused.has_value())
-            result.append(*addTorrentParams.addPaused ? u"@addPaused=1"_s : u"@addPaused=0"_s);
-
-        if (addTorrentParams.skipChecking)
-            result.append(u"@skipChecking"_s);
-
-        if (!addTorrentParams.category.isEmpty())
-            result.append(u"@category=" + addTorrentParams.category);
-
-        if (addTorrentParams.sequential)
-            result.append(u"@sequential"_s);
-
-        if (addTorrentParams.firstLastPiecePriority)
-            result.append(u"@firstLastPiecePriority"_s);
-
-        if (params.skipDialog.has_value())
-            result.append(*params.skipDialog ? u"@skipDialog=1"_s : u"@skipDialog=0"_s);
-
-        result += params.torrentSources;
-
-        return result.join(PARAMS_SEPARATOR);
-    }
-
-    QBtCommandLineParameters parseParams(const QString &str)
-    {
-        QBtCommandLineParameters parsedParams;
-        BitTorrent::AddTorrentParams &addTorrentParams = parsedParams.addTorrentParams;
-
-        for (QString param : asConst(str.split(PARAMS_SEPARATOR, Qt::SkipEmptyParts)))
-        {
-            param = param.trimmed();
-
-            // Process strings indicating options specified by the user.
-
-            if (param.startsWith(u"@savePath="))
-            {
-                addTorrentParams.savePath = Path(param.mid(10));
-                continue;
-            }
-
-            if (param.startsWith(u"@addPaused="))
-            {
-                addTorrentParams.addPaused = (QStringView(param).mid(11).toInt() != 0);
-                continue;
-            }
-
-            if (param == u"@skipChecking")
-            {
-                addTorrentParams.skipChecking = true;
-                continue;
-            }
-
-            if (param.startsWith(u"@category="))
-            {
-                addTorrentParams.category = param.mid(10);
-                continue;
-            }
-
-            if (param == u"@sequential")
-            {
-                addTorrentParams.sequential = true;
-                continue;
-            }
-
-            if (param == u"@firstLastPiecePriority")
-            {
-                addTorrentParams.firstLastPiecePriority = true;
-                continue;
-            }
-
-            if (param.startsWith(u"@skipDialog="))
-            {
-                parsedParams.skipDialog = (QStringView(param).mid(12).toInt() != 0);
-                continue;
-            }
-
-            parsedParams.torrentSources.append(param);
-        }
-
-        return parsedParams;
-    }
 }
 
 Application::Application(int &argc, char **argv)
     : BaseApplication(argc, argv)
-    , m_commandLineArgs(parseCommandLine(Application::arguments()))
-    , m_storeFileLoggerEnabled(FILELOGGER_SETTINGS_KEY(u"Enabled"_s))
-    , m_storeFileLoggerBackup(FILELOGGER_SETTINGS_KEY(u"Backup"_s))
-    , m_storeFileLoggerDeleteOld(FILELOGGER_SETTINGS_KEY(u"DeleteOld"_s))
-    , m_storeFileLoggerMaxSize(FILELOGGER_SETTINGS_KEY(u"MaxSizeBytes"_s))
-    , m_storeFileLoggerAge(FILELOGGER_SETTINGS_KEY(u"Age"_s))
-    , m_storeFileLoggerAgeType(FILELOGGER_SETTINGS_KEY(u"AgeType"_s))
-    , m_storeFileLoggerPath(FILELOGGER_SETTINGS_KEY(u"Path"_s))
-    , m_storeMemoryWorkingSetLimit(SETTINGS_KEY(u"MemoryWorkingSetLimit"_s))
+    , m_shutdownAct(ShutdownDialogAction::Exit)
+    , m_commandLineArgs(parseCommandLine(this->arguments()))
+    , m_storeFileLoggerEnabled(FILELOGGER_SETTINGS_KEY(u"Enabled"_qs))
+    , m_storeFileLoggerBackup(FILELOGGER_SETTINGS_KEY(u"Backup"_qs))
+    , m_storeFileLoggerDeleteOld(FILELOGGER_SETTINGS_KEY(u"DeleteOld"_qs))
+    , m_storeFileLoggerMaxSize(FILELOGGER_SETTINGS_KEY(u"MaxSizeBytes"_qs))
+    , m_storeFileLoggerAge(FILELOGGER_SETTINGS_KEY(u"Age"_qs))
+    , m_storeFileLoggerAgeType(FILELOGGER_SETTINGS_KEY(u"AgeType"_qs))
+    , m_storeFileLoggerPath(FILELOGGER_SETTINGS_KEY(u"Path"_qs))
+    , m_storeMemoryWorkingSetLimit(SETTINGS_KEY(u"MemoryWorkingSetLimit"_qs))
 #ifdef Q_OS_WIN
-    , m_processMemoryPriority(SETTINGS_KEY(u"ProcessMemoryPriority"_s))
+    , m_processMemoryPriority(SETTINGS_KEY(u"ProcessMemoryPriority"_qs))
 #endif
 #ifndef DISABLE_GUI
-    , m_startUpWindowState(u"GUI/StartUpWindowState"_s)
-    , m_storeNotificationTorrentAdded(NOTIFICATIONS_SETTINGS_KEY(u"TorrentAdded"_s))
+    , m_storeNotificationTorrentAdded(NOTIFICATIONS_SETTINGS_KEY(u"TorrentAdded"_qs))
 #endif
 {
     qRegisterMetaType<Log::Msg>("Log::Msg");
     qRegisterMetaType<Log::Peer>("Log::Peer");
 
-    setApplicationName(u"qBittorrent"_s);
-    setOrganizationDomain(u"qbittorrent.org"_s);
+    setApplicationName(u"qBittorrent"_qs);
+    setOrganizationDomain(u"qbittorrent.org"_qs);
 #if !defined(DISABLE_GUI)
-    setDesktopFileName(u"org.qbittorrent.qBittorrent"_s);
+    setDesktopFileName(u"org.qbittorrent.qBittorrent"_qs);
 #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
     setAttribute(Qt::AA_UseHighDpiPixmaps, true);  // opt-in to the high DPI pixmap support
 #endif
@@ -281,7 +176,7 @@ Application::Application(int &argc, char **argv)
     if (!firstTimeUser)
     {
         if (!upgrade())
-            throw RuntimeError(u"Failed migration of old settings"_s); // Not translatable. Translation isn't configured yet.
+            throw RuntimeError(u"Failed migration of old settings"_qs); // Not translatable. Translation isn't configured yet.
         handleChangedDefaults(DefaultPreferencesMode::Legacy);
     }
     else
@@ -302,7 +197,7 @@ Application::Application(int &argc, char **argv)
     {
         LogMsg(tr("Running in portable mode. Auto detected profile folder at: %1").arg(profileDir.toString()));
         if (m_commandLineArgs.relativeFastresumePaths)
-            LogMsg(tr("Redundant command line flag detected: \"%1\". Portable mode implies relative fastresume.").arg(u"--relative-fastresume"_s), Log::WARNING); // to avoid translating the `--relative-fastresume` string
+            LogMsg(tr("Redundant command line flag detected: \"%1\". Portable mode implies relative fastresume.").arg(u"--relative-fastresume"_qs), Log::WARNING); // to avoid translating the `--relative-fastresume` string
     }
     else
     {
@@ -312,12 +207,12 @@ Application::Application(int &argc, char **argv)
     if (isFileLoggerEnabled())
         m_fileLogger = new FileLogger(fileLoggerPath(), isFileLoggerBackup(), fileLoggerMaxSize(), isFileLoggerDeleteOld(), fileLoggerAge(), static_cast<FileLogger::FileLogAgeType>(fileLoggerAgeType()));
 
-    if (m_commandLineArgs.webUIPort > 0) // it will be -1 when user did not set any value
-        Preferences::instance()->setWebUIPort(m_commandLineArgs.webUIPort);
+    if (m_commandLineArgs.webUiPort > 0) // it will be -1 when user did not set any value
+        Preferences::instance()->setWebUiPort(m_commandLineArgs.webUiPort);
 
     if (m_commandLineArgs.torrentingPort > 0) // it will be -1 when user did not set any value
     {
-        SettingValue<int> port {u"BitTorrent/Session/Port"_s};
+        SettingValue<int> port {u"BitTorrent/Session/Port"_qs};
         port = m_commandLineArgs.torrentingPort;
     }
 }
@@ -340,16 +235,6 @@ MainWindow *Application::mainWindow()
     return m_window;
 }
 
-WindowState Application::startUpWindowState() const
-{
-    return m_startUpWindowState;
-}
-
-void Application::setStartUpWindowState(const WindowState windowState)
-{
-    m_startUpWindowState = windowState;
-}
-
 bool Application::isTorrentAddedNotificationsEnabled() const
 {
     return m_storeNotificationTorrentAdded;
@@ -377,7 +262,7 @@ void Application::setMemoryWorkingSetLimit(const int size)
         return;
 
     m_storeMemoryWorkingSetLimit = size;
-#if defined(QBT_USES_LIBTORRENT2) && !defined(Q_OS_MACOS)
+#ifdef QBT_USES_LIBTORRENT2
     applyMemoryWorkingSetLimit();
 #endif
 }
@@ -493,7 +378,7 @@ void Application::processMessage(const QString &message)
     }
 #endif
 
-    const QBtCommandLineParameters params = parseParams(message);
+    const AddTorrentParams params = parseParams(message.split(PARAMS_SEPARATOR, Qt::SkipEmptyParts));
     // If Application is not allowed to process params immediately
     // (i.e., other components are not ready) store params
     if (m_isProcessingParamsAllowed)
@@ -529,13 +414,13 @@ void Application::runExternalProgram(const QString &programTemplate, const BitTo
                 str.replace(i, 2, torrent->contentPath().toString());
                 break;
             case u'G':
-                str.replace(i, 2, torrent->tags().join(u","_s));
+                str.replace(i, 2, torrent->tags().join(u","_qs));
                 break;
             case u'I':
-                str.replace(i, 2, (torrent->infoHash().v1().isValid() ? torrent->infoHash().v1().toString() : u"-"_s));
+                str.replace(i, 2, (torrent->infoHash().v1().isValid() ? torrent->infoHash().v1().toString() : u"-"_qs));
                 break;
             case u'J':
-                str.replace(i, 2, (torrent->infoHash().v2().isValid() ? torrent->infoHash().v2().toString() : u"-"_s));
+                str.replace(i, 2, (torrent->infoHash().v2().isValid() ? torrent->infoHash().v2().toString() : u"-"_qs));
                 break;
             case u'K':
                 str.replace(i, 2, torrent->id().toString());
@@ -568,7 +453,6 @@ void Application::runExternalProgram(const QString &programTemplate, const BitTo
     };
 
     const QString logMsg = tr("Running external program. Torrent: \"%1\". Command: `%2`");
-    const QString logMsgError = tr("Failed to run external program. Torrent: \"%1\". Command: `%2`");
 
     // The processing sequenece is different for Windows and other OS, this is intentional
 #if defined(Q_OS_WIN)
@@ -588,6 +472,8 @@ void Application::runExternalProgram(const QString &programTemplate, const BitTo
     for (int i = 1; i < argCount; ++i)
         argList += QString::fromWCharArray(args[i]);
 
+    LogMsg(logMsg.arg(torrent->name(), program));
+
     QProcess proc;
     proc.setProgram(QString::fromWCharArray(args[0]));
     proc.setArguments(argList);
@@ -612,11 +498,7 @@ void Application::runExternalProgram(const QString &programTemplate, const BitTo
         args->startupInfo->hStdOutput = nullptr;
         args->startupInfo->hStdError = nullptr;
     });
-
-    if (proc.startDetached())
-        LogMsg(logMsg.arg(torrent->name(), program));
-    else
-        LogMsg(logMsgError.arg(torrent->name(), program));
+    proc.startDetached();
 #else // Q_OS_WIN
     QStringList args = Utils::String::splitCommand(programTemplate);
 
@@ -632,21 +514,11 @@ void Application::runExternalProgram(const QString &programTemplate, const BitTo
         arg = replaceVariables(arg);
     }
 
-    const QString command = args.takeFirst();
-    QProcess proc;
-    proc.setProgram(command);
-    proc.setArguments(args);
+    // show intended command in log
+    LogMsg(logMsg.arg(torrent->name(), replaceVariables(programTemplate)));
 
-    if (proc.startDetached())
-    {
-        // show intended command in log
-        LogMsg(logMsg.arg(torrent->name(), replaceVariables(programTemplate)));
-    }
-    else
-    {
-        // show intended command in log
-        LogMsg(logMsgError.arg(torrent->name(), replaceVariables(programTemplate)));
-    }
+    const QString command = args.takeFirst();
+    QProcess::startDetached(command, args);
 #endif
 }
 
@@ -741,12 +613,71 @@ void Application::allTorrentsFinished()
     exit();
 }
 
-bool Application::callMainInstance()
+bool Application::sendParams(const QStringList &params)
 {
-    return m_instanceManager->sendMessage(serializeParams(commandLineArgs()));
+    return m_instanceManager->sendMessage(params.join(PARAMS_SEPARATOR));
 }
 
-void Application::processParams(const QBtCommandLineParameters &params)
+Application::AddTorrentParams Application::parseParams(const QStringList &params) const
+{
+    AddTorrentParams parsedParams;
+    BitTorrent::AddTorrentParams &torrentParams = parsedParams.torrentParams;
+
+    for (QString param : params)
+    {
+        param = param.trimmed();
+
+        // Process strings indicating options specified by the user.
+
+        if (param.startsWith(u"@savePath="))
+        {
+            torrentParams.savePath = Path(param.mid(10));
+            continue;
+        }
+
+        if (param.startsWith(u"@addPaused="))
+        {
+            torrentParams.addPaused = (QStringView(param).mid(11).toInt() != 0);
+            continue;
+        }
+
+        if (param == u"@skipChecking")
+        {
+            torrentParams.skipChecking = true;
+            continue;
+        }
+
+        if (param.startsWith(u"@category="))
+        {
+            torrentParams.category = param.mid(10);
+            continue;
+        }
+
+        if (param == u"@sequential")
+        {
+            torrentParams.sequential = true;
+            continue;
+        }
+
+        if (param == u"@firstLastPiecePriority")
+        {
+            torrentParams.firstLastPiecePriority = true;
+            continue;
+        }
+
+        if (param.startsWith(u"@skipDialog="))
+        {
+            parsedParams.skipTorrentDialog = (QStringView(param).mid(12).toInt() != 0);
+            continue;
+        }
+
+        parsedParams.torrentSources.append(param);
+    }
+
+    return parsedParams;
+}
+
+void Application::processParams(const AddTorrentParams &params)
 {
 #ifndef DISABLE_GUI
     // There are two circumstances in which we want to show the torrent
@@ -754,28 +685,29 @@ void Application::processParams(const QBtCommandLineParameters &params)
     // be shown and skipTorrentDialog is undefined. The other is when
     // skipTorrentDialog is false, meaning that the application setting
     // should be overridden.
-    const bool showDialog = !params.skipDialog.value_or(!AddNewTorrentDialog::isEnabled());
-    if (showDialog)
+    const bool showDialogForThisTorrent = !params.skipTorrentDialog.value_or(!AddNewTorrentDialog::isEnabled());
+    if (showDialogForThisTorrent)
     {
         for (const QString &torrentSource : params.torrentSources)
-            AddNewTorrentDialog::show(torrentSource, params.addTorrentParams, m_window);
+            AddNewTorrentDialog::show(torrentSource, params.torrentParams, m_window);
     }
     else
 #endif
     {
         for (const QString &torrentSource : params.torrentSources)
-            BitTorrent::Session::instance()->addTorrent(torrentSource, params.addTorrentParams);
+            BitTorrent::Session::instance()->addTorrent(torrentSource, params.torrentParams);
     }
 }
 
-int Application::exec()
+int Application::exec(const QStringList &params)
+try
 {
 #if !defined(DISABLE_WEBUI) && defined(DISABLE_GUI)
     const QString loadingStr = tr("WebUI will be started shortly after internal preparations. Please wait...");
     printf("%s\n", qUtf8Printable(loadingStr));
 #endif
 
-#if defined(QBT_USES_LIBTORRENT2) && !defined(Q_OS_MACOS)
+#ifdef QBT_USES_LIBTORRENT2
     applyMemoryWorkingSetLimit();
 #endif
 
@@ -797,18 +729,21 @@ int Application::exec()
 #ifndef Q_OS_MACOS
     auto *desktopIntegrationMenu = new QMenu;
     auto *actionExit = new QAction(tr("E&xit"), desktopIntegrationMenu);
-    actionExit->setIcon(UIThemeManager::instance()->getIcon(u"application-exit"_s));
+    actionExit->setIcon(UIThemeManager::instance()->getIcon(u"application-exit"_qs));
     actionExit->setMenuRole(QAction::QuitRole);
     actionExit->setShortcut(Qt::CTRL | Qt::Key_Q);
-    connect(actionExit, &QAction::triggered, this, []
+    connect(actionExit, &QAction::triggered, this, [this]()
     {
         QApplication::exit();
     });
     desktopIntegrationMenu->addAction(actionExit);
 
     m_desktopIntegration->setMenu(desktopIntegrationMenu);
+#endif
 
-    const bool isHidden = m_desktopIntegration->isActive() && (startUpWindowState() == WindowState::Hidden);
+    const auto *pref = Preferences::instance();
+#ifndef Q_OS_MACOS
+    const bool isHidden = m_desktopIntegration->isActive() && pref->startMinimized() && pref->minimizeToTray();
 #else
     const bool isHidden = false;
 #endif
@@ -818,7 +753,7 @@ int Application::exec()
         createStartupProgressDialog();
         // Add a small delay to avoid "flashing" the progress dialog in case there are not many torrents to restore.
         m_startupProgressDialog->setMinimumDuration(1000);
-        if (startUpWindowState() != WindowState::Normal)
+        if (pref->startMinimized())
             m_startupProgressDialog->setWindowState(Qt::WindowMinimized);
     }
     else
@@ -871,26 +806,20 @@ int Application::exec()
         });
 
         disconnect(m_desktopIntegration, &DesktopIntegration::activationRequested, this, &Application::createStartupProgressDialog);
-#ifndef Q_OS_MACOS
-        const WindowState windowState = !m_startupProgressDialog ? WindowState::Hidden
-                : (m_startupProgressDialog->windowState() & Qt::WindowMinimized) ? WindowState::Minimized
-                        : WindowState::Normal;
-#else
-        const WindowState windowState = (m_startupProgressDialog->windowState() & Qt::WindowMinimized)
-                ? WindowState::Minimized : WindowState::Normal;
-#endif
+        const MainWindow::State windowState = (!m_startupProgressDialog || (m_startupProgressDialog->windowState() & Qt::WindowMinimized))
+                ? MainWindow::Minimized : MainWindow::Normal;
         m_window = new MainWindow(this, windowState);
         delete m_startupProgressDialog;
 #ifdef Q_OS_WIN
         auto *pref = Preferences::instance();
-        if (!pref->neverCheckFileAssoc() && (!Utils::OS::isTorrentFileAssocSet() || !Utils::OS::isMagnetLinkAssocSet()))
+        if (!pref->neverCheckFileAssoc() && (!Preferences::isTorrentFileAssocSet() || !Preferences::isMagnetLinkAssocSet()))
         {
             if (QMessageBox::question(m_window, tr("Torrent file association")
                                       , tr("qBittorrent is not the default application for opening torrent files or Magnet links.\nDo you want to make qBittorrent the default application for these?")
                                       , QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes)
             {
-                Utils::OS::setTorrentFileAssoc(true);
-                Utils::OS::setMagnetLinkAssoc(true);
+                pref->setTorrentFileAssoc(true);
+                pref->setMagnetLinkAssoc(true);
             }
             else
             {
@@ -901,45 +830,56 @@ int Application::exec()
 #endif // DISABLE_GUI
 
 #ifndef DISABLE_WEBUI
-#ifndef DISABLE_GUI
         m_webui = new WebUI(this);
-#else
-        const Preferences *pref = Preferences::instance();
-        const QString tempPassword = pref->getWebUIPassword().isEmpty()
-                ? Utils::Password::generate() : QString();
-        m_webui = new WebUI(this, (!tempPassword.isEmpty() ? Utils::Password::PBKDF2::generate(tempPassword) : QByteArray()));
+#ifdef DISABLE_GUI
         if (m_webui->isErrored())
             QCoreApplication::exit(EXIT_FAILURE);
         connect(m_webui, &WebUI::fatalError, this, []() { QCoreApplication::exit(EXIT_FAILURE); });
 
-        const auto scheme = pref->isWebUIHttpsEnabled() ? u"https"_s : u"http"_s;
-        const auto url = u"%1://localhost:%2\n"_s.arg(scheme, QString::number(pref->getWebUIPort()));
-        const QString mesg = u"\n******** %1 ********\n"_s.arg(tr("Information"))
+        const Preferences *pref = Preferences::instance();
+
+        const auto scheme = pref->isWebUiHttpsEnabled() ? u"https"_qs : u"http"_qs;
+        const auto url = u"%1://localhost:%2\n"_qs.arg(scheme, QString::number(pref->getWebUiPort()));
+        const QString mesg = u"\n******** %1 ********\n"_qs.arg(tr("Information"))
                 + tr("To control qBittorrent, access the WebUI at: %1").arg(url);
         printf("%s\n", qUtf8Printable(mesg));
 
-        if (!tempPassword.isEmpty())
+        if (pref->getWebUIPassword() == QByteArrayLiteral("ARQ77eY1NUZaQsuDHbIMCA==:0WMRkYTUWVT9wVvdDtHAjU9b3b7uB8NR1Gur2hmQCvCDpm39Q+PsJRJPaCU51dEiz+dTzh8qbPsL8WkFljQYFQ=="))
         {
-            const QString warning = tr("The WebUI administrator username is: %1").arg(pref->getWebUIUsername()) + u'\n'
-                    + tr("The WebUI administrator password was not set. A temporary password is provided for this session: %1").arg(tempPassword) + u'\n'
-                    + tr("You should set your own password in program preferences.") + u'\n';
+            const QString warning = tr("The Web UI administrator username is: %1").arg(pref->getWebUiUsername()) + u'\n'
+                    + tr("The Web UI administrator password has not been changed from the default: %1").arg(u"adminadmin"_qs) + u'\n'
+                    + tr("This is a security risk, please change your password in program preferences.") + u'\n';
             printf("%s", qUtf8Printable(warning));
         }
 #endif // DISABLE_GUI
 #endif // DISABLE_WEBUI
 
         m_isProcessingParamsAllowed = true;
-        for (const QBtCommandLineParameters &params : m_paramsQueue)
+        for (const AddTorrentParams &params : m_paramsQueue)
             processParams(params);
         m_paramsQueue.clear();
     });
 
-    const QBtCommandLineParameters params = commandLineArgs();
-    if (!params.torrentSources.isEmpty())
-        m_paramsQueue.append(params);
+    if (!params.isEmpty())
+        m_paramsQueue.append(parseParams(params));
 
     return BaseApplication::exec();
 }
+catch (const RuntimeError &err)
+{
+#ifdef DISABLE_GUI
+    fprintf(stderr, "%s", qPrintable(err.message()));
+#else
+    QMessageBox msgBox;
+    msgBox.setIcon(QMessageBox::Critical);
+    msgBox.setText(QCoreApplication::translate("Application", "Application failed to start."));
+    msgBox.setInformativeText(err.message());
+    msgBox.show(); // Need to be shown or to moveToCenter does not work
+    msgBox.move(Utils::Gui::screenCenter(&msgBox));
+    msgBox.exec();
+#endif
+    return EXIT_FAILURE;
+}
 
 bool Application::isRunning()
 {
@@ -1007,8 +947,7 @@ bool Application::event(QEvent *ev)
             path = static_cast<QFileOpenEvent *>(ev)->url().toString();
         qDebug("Received a mac file open event: %s", qUtf8Printable(path));
 
-        QBtCommandLineParameters params;
-        params.torrentSources.append(path);
+        const AddTorrentParams params = parseParams({path});
         // If Application is not allowed to process params immediately
         // (i.e., other components are not ready) store params
         if (m_isProcessingParamsAllowed)
@@ -1085,7 +1024,7 @@ void Application::shutdownCleanup(QSessionManager &manager)
 }
 #endif
 
-#if defined(QBT_USES_LIBTORRENT2) && !defined(Q_OS_MACOS)
+#ifdef QBT_USES_LIBTORRENT2
 void Application::applyMemoryWorkingSetLimit() const
 {
     const size_t MiB = 1024 * 1024;
@@ -1115,22 +1054,7 @@ void Application::applyMemoryWorkingSetLimit() const
     if (::getrlimit(RLIMIT_RSS, &limit) != 0)
         return;
 
-    const size_t newSize = memoryWorkingSetLimit() * MiB;
-    if (newSize > limit.rlim_max)
-    {
-        // try to raise the hard limit
-        rlimit newLimit = limit;
-        newLimit.rlim_max = newSize;
-        if (::setrlimit(RLIMIT_RSS, &newLimit) != 0)
-        {
-            const auto message = QString::fromLocal8Bit(strerror(errno));
-            LogMsg(tr("Failed to set physical memory (RAM) usage hard limit. Requested size: %1. System hard limit: %2. Error code: %3. Error message: \"%4\"")
-                .arg(QString::number(newSize), QString::number(limit.rlim_max), QString::number(errno), message), Log::WARNING);
-            return;
-        }
-    }
-
-    limit.rlim_cur = newSize;
+    limit.rlim_cur = memoryWorkingSetLimit() * MiB;
     if (::setrlimit(RLIMIT_RSS, &limit) != 0)
     {
         const auto message = QString::fromLocal8Bit(strerror(errno));
@@ -1158,12 +1082,12 @@ void Application::setProcessMemoryPriority(const MemoryPriority priority)
 void Application::applyMemoryPriority() const
 {
     using SETPROCESSINFORMATION = BOOL (WINAPI *)(HANDLE, PROCESS_INFORMATION_CLASS, LPVOID, DWORD);
-    const auto setProcessInformation = Utils::Misc::loadWinAPI<SETPROCESSINFORMATION>(u"Kernel32.dll"_s, "SetProcessInformation");
+    const auto setProcessInformation = Utils::Misc::loadWinAPI<SETPROCESSINFORMATION>(u"Kernel32.dll"_qs, "SetProcessInformation");
     if (!setProcessInformation)  // only available on Windows >= 8
         return;
 
     using SETTHREADINFORMATION = BOOL (WINAPI *)(HANDLE, THREAD_INFORMATION_CLASS, LPVOID, DWORD);
-    const auto setThreadInformation = Utils::Misc::loadWinAPI<SETTHREADINFORMATION>(u"Kernel32.dll"_s, "SetThreadInformation");
+    const auto setThreadInformation = Utils::Misc::loadWinAPI<SETTHREADINFORMATION>(u"Kernel32.dll"_qs, "SetThreadInformation");
     if (!setThreadInformation)  // only available on Windows >= 8
         return;
 
@@ -1305,10 +1229,3 @@ void Application::cleanup()
         Utils::Misc::shutdownComputer(m_shutdownAct);
     }
 }
-
-#ifndef DISABLE_WEBUI
-WebUI *Application::webUI() const
-{
-    return m_webui;
-}
-#endif

src/app/application.h

@@ -96,10 +96,10 @@ public:
     Application(int &argc, char **argv);
     ~Application() override;
 
-    int exec();
+    int exec(const QStringList &params);
 
     bool isRunning();
-    bool callMainInstance();
+    bool sendParams(const QStringList &params);
     const QBtCommandLineParameters &commandLineArgs() const;
 
     // FileLogger properties
@@ -130,9 +130,6 @@ public:
     DesktopIntegration *desktopIntegration() override;
     MainWindow *mainWindow() override;
 
-    WindowState startUpWindowState() const override;
-    void setStartUpWindowState(WindowState windowState) override;
-
     bool isTorrentAddedNotificationsEnabled() const override;
     void setTorrentAddedNotificationsEnabled(bool value) override;
 #endif
@@ -149,16 +146,20 @@ private slots:
 #endif
 
 private:
-#ifndef DISABLE_WEBUI
-    WebUI *webUI() const override;
-#endif
+    struct AddTorrentParams
+    {
+        QStringList torrentSources;
+        BitTorrent::AddTorrentParams torrentParams;
+        std::optional<bool> skipTorrentDialog;
+    };
 
     void initializeTranslation();
-    void processParams(const QBtCommandLineParameters &params);
+    AddTorrentParams parseParams(const QStringList &params) const;
+    void processParams(const AddTorrentParams &params);
     void runExternalProgram(const QString &programTemplate, const BitTorrent::Torrent *torrent) const;
     void sendNotificationEmail(const BitTorrent::Torrent *torrent);
 
-#if defined(QBT_USES_LIBTORRENT2) && !defined(Q_OS_MACOS)
+#ifdef QBT_USES_LIBTORRENT2
     void applyMemoryWorkingSetLimit() const;
 #endif
 
@@ -177,7 +178,7 @@ private:
     ApplicationInstanceManager *m_instanceManager = nullptr;
     QAtomicInt m_isCleanupRun;
     bool m_isProcessingParamsAllowed = false;
-    ShutdownDialogAction m_shutdownAct = ShutdownDialogAction::Exit;
+    ShutdownDialogAction m_shutdownAct;
     QBtCommandLineParameters m_commandLineArgs;
 
     // FileLog
@@ -186,7 +187,7 @@ private:
     QTranslator m_qtTranslator;
     QTranslator m_translator;
 
-    QList<QBtCommandLineParameters> m_paramsQueue;
+    QList<AddTorrentParams> m_paramsQueue;
 
     SettingValue<bool> m_storeFileLoggerEnabled;
     SettingValue<bool> m_storeFileLoggerBackup;
@@ -202,7 +203,6 @@ private:
 #endif
 
 #ifndef DISABLE_GUI
-    SettingValue<WindowState> m_startUpWindowState;
     SettingValue<bool> m_storeNotificationTorrentAdded;
 
     DesktopIntegration *m_desktopIntegration = nullptr;

src/app/cmdoptions.cpp

@@ -32,7 +32,6 @@
 
 #include <cstdio>
 
-#include <QCoreApplication>
 #include <QDebug>
 #include <QFileInfo>
 #include <QProcessEnvironment>
@@ -152,16 +151,16 @@ namespace
         {
             QStringList parts = arg.split(u'=');
             if (parts.size() == 2)
-                return Utils::String::unquote(parts[1], u"'\""_s);
-            throw CommandLineParameterError(QCoreApplication::translate("CMD Options", "Parameter '%1' must follow syntax '%1=%2'",
+                return Utils::String::unquote(parts[1], u"'\""_qs);
+            throw CommandLineParameterError(QObject::tr("Parameter '%1' must follow syntax '%1=%2'",
                                                         "e.g. Parameter '--webui-port' must follow syntax '--webui-port=value'")
-                                            .arg(fullParameter(), u"<value>"_s));
+                                            .arg(fullParameter(), u"<value>"_qs));
         }
 
         QString value(const QProcessEnvironment &env, const QString &defaultValue = {}) const
         {
             QString val = env.value(envVarName());
-            return val.isEmpty() ? defaultValue : Utils::String::unquote(val, u"'\""_s);
+            return val.isEmpty() ? defaultValue : Utils::String::unquote(val, u"'\""_qs);
         }
 
         QString usage(const QString &valueName) const
@@ -199,15 +198,13 @@ namespace
 
         int value(const QString &arg) const
         {
-            const QString val = StringOption::value(arg);
+            QString val = StringOption::value(arg);
             bool ok = false;
-            const int res = val.toInt(&ok);
+            int res = val.toInt(&ok);
             if (!ok)
-            {
-                throw CommandLineParameterError(QCoreApplication::translate("CMD Options", "Parameter '%1' must follow syntax '%1=%2'",
+                throw CommandLineParameterError(QObject::tr("Parameter '%1' must follow syntax '%1=%2'",
                                                             "e.g. Parameter '--webui-port' must follow syntax '--webui-port=<value>'")
-                                                .arg(fullParameter(), u"<integer value>"_s));
-            }
+                                                .arg(fullParameter(), u"<integer value>"_qs));
             return res;
         }
 
@@ -220,7 +217,7 @@ namespace
             int res = val.toInt(&ok);
             if (!ok)
             {
-                qDebug() << QCoreApplication::translate("CMD Options", "Expected integer number in environment variable '%1', but got '%2'")
+                qDebug() << QObject::tr("Expected integer number in environment variable '%1', but got '%2'")
                     .arg(envVarName(), val);
                 return defaultValue;
             }
@@ -276,15 +273,15 @@ namespace
                 }
             }
 
-            throw CommandLineParameterError(QCoreApplication::translate("CMD Options", "Parameter '%1' must follow syntax '%1=%2'",
+            throw CommandLineParameterError(QObject::tr("Parameter '%1' must follow syntax '%1=%2'",
                                                         "e.g. Parameter '--add-paused' must follow syntax "
                                                         "'--add-paused=<true|false>'")
-                                            .arg(fullParameter(), u"<true|false>"_s));
+                                            .arg(fullParameter(), u"<true|false>"_qs));
         }
 
         std::optional<bool> value(const QProcessEnvironment &env) const
         {
-            const QString val = env.value(envVarName(), u"-1"_s);
+            const QString val = env.value(envVarName(), u"-1"_qs);
 
             if (val.isEmpty())
             {
@@ -303,8 +300,8 @@ namespace
                 return false;
             }
 
-            qDebug() << QCoreApplication::translate("CMD Options", "Expected %1 in environment variable '%2', but got '%3'")
-                .arg(u"true|false"_s, envVarName(), val);
+            qDebug() << QObject::tr("Expected %1 in environment variable '%2', but got '%3'")
+                .arg(u"true|false"_qs, envVarName(), val);
             return std::nullopt;
         }
 
@@ -343,24 +340,64 @@ namespace
 }
 
 QBtCommandLineParameters::QBtCommandLineParameters(const QProcessEnvironment &env)
-    : relativeFastresumePaths(RELATIVE_FASTRESUME.value(env))
+    : showHelp(false)
+    , relativeFastresumePaths(RELATIVE_FASTRESUME.value(env))
+    , skipChecking(SKIP_HASH_CHECK_OPTION.value(env))
+    , sequential(SEQUENTIAL_OPTION.value(env))
+    , firstLastPiecePriority(FIRST_AND_LAST_OPTION.value(env))
+#if !defined(Q_OS_WIN) || defined(DISABLE_GUI)
+    , showVersion(false)
+#endif
 #ifndef DISABLE_GUI
     , noSplash(NO_SPLASH_OPTION.value(env))
 #elif !defined(Q_OS_WIN)
     , shouldDaemonize(DAEMON_OPTION.value(env))
 #endif
-    , webUIPort(WEBUI_PORT_OPTION.value(env, -1))
+    , webUiPort(WEBUI_PORT_OPTION.value(env, -1))
     , torrentingPort(TORRENTING_PORT_OPTION.value(env, -1))
+    , addPaused(PAUSED_OPTION.value(env))
     , skipDialog(SKIP_DIALOG_OPTION.value(env))
     , profileDir(PROFILE_OPTION.value(env))
     , configurationName(CONFIGURATION_OPTION.value(env))
+    , savePath(SAVE_PATH_OPTION.value(env))
+    , category(CATEGORY_OPTION.value(env))
 {
-    addTorrentParams.savePath = Path(SAVE_PATH_OPTION.value(env));
-    addTorrentParams.category = CATEGORY_OPTION.value(env);
-    addTorrentParams.skipChecking = SKIP_HASH_CHECK_OPTION.value(env);
-    addTorrentParams.sequential = SEQUENTIAL_OPTION.value(env);
-    addTorrentParams.firstLastPiecePriority = FIRST_AND_LAST_OPTION.value(env);
-    addTorrentParams.addPaused = PAUSED_OPTION.value(env);
+}
+
+QStringList QBtCommandLineParameters::paramList() const
+{
+    QStringList result;
+    // Because we're passing a string list to the currently running
+    // qBittorrent process, we need some way of passing along the options
+    // the user has specified. Here we place special strings that are
+    // almost certainly not going to collide with a file path or URL
+    // specified by the user, and placing them at the beginning of the
+    // string list so that they will be processed before the list of
+    // torrent paths or URLs.
+
+    if (!savePath.isEmpty())
+        result.append(u"@savePath=" + savePath.data());
+
+    if (addPaused.has_value())
+        result.append(*addPaused ? u"@addPaused=1"_qs : u"@addPaused=0"_qs);
+
+    if (skipChecking)
+        result.append(u"@skipChecking"_qs);
+
+    if (!category.isEmpty())
+        result.append(u"@category=" + category);
+
+    if (sequential)
+        result.append(u"@sequential"_qs);
+
+    if (firstLastPiecePriority)
+        result.append(u"@firstLastPiecePriority"_qs);
+
+    if (skipDialog.has_value())
+        result.append(*skipDialog ? u"@skipDialog=1"_qs : u"@skipDialog=0"_qs);
+
+    result += torrents;
+    return result;
 }
 
 QBtCommandLineParameters parseCommandLine(const QStringList &args)
@@ -373,7 +410,7 @@ QBtCommandLineParameters parseCommandLine(const QStringList &args)
 
         if ((arg.startsWith(u"--") && !arg.endsWith(u".torrent"))
             || (arg.startsWith(u'-') && (arg.size() == 2)))
-        {
+            {
             // Parse known parameters
             if (arg == SHOW_HELP_OPTION)
             {
@@ -387,18 +424,18 @@ QBtCommandLineParameters parseCommandLine(const QStringList &args)
 #endif
             else if (arg == WEBUI_PORT_OPTION)
             {
-                result.webUIPort = WEBUI_PORT_OPTION.value(arg);
-                if ((result.webUIPort < 1) || (result.webUIPort > 65535))
-                    throw CommandLineParameterError(QCoreApplication::translate("CMD Options", "%1 must specify a valid port (1 to 65535).")
-                                                    .arg(u"--webui-port"_s));
+                result.webUiPort = WEBUI_PORT_OPTION.value(arg);
+                if ((result.webUiPort < 1) || (result.webUiPort > 65535))
+                    throw CommandLineParameterError(QObject::tr("%1 must specify a valid port (1 to 65535).")
+                                                    .arg(u"--webui-port"_qs));
             }
             else if (arg == TORRENTING_PORT_OPTION)
             {
                 result.torrentingPort = TORRENTING_PORT_OPTION.value(arg);
                 if ((result.torrentingPort < 1) || (result.torrentingPort > 65535))
                 {
-                    throw CommandLineParameterError(QCoreApplication::translate("CMD Options", "%1 must specify a valid port (1 to 65535).")
-                                                    .arg(u"--torrenting-port"_s));
+                    throw CommandLineParameterError(QObject::tr("%1 must specify a valid port (1 to 65535).")
+                                                    .arg(u"--torrenting-port"_qs));
                 }
             }
 #ifndef DISABLE_GUI
@@ -426,27 +463,27 @@ QBtCommandLineParameters parseCommandLine(const QStringList &args)
             }
             else if (arg == SAVE_PATH_OPTION)
             {
-                result.addTorrentParams.savePath = Path(SAVE_PATH_OPTION.value(arg));
+                result.savePath = Path(SAVE_PATH_OPTION.value(arg));
             }
             else if (arg == PAUSED_OPTION)
             {
-                result.addTorrentParams.addPaused = PAUSED_OPTION.value(arg);
+                result.addPaused = PAUSED_OPTION.value(arg);
             }
             else if (arg == SKIP_HASH_CHECK_OPTION)
             {
-                result.addTorrentParams.skipChecking = true;
+                result.skipChecking = true;
             }
             else if (arg == CATEGORY_OPTION)
             {
-                result.addTorrentParams.category = CATEGORY_OPTION.value(arg);
+                result.category = CATEGORY_OPTION.value(arg);
             }
             else if (arg == SEQUENTIAL_OPTION)
             {
-                result.addTorrentParams.sequential = true;
+                result.sequential = true;
             }
             else if (arg == FIRST_AND_LAST_OPTION)
             {
-                result.addTorrentParams.firstLastPiecePriority = true;
+                result.firstLastPiecePriority = true;
             }
             else if (arg == SKIP_DIALOG_OPTION)
             {
@@ -465,9 +502,9 @@ QBtCommandLineParameters parseCommandLine(const QStringList &args)
             torrentPath.setFile(arg);
 
             if (torrentPath.exists())
-                result.torrentSources += torrentPath.absoluteFilePath();
+                result.torrents += torrentPath.absoluteFilePath();
             else
-                result.torrentSources += arg;
+                result.torrents += arg;
         }
     }
 
@@ -500,58 +537,58 @@ QString makeUsage(const QString &prgName)
 {
     const QString indentation {USAGE_INDENTATION, u' '};
 
-    const QString text = QCoreApplication::translate("CMD Options", "Usage:") + u'\n'
-        + indentation + prgName + u' ' + QCoreApplication::translate("CMD Options", "[options] [(<filename> | <url>)...]") + u'\n'
+    const QString text = QObject::tr("Usage:") + u'\n'
+        + indentation + prgName + u' ' + QObject::tr("[options] [(<filename> | <url>)...]") + u'\n'
 
-        + QCoreApplication::translate("CMD Options", "Options:") + u'\n'
+        + QObject::tr("Options:") + u'\n'
 #if !defined(Q_OS_WIN) || defined(DISABLE_GUI)
-        + SHOW_VERSION_OPTION.usage() + wrapText(QCoreApplication::translate("CMD Options", "Display program version and exit")) + u'\n'
+        + SHOW_VERSION_OPTION.usage() + wrapText(QObject::tr("Display program version and exit")) + u'\n'
 #endif
-        + SHOW_HELP_OPTION.usage() + wrapText(QCoreApplication::translate("CMD Options", "Display this help message and exit")) + u'\n'
-        + WEBUI_PORT_OPTION.usage(QCoreApplication::translate("CMD Options", "port"))
-        + wrapText(QCoreApplication::translate("CMD Options", "Change the WebUI port"))
+        + SHOW_HELP_OPTION.usage() + wrapText(QObject::tr("Display this help message and exit")) + u'\n'
+        + WEBUI_PORT_OPTION.usage(QObject::tr("port"))
+        + wrapText(QObject::tr("Change the Web UI port"))
         + u'\n'
-        + TORRENTING_PORT_OPTION.usage(QCoreApplication::translate("CMD Options", "port"))
-        + wrapText(QCoreApplication::translate("CMD Options", "Change the torrenting port"))
+        + TORRENTING_PORT_OPTION.usage(QObject::tr("port"))
+        + wrapText(QObject::tr("Change the torrenting port"))
         + u'\n'
 #ifndef DISABLE_GUI
-        + NO_SPLASH_OPTION.usage() + wrapText(QCoreApplication::translate("CMD Options", "Disable splash screen")) + u'\n'
+        + NO_SPLASH_OPTION.usage() + wrapText(QObject::tr("Disable splash screen")) + u'\n'
 #elif !defined(Q_OS_WIN)
-        + DAEMON_OPTION.usage() + wrapText(QCoreApplication::translate("CMD Options", "Run in daemon-mode (background)")) + u'\n'
+        + DAEMON_OPTION.usage() + wrapText(QObject::tr("Run in daemon-mode (background)")) + u'\n'
 #endif
     //: Use appropriate short form or abbreviation of "directory"
-        + PROFILE_OPTION.usage(QCoreApplication::translate("CMD Options", "dir"))
-        + wrapText(QCoreApplication::translate("CMD Options", "Store configuration files in <dir>")) + u'\n'
-        + CONFIGURATION_OPTION.usage(QCoreApplication::translate("CMD Options", "name"))
-        + wrapText(QCoreApplication::translate("CMD Options", "Store configuration files in directories qBittorrent_<name>")) + u'\n'
+        + PROFILE_OPTION.usage(QObject::tr("dir"))
+        + wrapText(QObject::tr("Store configuration files in <dir>")) + u'\n'
+        + CONFIGURATION_OPTION.usage(QObject::tr("name"))
+        + wrapText(QObject::tr("Store configuration files in directories qBittorrent_<name>")) + u'\n'
         + RELATIVE_FASTRESUME.usage()
-        + wrapText(QCoreApplication::translate("CMD Options", "Hack into libtorrent fastresume files and make file paths relative "
+        + wrapText(QObject::tr("Hack into libtorrent fastresume files and make file paths relative "
                                 "to the profile directory")) + u'\n'
-        + Option::padUsageText(QCoreApplication::translate("CMD Options", "files or URLs"))
-        + wrapText(QCoreApplication::translate("CMD Options", "Download the torrents passed by the user")) + u'\n'
+        + Option::padUsageText(QObject::tr("files or URLs"))
+        + wrapText(QObject::tr("Download the torrents passed by the user")) + u'\n'
         + u'\n'
 
-        + wrapText(QCoreApplication::translate("CMD Options", "Options when adding new torrents:"), 0) + u'\n'
-        + SAVE_PATH_OPTION.usage(QCoreApplication::translate("CMD Options", "path")) + wrapText(QCoreApplication::translate("CMD Options", "Torrent save path")) + u'\n'
-        + PAUSED_OPTION.usage() + wrapText(QCoreApplication::translate("CMD Options", "Add torrents as started or paused")) + u'\n'
-        + SKIP_HASH_CHECK_OPTION.usage() + wrapText(QCoreApplication::translate("CMD Options", "Skip hash check")) + u'\n'
-        + CATEGORY_OPTION.usage(QCoreApplication::translate("CMD Options", "name"))
-        + wrapText(QCoreApplication::translate("CMD Options", "Assign torrents to category. If the category doesn't exist, it will be "
+        + wrapText(QObject::tr("Options when adding new torrents:"), 0) + u'\n'
+        + SAVE_PATH_OPTION.usage(QObject::tr("path")) + wrapText(QObject::tr("Torrent save path")) + u'\n'
+        + PAUSED_OPTION.usage() + wrapText(QObject::tr("Add torrents as started or paused")) + u'\n'
+        + SKIP_HASH_CHECK_OPTION.usage() + wrapText(QObject::tr("Skip hash check")) + u'\n'
+        + CATEGORY_OPTION.usage(QObject::tr("name"))
+        + wrapText(QObject::tr("Assign torrents to category. If the category doesn't exist, it will be "
                                 "created.")) + u'\n'
-        + SEQUENTIAL_OPTION.usage() + wrapText(QCoreApplication::translate("CMD Options", "Download files in sequential order")) + u'\n'
+        + SEQUENTIAL_OPTION.usage() + wrapText(QObject::tr("Download files in sequential order")) + u'\n'
         + FIRST_AND_LAST_OPTION.usage()
-        + wrapText(QCoreApplication::translate("CMD Options", "Download first and last pieces first")) + u'\n'
+        + wrapText(QObject::tr("Download first and last pieces first")) + u'\n'
         + SKIP_DIALOG_OPTION.usage()
-        + wrapText(QCoreApplication::translate("CMD Options", "Specify whether the \"Add New Torrent\" dialog opens when adding a "
+        + wrapText(QObject::tr("Specify whether the \"Add New Torrent\" dialog opens when adding a "
                                 "torrent.")) + u'\n'
         + u'\n'
 
-        + wrapText(QCoreApplication::translate("CMD Options", "Option values may be supplied via environment variables. For option named "
+        + wrapText(QObject::tr("Option values may be supplied via environment variables. For option named "
                                 "'parameter-name', environment variable name is 'QBT_PARAMETER_NAME' (in upper "
                                 "case, '-' replaced with '_'). To pass flag values, set the variable to '1' or "
                                 "'TRUE'. For example, to disable the splash screen: "), 0) + u'\n'
         + u"QBT_NO_SPLASH=1 " + prgName + u'\n'
-        + wrapText(QCoreApplication::translate("CMD Options", "Command line parameters take precedence over environment variables"), 0) + u'\n';
+        + wrapText(QObject::tr("Command line parameters take precedence over environment variables"), 0) + u'\n';
 
     return text;
 }
@@ -559,7 +596,7 @@ QString makeUsage(const QString &prgName)
 void displayUsage(const QString &prgName)
 {
 #if defined(Q_OS_WIN) && !defined(DISABLE_GUI)
-    QMessageBox msgBox(QMessageBox::Information, QCoreApplication::translate("CMD Options", "Help"), makeUsage(prgName), QMessageBox::Ok);
+    QMessageBox msgBox(QMessageBox::Information, QObject::tr("Help"), makeUsage(prgName), QMessageBox::Ok);
     msgBox.show(); // Need to be shown or to moveToCenter does not work
     msgBox.move(Utils::Gui::screenCenter(&msgBox));
     msgBox.exec();

src/app/cmdoptions.h

@@ -35,7 +35,6 @@
 #include <QString>
 #include <QStringList>
 
-#include "base/bittorrent/addtorrentparams.h"
 #include "base/exceptions.h"
 #include "base/path.h"
 
@@ -43,29 +42,32 @@ class QProcessEnvironment;
 
 struct QBtCommandLineParameters
 {
-    bool showHelp = false;
-    bool relativeFastresumePaths = false;
+    bool showHelp;
+    bool relativeFastresumePaths;
+    bool skipChecking;
+    bool sequential;
+    bool firstLastPiecePriority;
 #if !defined(Q_OS_WIN) || defined(DISABLE_GUI)
-    bool showVersion = false;
+    bool showVersion;
 #endif
 #ifndef DISABLE_GUI
-    bool noSplash = false;
+    bool noSplash;
 #elif !defined(Q_OS_WIN)
-    bool shouldDaemonize = false;
+    bool shouldDaemonize;
 #endif
-    int webUIPort = -1;
-    int torrentingPort = -1;
+    int webUiPort;
+    int torrentingPort;
+    std::optional<bool> addPaused;
     std::optional<bool> skipDialog;
+    QStringList torrents;
     Path profileDir;
     QString configurationName;
-
-    QStringList torrentSources;
-    BitTorrent::AddTorrentParams addTorrentParams;
-
+    Path savePath;
+    QString category;
     QString unknownParameter;
 
-    QBtCommandLineParameters() = default;
     explicit QBtCommandLineParameters(const QProcessEnvironment &);
+    QStringList paramList() const;
 };
 
 class CommandLineParameterError : public RuntimeError

src/app/filelogger.cpp

@@ -78,7 +78,7 @@ void FileLogger::changePath(const Path &newPath)
 
     closeLogFile();
 
-    m_path = newPath / Path(u"qbittorrent.log"_s);
+    m_path = newPath / Path(u"qbittorrent.log"_qs);
     m_logFile.setFileName(m_path.data());
 
     Utils::Fs::mkpath(newPath);
@@ -89,7 +89,7 @@ void FileLogger::deleteOld(const int age, const FileLogAgeType ageType)
 {
     const QDateTime date = QDateTime::currentDateTime();
     const QDir dir {m_path.parentPath().data()};
-    const QFileInfoList fileList = dir.entryInfoList(QStringList(u"qbittorrent.log.bak*"_s)
+    const QFileInfoList fileList = dir.entryInfoList(QStringList(u"qbittorrent.log.bak*"_qs)
         , (QDir::Files | QDir::Writable), (QDir::Time | QDir::Reversed));
 
     for (const QFileInfo &file : fileList)

src/app/main.cpp

@@ -45,8 +45,7 @@
 #include <io.h>
 #endif
 
-#include <QCoreApplication>
-#include <QString>
+#include <QDebug>
 #include <QThread>
 
 #ifndef DISABLE_GUI
@@ -86,7 +85,6 @@ using namespace std::chrono_literals;
 void displayVersion();
 bool userAgreesWithLegalNotice();
 void displayBadArgMessage(const QString &message);
-void displayErrorMessage(const QString &message);
 
 #ifndef DISABLE_GUI
 void showSplashScreen();
@@ -115,12 +113,10 @@ int main(int argc, char *argv[])
         Application::setHighDpiScaleFactorRoundingPolicy(Qt::HighDpiScaleFactorRoundingPolicy::PassThrough);
 #endif
 
-    // `app` must be declared out of try block to allow display message box in case of exception
-    std::unique_ptr<Application> app;
     try
     {
         // Create Application
-        app = std::make_unique<Application>(argc, argv);
+        auto app = std::make_unique<Application>(argc, argv);
 
 #ifdef Q_OS_WIN
         // QCoreApplication::applicationDirPath() needs an Application object instantiated first
@@ -130,13 +126,13 @@ int main(int argc, char *argv[])
         if (envValue.isEmpty())
             qputenv(envName, Application::applicationDirPath().toLocal8Bit());
         else
-            qputenv(envName, u"%1;%2"_s.arg(envValue, Application::applicationDirPath()).toLocal8Bit());
+            qputenv(envName, u"%1;%2"_qs.arg(envValue, Application::applicationDirPath()).toLocal8Bit());
 #endif
 
         const QBtCommandLineParameters params = app->commandLineArgs();
         if (!params.unknownParameter.isEmpty())
         {
-            throw CommandLineParameterError(QCoreApplication::translate("Main", "%1 is an unknown command line parameter.",
+            throw CommandLineParameterError(QObject::tr("%1 is an unknown command line parameter.",
                                                         "--random-parameter is an unknown command line parameter.")
                                                         .arg(params.unknownParameter));
         }
@@ -148,8 +144,8 @@ int main(int argc, char *argv[])
                 displayVersion();
                 return EXIT_SUCCESS;
             }
-            throw CommandLineParameterError(QCoreApplication::translate("Main", "%1 must be the single command line parameter.")
-                                     .arg(u"-v (or --version)"_s));
+            throw CommandLineParameterError(QObject::tr("%1 must be the single command line parameter.")
+                                     .arg(u"-v (or --version)"_qs));
         }
 #endif
         if (params.showHelp)
@@ -159,8 +155,8 @@ int main(int argc, char *argv[])
                 displayUsage(QString::fromLocal8Bit(argv[0]));
                 return EXIT_SUCCESS;
             }
-            throw CommandLineParameterError(QCoreApplication::translate("Main", "%1 must be the single command line parameter.")
-                                 .arg(u"-h (or --help)"_s));
+            throw CommandLineParameterError(QObject::tr("%1 must be the single command line parameter.")
+                                 .arg(u"-h (or --help)"_qs));
         }
 
         const bool firstTimeUser = !Preferences::instance()->getAcceptedLegal();
@@ -191,13 +187,13 @@ int main(int argc, char *argv[])
 #if defined(DISABLE_GUI) && !defined(Q_OS_WIN)
             if (params.shouldDaemonize)
             {
-                throw CommandLineParameterError(QCoreApplication::translate("Main", "You cannot use %1: qBittorrent is already running for this user.")
-                                     .arg(u"-d (or --daemon)"_s));
+                throw CommandLineParameterError(QObject::tr("You cannot use %1: qBittorrent is already running for this user.")
+                                     .arg(u"-d (or --daemon)"_qs));
             }
 #endif
 
             QThread::msleep(300);
-            app->callMainInstance();
+            app->sendParams(params.paramList());
 
             return EXIT_SUCCESS;
         }
@@ -262,7 +258,7 @@ int main(int argc, char *argv[])
 
         registerSignalHandlers();
 
-        return app->exec();
+        return app->exec(params.paramList());
     }
     catch (const CommandLineParameterError &er)
     {
@@ -271,7 +267,7 @@ int main(int argc, char *argv[])
     }
     catch (const RuntimeError &er)
     {
-        displayErrorMessage(er.message());
+        qDebug() << er.message();
         return EXIT_FAILURE;
     }
 }
@@ -279,11 +275,11 @@ int main(int argc, char *argv[])
 #if !defined(DISABLE_GUI)
 void showSplashScreen()
 {
-    QPixmap splashImg(u":/icons/splash.png"_s);
+    QPixmap splashImg(u":/icons/splash.png"_qs);
     QPainter painter(&splashImg);
     const auto version = QStringLiteral(QBT_VERSION);
     painter.setPen(QPen(Qt::white));
-    painter.setFont(QFont(u"Arial"_s, 22, QFont::Black));
+    painter.setFont(QFont(u"Arial"_qs, 22, QFont::Black));
     painter.drawText(224 - painter.fontMetrics().horizontalAdvance(version), 270, version);
     QSplashScreen *splash = new QSplashScreen(splashImg);
     splash->show();
@@ -299,55 +295,31 @@ void displayVersion()
 
 void displayBadArgMessage(const QString &message)
 {
-    const QString help = QCoreApplication::translate("Main", "Run application with -h option to read about command line parameters.");
+    const QString help = QObject::tr("Run application with -h option to read about command line parameters.");
 #if defined(Q_OS_WIN) && !defined(DISABLE_GUI)
-    QMessageBox msgBox(QMessageBox::Critical, QCoreApplication::translate("Main", "Bad command line"),
+    QMessageBox msgBox(QMessageBox::Critical, QObject::tr("Bad command line"),
                        (message + u'\n' + help), QMessageBox::Ok);
     msgBox.show(); // Need to be shown or to moveToCenter does not work
     msgBox.move(Utils::Gui::screenCenter(&msgBox));
     msgBox.exec();
 #else
-    const QString errMsg = QCoreApplication::translate("Main", "Bad command line: ") + u'\n'
+    const QString errMsg = QObject::tr("Bad command line: ") + u'\n'
         + message + u'\n'
         + help + u'\n';
     fprintf(stderr, "%s", qUtf8Printable(errMsg));
 #endif
 }
 
-void displayErrorMessage(const QString &message)
-{
-#ifndef DISABLE_GUI
-    if (QApplication::instance())
-    {
-        QMessageBox msgBox;
-        msgBox.setIcon(QMessageBox::Critical);
-        msgBox.setText(QCoreApplication::translate("Main", "An unrecoverable error occurred."));
-        msgBox.setInformativeText(message);
-        msgBox.show(); // Need to be shown or to moveToCenter does not work
-        msgBox.move(Utils::Gui::screenCenter(&msgBox));
-        msgBox.exec();
-    }
-    else
-    {
-        const QString errMsg = QCoreApplication::translate("Main", "qBittorrent has encountered an unrecoverable error.") + u'\n' + message + u'\n';
-        fprintf(stderr, "%s", qUtf8Printable(errMsg));
-    }
-#else
-    const QString errMsg = QCoreApplication::translate("Main", "qBittorrent has encountered an unrecoverable error.") + u'\n' + message + u'\n';
-    fprintf(stderr, "%s", qUtf8Printable(errMsg));
-#endif
-}
-
 bool userAgreesWithLegalNotice()
 {
     Preferences *const pref = Preferences::instance();
     Q_ASSERT(!pref->getAcceptedLegal());
 
 #ifdef DISABLE_GUI
-    const QString eula = u"\n*** %1 ***\n"_s.arg(QCoreApplication::translate("Main", "Legal Notice"))
-        + QCoreApplication::translate("Main", "qBittorrent is a file sharing program. When you run a torrent, its data will be made available to others by means of upload. Any content you share is your sole responsibility.") + u"\n\n"
-        + QCoreApplication::translate("Main", "No further notices will be issued.") + u"\n\n"
-        + QCoreApplication::translate("Main", "Press %1 key to accept and continue...").arg(u"'y'"_s) + u'\n';
+    const QString eula = u"\n*** %1 ***\n"_qs.arg(QObject::tr("Legal Notice"))
+        + QObject::tr("qBittorrent is a file sharing program. When you run a torrent, its data will be made available to others by means of upload. Any content you share is your sole responsibility.") + u"\n\n"
+        + QObject::tr("No further notices will be issued.") + u"\n\n"
+        + QObject::tr("Press %1 key to accept and continue...").arg(u"'y'"_qs) + u'\n';
     printf("%s", qUtf8Printable(eula));
 
     const char ret = getchar(); // Read pressed key
@@ -359,10 +331,10 @@ bool userAgreesWithLegalNotice()
     }
 #else
     QMessageBox msgBox;
-    msgBox.setText(QCoreApplication::translate("Main", "qBittorrent is a file sharing program. When you run a torrent, its data will be made available to others by means of upload. Any content you share is your sole responsibility.\n\nNo further notices will be issued."));
-    msgBox.setWindowTitle(QCoreApplication::translate("Main", "Legal notice"));
-    msgBox.addButton(QCoreApplication::translate("Main", "Cancel"), QMessageBox::RejectRole);
-    const QAbstractButton *agreeButton = msgBox.addButton(QCoreApplication::translate("Main", "I Agree"), QMessageBox::AcceptRole);
+    msgBox.setText(QObject::tr("qBittorrent is a file sharing program. When you run a torrent, its data will be made available to others by means of upload. Any content you share is your sole responsibility.\n\nNo further notices will be issued."));
+    msgBox.setWindowTitle(QObject::tr("Legal notice"));
+    msgBox.addButton(QObject::tr("Cancel"), QMessageBox::RejectRole);
+    const QAbstractButton *agreeButton = msgBox.addButton(QObject::tr("I Agree"), QMessageBox::AcceptRole);
     msgBox.show(); // Need to be shown or to moveToCenter does not work
     msgBox.move(Utils::Gui::screenCenter(&msgBox));
     msgBox.exec();