GHA CI: Bump actions/upload-artifact in the github-actions group

Bumps the github-actions group with 1 update: [actions/upload-artifact](https://github.com/actions/upload-artifact).


Updates `actions/upload-artifact` from 5 to 6
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/workflows/ci_file_health.yaml

@@ -16,7 +16,7 @@ jobs:
       security-events: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -31,12 +31,13 @@ jobs:
       - name: Check doc
         env:
           pandoc_path: "${{ github.workspace }}/../pandoc"
+          pandoc_version: "3.8.3"
         run: |
           # install pandoc
           curl \
             -L \
             -o "${{ runner.temp }}/pandoc.tar.gz" \
-            "https://github.com/jgm/pandoc/releases/download/3.7.0.2/pandoc-3.7.0.2-linux-amd64.tar.gz"
+            "https://github.com/jgm/pandoc/releases/download/${{ env.pandoc_version }}/pandoc-${{ env.pandoc_version }}-linux-amd64.tar.gz"
           tar -xf "${{ runner.temp }}/pandoc.tar.gz" -C "${{ github.workspace }}/.."
           mv "${{ github.workspace }}/.."/pandoc-* "${{ env.pandoc_path }}"
           # run pandoc

.github/workflows/ci_macos.yaml

@@ -18,9 +18,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        libt_version: ["2.0.11", "1.2.20"]
+        libtorrent:
+          - version: "2.0.11"
+            boost_major_version: "1"
+            boost_minor_version: "90"
+            boost_patch_version: "0"
+          - version: "1.2.20"
+            boost_major_version: "1"
+            boost_minor_version: "86"
+            boost_patch_version: "0"
         qbt_gui: ["GUI=ON", "GUI=OFF"]
-        qt_version: ["6.9.1"]
+        qt_version: ["6.10.1"]
 
     env:
       boost_path: "${{ github.workspace }}/../boost"
@@ -28,7 +36,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -55,13 +63,9 @@ jobs:
             max_size=1G
 
       - name: Install boost
-        env:
-          BOOST_MAJOR_VERSION: "1"
-          BOOST_MINOR_VERSION: "86"
-          BOOST_PATCH_VERSION: "0"
         run: |
-          boost_url="https://archives.boost.io/release/${{ env.BOOST_MAJOR_VERSION }}.${{ env.BOOST_MINOR_VERSION }}.${{ env.BOOST_PATCH_VERSION }}/source/boost_${{ env.BOOST_MAJOR_VERSION }}_${{ env.BOOST_MINOR_VERSION }}_${{ env.BOOST_PATCH_VERSION }}.tar.gz"
+          boost_url="https://archives.boost.io/release/${{ matrix.libtorrent.boost_major_version }}.${{ matrix.libtorrent.boost_minor_version }}.${{ matrix.libtorrent.boost_patch_version }}/source/boost_${{ matrix.libtorrent.boost_major_version }}_${{ matrix.libtorrent.boost_minor_version }}_${{ matrix.libtorrent.boost_patch_version }}.tar.gz"
-          boost_url2="https://sourceforge.net/projects/boost/files/boost/${{ env.BOOST_MAJOR_VERSION }}.${{ env.BOOST_MINOR_VERSION }}.${{ env.BOOST_PATCH_VERSION }}/boost_${{ env.BOOST_MAJOR_VERSION }}_${{ env.BOOST_MINOR_VERSION }}_${{ env.BOOST_PATCH_VERSION }}.tar.gz"
+          boost_url2="https://sourceforge.net/projects/boost/files/boost/${{ matrix.libtorrent.boost_major_version }}.${{ matrix.libtorrent.boost_minor_version }}.${{ matrix.libtorrent.boost_patch_version }}/boost_${{ matrix.libtorrent.boost_major_version }}_${{ matrix.libtorrent.boost_minor_version }}_${{ matrix.libtorrent.boost_patch_version }}.tar.gz"
           set +e
           curl -L -o "${{ runner.temp }}/boost.tar.gz" "$boost_url"
           tar -xf "${{ runner.temp }}/boost.tar.gz" -C "${{ github.workspace }}/.."; _exitCode="$?"
@@ -79,13 +83,14 @@ jobs:
         with:
           version: ${{ matrix.qt_version }}
           archives: qtbase qtdeclarative qtsvg qttools
+          modules: qtimageformats
           # Not sure why Qt made a hard dependency on qtdeclarative, try removing it when Qt > 6.4.0
           cache: true
 
       - name: Install libtorrent
         run: |
           git clone \
-            --branch v${{ matrix.libt_version }} \
+            --branch v${{ matrix.libtorrent.version }} \
             --depth 1 \
             --recurse-submodules \
             https://github.com/arvidn/libtorrent.git \
@@ -161,7 +166,7 @@ jobs:
           cp ${{ env.libtorrent_path }}/build/compile_commands.json upload/cmake/libtorrent
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
-          name: qBittorrent-CI_macOS_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libt_version }}_Qt-${{ matrix.qt_version }}
+          name: qBittorrent-CI_macOS_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libtorrent.version }}_Qt-${{ matrix.qt_version }}
           path: upload

.github/workflows/ci_python.yaml

@@ -15,7 +15,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
 

.github/workflows/ci_ubuntu.yaml

@@ -19,7 +19,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        libt_version: ["2.0.11", "1.2.20"]
+        libtorrent:
+          - version: "2.0.11"
+            boost_major_version: "1"
+            boost_minor_version: "77"
+            boost_patch_version: "0"
+          - version: "1.2.20"
+            boost_major_version: "1"
+            boost_minor_version: "77"
+            boost_patch_version: "0"
         qbt_gui: ["GUI=ON", "GUI=OFF"]
         qt_version: ["6.6.3"]
 
@@ -30,7 +38,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -50,13 +58,9 @@ jobs:
             max_size=1G
 
       - name: Install boost
-        env:
-          BOOST_MAJOR_VERSION: "1"
-          BOOST_MINOR_VERSION: "77"
-          BOOST_PATCH_VERSION: "0"
         run: |
-          boost_url="https://archives.boost.io/release/${{ env.BOOST_MAJOR_VERSION }}.${{ env.BOOST_MINOR_VERSION }}.${{ env.BOOST_PATCH_VERSION }}/source/boost_${{ env.BOOST_MAJOR_VERSION }}_${{ env.BOOST_MINOR_VERSION }}_${{ env.BOOST_PATCH_VERSION }}.tar.gz"
+          boost_url="https://archives.boost.io/release/${{ matrix.libtorrent.boost_major_version }}.${{ matrix.libtorrent.boost_minor_version }}.${{ matrix.libtorrent.boost_patch_version }}/source/boost_${{ matrix.libtorrent.boost_major_version }}_${{ matrix.libtorrent.boost_minor_version }}_${{ matrix.libtorrent.boost_patch_version }}.tar.gz"
-          boost_url2="https://sourceforge.net/projects/boost/files/boost/${{ env.BOOST_MAJOR_VERSION }}.${{ env.BOOST_MINOR_VERSION }}.${{ env.BOOST_PATCH_VERSION }}/boost_${{ env.BOOST_MAJOR_VERSION }}_${{ env.BOOST_MINOR_VERSION }}_${{ env.BOOST_PATCH_VERSION }}.tar.gz"
+          boost_url2="https://sourceforge.net/projects/boost/files/boost/${{ matrix.libtorrent.boost_major_version }}.${{ matrix.libtorrent.boost_minor_version }}.${{ matrix.libtorrent.boost_patch_version }}/boost_${{ matrix.libtorrent.boost_major_version }}_${{ matrix.libtorrent.boost_minor_version }}_${{ matrix.libtorrent.boost_patch_version }}.tar.gz"
           set +e
           curl -L -o "${{ runner.temp }}/boost.tar.gz" "$boost_url"
           tar -xf "${{ runner.temp }}/boost.tar.gz" -C "${{ github.workspace }}/.."; _exitCode="$?"
@@ -74,12 +78,13 @@ jobs:
         with:
           version: ${{ matrix.qt_version }}
           archives: icu qtbase qtdeclarative qtsvg qttools
+          modules: qtimageformats
           cache: true
 
       - name: Install libtorrent
         run: |
           git clone \
-            --branch v${{ matrix.libt_version }} \
+            --branch v${{ matrix.libtorrent.version }} \
             --depth 1 \
             --recurse-submodules \
             https://github.com/arvidn/libtorrent.git \
@@ -101,7 +106,7 @@ jobs:
       # to avoid scanning 3rdparty codebases, initialize it just before building qbt
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v4
-        if: startsWith(matrix.libt_version, 2) && (matrix.qbt_gui == 'GUI=ON')
+        if: startsWith(matrix.libtorrent.version, 2) && (matrix.qbt_gui == 'GUI=ON')
         with:
           config-file: ./.github/workflows/helper/codeql/cpp.yaml
           languages: cpp
@@ -132,7 +137,7 @@ jobs:
 
       - name: Run CodeQL analysis
         uses: github/codeql-action/analyze@v4
-        if: startsWith(matrix.libt_version, 2) && (matrix.qbt_gui == 'GUI=ON')
+        if: startsWith(matrix.libtorrent.version, 2) && (matrix.qbt_gui == 'GUI=ON')
         with:
           category: ${{ github.base_ref || github.ref_name }}
 
@@ -177,7 +182,7 @@ jobs:
             ./linuxdeploy-x86_64.AppImage --appdir qbittorrent --output appimage
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
-          name: qBittorrent-CI_Ubuntu-x64_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libt_version }}_Qt-${{ matrix.qt_version }}
+          name: qBittorrent-CI_Ubuntu-x64_${{ matrix.qbt_gui }}_libtorrent-${{ matrix.libtorrent.version }}_Qt-${{ matrix.qt_version }}
           path: upload

.github/workflows/ci_webui.yaml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
 

.github/workflows/ci_windows.yaml

@@ -10,7 +10,7 @@ concurrency:
 
 jobs:
   ci:
-    name: Build (${{ matrix.libt_version }}, ${{ matrix.config.arch }})
+    name: Build (${{ matrix.libtorrent.version }}, ${{ matrix.config.arch }})
     runs-on: ${{ matrix.config.os }}
     permissions:
       actions: write
@@ -18,7 +18,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        libt_version: ["2.0.11", "1.2.20"]
+        libtorrent:
+          - version: "2.0.11"
+            boost_major_version: "1"
+            boost_minor_version: "90"
+            boost_patch_version: "0"
+          - version: "1.2.20"
+            boost_major_version: "1"
+            boost_minor_version: "86"
+            boost_patch_version: "0"
         config:
         - os: windows-latest
           arch: x64
@@ -31,7 +39,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -86,13 +94,9 @@ jobs:
             $packages
 
       - name: Install boost
-        env:
-          BOOST_MAJOR_VERSION: "1"
-          BOOST_MINOR_VERSION: "86"
-          BOOST_PATCH_VERSION: "0"
         run: |
-          $boost_url="https://archives.boost.io/release/${{ env.BOOST_MAJOR_VERSION }}.${{ env.BOOST_MINOR_VERSION }}.${{ env.BOOST_PATCH_VERSION }}/source/boost_${{ env.BOOST_MAJOR_VERSION }}_${{ env.BOOST_MINOR_VERSION }}_${{ env.BOOST_PATCH_VERSION }}.tar.gz"
+          $boost_url="https://archives.boost.io/release/${{ matrix.libtorrent.boost_major_version }}.${{ matrix.libtorrent.boost_minor_version }}.${{ matrix.libtorrent.boost_patch_version }}/source/boost_${{ matrix.libtorrent.boost_major_version }}_${{ matrix.libtorrent.boost_minor_version }}_${{ matrix.libtorrent.boost_patch_version }}.tar.gz"
-          $boost_url2="https://sourceforge.net/projects/boost/files/boost/${{ env.BOOST_MAJOR_VERSION }}.${{ env.BOOST_MINOR_VERSION }}.${{ env.BOOST_PATCH_VERSION }}/boost_${{ env.BOOST_MAJOR_VERSION }}_${{ env.BOOST_MINOR_VERSION }}_${{ env.BOOST_PATCH_VERSION }}.tar.gz"
+          $boost_url2="https://sourceforge.net/projects/boost/files/boost/${{ matrix.libtorrent.boost_major_version }}.${{ matrix.libtorrent.boost_minor_version }}.${{ matrix.libtorrent.boost_patch_version }}/boost_${{ matrix.libtorrent.boost_major_version }}_${{ matrix.libtorrent.boost_minor_version }}_${{ matrix.libtorrent.boost_patch_version }}.tar.gz"
           curl -L -o "${{ runner.temp }}/boost.tar.gz" "$boost_url"
           tar -xf "${{ runner.temp }}/boost.tar.gz" -C "${{ github.workspace }}/.."
           if ($LastExitCode -ne 0)
@@ -112,15 +116,16 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v4
         with:
-          version: "6.9.1"
+          version: "6.10.1"
           arch: ${{ matrix.config.qt_arch }}
           archives: qtbase qtsvg qttools
+          modules: qtimageformats
           cache: true
 
       - name: Install libtorrent
         run: |
           git clone `
-            --branch v${{ matrix.libt_version }} `
+            --branch v${{ matrix.libtorrent.version }} `
             --depth 1 `
             --recurse-submodules `
             https://github.com/arvidn/libtorrent.git `
@@ -182,8 +187,16 @@ jobs:
           mkdir upload/qBittorrent/plugins/iconengines
           copy "${{ env.Qt_ROOT_DIR }}/plugins/iconengines/qsvgicon.dll" upload/qBittorrent/plugins/iconengines
           mkdir upload/qBittorrent/plugins/imageformats
+          # include all imageformats dlls since CI (dev) build links dynamically
+          copy "${{ env.Qt_ROOT_DIR }}/plugins/imageformats/qgif.dll" upload/qBittorrent/plugins/imageformats
+          copy "${{ env.Qt_ROOT_DIR }}/plugins/imageformats/qicns.dll" upload/qBittorrent/plugins/imageformats
           copy "${{ env.Qt_ROOT_DIR }}/plugins/imageformats/qico.dll" upload/qBittorrent/plugins/imageformats
+          copy "${{ env.Qt_ROOT_DIR }}/plugins/imageformats/qjpeg.dll" upload/qBittorrent/plugins/imageformats
           copy "${{ env.Qt_ROOT_DIR }}/plugins/imageformats/qsvg.dll" upload/qBittorrent/plugins/imageformats
+          copy "${{ env.Qt_ROOT_DIR }}/plugins/imageformats/qtga.dll" upload/qBittorrent/plugins/imageformats
+          copy "${{ env.Qt_ROOT_DIR }}/plugins/imageformats/qtiff.dll" upload/qBittorrent/plugins/imageformats
+          copy "${{ env.Qt_ROOT_DIR }}/plugins/imageformats/qwbmp.dll" upload/qBittorrent/plugins/imageformats
+          copy "${{ env.Qt_ROOT_DIR }}/plugins/imageformats/qwebp.dll" upload/qBittorrent/plugins/imageformats
           mkdir upload/qBittorrent/plugins/platforms
           copy "${{ env.Qt_ROOT_DIR }}/plugins/platforms/qwindows.dll" upload/qBittorrent/plugins/platforms
           mkdir upload/qBittorrent/plugins/sqldrivers
@@ -200,9 +213,9 @@ jobs:
           copy ${{ env.libtorrent_path }}/build/compile_commands.json upload/cmake/libtorrent
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
-          name: qBittorrent-CI_Windows-${{ matrix.config.arch }}_libtorrent-${{ matrix.libt_version }}
+          name: qBittorrent-CI_Windows-${{ matrix.config.arch }}_libtorrent-${{ matrix.libtorrent.version }}
           path: upload
 
       - name: Install NSIS
@@ -216,7 +229,7 @@ jobs:
           makensis /DQBT_CPU_ARCH="${{ matrix.config.arch }}" /DQBT_DIST_DIR="../../upload/qBittorrent" /WX dist/windows/qbittorrent.nsi
 
       - name: Upload installer
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v6
         with:
-          name: qBittorrent-CI_Windows-${{ matrix.config.arch }}_libtorrent-${{ matrix.libt_version }}-setup
+          name: qBittorrent-CI_Windows-${{ matrix.config.arch }}_libtorrent-${{ matrix.libtorrent.version }}-setup
           path: dist/windows/qbittorrent_*_setup.exe

.github/workflows/coverity-scan.yaml

@@ -14,9 +14,13 @@ jobs:
 
     strategy:
       matrix:
-        libt_version: ["2.0.11"]
+        libtorrent:
+          - version: "2.0.11"
+            boost_major_version: "1"
+            boost_minor_version: "90"
+            boost_patch_version: "0"
         qbt_gui: ["GUI=ON"]
-        qt_version: ["6.9.1"]
+        qt_version: ["6.10.1"]
 
     env:
       boost_path: "${{ github.workspace }}/../boost"
@@ -25,7 +29,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           persist-credentials: false
 
@@ -37,13 +41,9 @@ jobs:
             libssl-dev libxkbcommon-x11-dev libxcb-cursor-dev zlib1g-dev
 
       - name: Install boost
-        env:
-          BOOST_MAJOR_VERSION: "1"
-          BOOST_MINOR_VERSION: "88"
-          BOOST_PATCH_VERSION: "0"
         run: |
-          boost_url="https://archives.boost.io/release/${{ env.BOOST_MAJOR_VERSION }}.${{ env.BOOST_MINOR_VERSION }}.${{ env.BOOST_PATCH_VERSION }}/source/boost_${{ env.BOOST_MAJOR_VERSION }}_${{ env.BOOST_MINOR_VERSION }}_${{ env.BOOST_PATCH_VERSION }}.tar.gz"
+          boost_url="https://archives.boost.io/release/${{ matrix.libtorrent.boost_major_version }}.${{ matrix.libtorrent.boost_minor_version }}.${{ matrix.libtorrent.boost_patch_version }}/source/boost_${{ matrix.libtorrent.boost_major_version }}_${{ matrix.libtorrent.boost_minor_version }}_${{ matrix.libtorrent.boost_patch_version }}.tar.gz"
-          boost_url2="https://sourceforge.net/projects/boost/files/boost/${{ env.BOOST_MAJOR_VERSION }}.${{ env.BOOST_MINOR_VERSION }}.${{ env.BOOST_PATCH_VERSION }}/boost_${{ env.BOOST_MAJOR_VERSION }}_${{ env.BOOST_MINOR_VERSION }}_${{ env.BOOST_PATCH_VERSION }}.tar.gz"
+          boost_url2="https://sourceforge.net/projects/boost/files/boost/${{ matrix.libtorrent.boost_major_version }}.${{ matrix.libtorrent.boost_minor_version }}.${{ matrix.libtorrent.boost_patch_version }}/boost_${{ matrix.libtorrent.boost_major_version }}_${{ matrix.libtorrent.boost_minor_version }}_${{ matrix.libtorrent.boost_patch_version }}.tar.gz"
           set +e
           curl -L -o "${{ runner.temp }}/boost.tar.gz" "$boost_url"
           tar -xf "${{ runner.temp }}/boost.tar.gz" -C "${{ github.workspace }}/.."; _exitCode="$?"
@@ -66,7 +66,7 @@ jobs:
       - name: Install libtorrent
         run: |
           git clone \
-            --branch v${{ matrix.libt_version }} \
+            --branch v${{ matrix.libtorrent.version }} \
             --depth 1 \
             --recurse-submodules \
             https://github.com/arvidn/libtorrent.git \

dist/unix/org.qbittorrent.qBittorrent.desktop

@@ -162,7 +162,7 @@ GenericName[te]=క్యు  బిట్ టొరెంట్ క్లయి
 Comment[te]=క్యు  బిట్ టొరెంట్ తో ఫైల్స్ దిగుమతి చేసుకోండి , పంచుకోండి
 Name[te]=qBittorrent
 GenericName[th]=ไคลเอนต์บิตทอร์เรนต์
-Comment[th]=ดาวน์โหลดและแบ่งปันไฟล์ผ่านไฟล์บิตทอร์เรนต์
+Comment[th]=ดาวน์โหลดและแชร์ไฟล์ผ่าน BitTorrent
 Name[th]=qBittorrent
 GenericName[tr]=BitTorrent istemcisi
 Comment[tr]=Dosyaları BitTorrent üzerinden indirin ve paylaşın

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

@@ -62,6 +62,6 @@
   <url type="contribute">https://github.com/qbittorrent/qBittorrent/blob/master/CONTRIBUTING.md</url>
   <content_rating type="oars-1.1"/>
   <releases>
-    <release version="5.2.0~alpha1" date="2025-02-11"/>
+    <release version="5.2.0~beta1" date="2025-12-31"/>
   </releases>
 </component>

dist/windows/installer-translations/afrikaans.nsh

@@ -36,8 +36,7 @@ LangString inst_uninstall_link_description ${LANG_AFRIKAANS} "Uninstall qBittorr
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_AFRIKAANS} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_AFRIKAANS} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
+
-LangString inst_already_running ${LANG_AFRIKAANS} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/albanian.nsh

@@ -38,8 +38,7 @@ LangString inst_uninstall_link_description ${LANG_ALBANIAN} "Uninstall qBittorre
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_ALBANIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ALBANIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
+
-LangString inst_already_running ${LANG_ALBANIAN} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/arabic.nsh

@@ -36,8 +36,7 @@ LangString inst_uninstall_link_description ${LANG_ARABIC} "Uninstall qBittorrent
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_ARABIC} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ARABIC} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
+
-LangString inst_already_running ${LANG_ARABIC} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/basque.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_BASQUE} "Uninstall qBittorrent
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_BASQUE} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_BASQUE} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_BASQUE} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/belarusian.nsh

@@ -36,8 +36,7 @@ LangString inst_uninstall_link_description ${LANG_BELARUSIAN} "Uninstall qBittor
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_BELARUSIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_BELARUSIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
+
-LangString inst_already_running ${LANG_BELARUSIAN} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/bosnian.nsh

@@ -36,8 +36,7 @@ LangString inst_uninstall_link_description ${LANG_BOSNIAN} "Uninstall qBittorren
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_BOSNIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_BOSNIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
+
-LangString inst_already_running ${LANG_BOSNIAN} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/breton.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_BRETON} "Uninstall qBittorrent
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_BRETON} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_BRETON} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_BRETON} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/bulgarian.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_BULGARIAN} "Uninstall qBittorr
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_BULGARIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_BULGARIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_BULGARIAN} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/catalan.nsh

@@ -36,8 +36,7 @@ LangString inst_uninstall_link_description ${LANG_CATALAN} "Desinstal·lar qBitt
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_CATALAN} "Aquesta versió x64 de qBittorrent no pot funcionar en sistemes ARM64. Siusplau, descarrega l'instal·lador ARM64."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_CATALAN} "Aquesta versió ARM64 de qBittorrent no pot funcionar en sistemes x64. Siusplau, descarrega l'instal·lador x64."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
+
-LangString inst_already_running ${LANG_CATALAN} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/croatian.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_CROATIAN} "Uninstall qBittorre
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_CROATIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_CROATIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_CROATIAN} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/czech.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_CZECH} "Uninstall qBittorrent"
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_CZECH} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_CZECH} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_CZECH} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/danish.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_DANISH} "Afinstaller qBittorre
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_DANISH} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_DANISH} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_DANISH} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/dutch.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_DUTCH} "qBittorrent verwijdere
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_DUTCH} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_DUTCH} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_DUTCH} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/english.nsh

@@ -36,8 +36,7 @@ LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorren
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_ENGLISH} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
+
-LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/esperanto.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_ESPERANTO} "Uninstall qBittorr
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_ESPERANTO} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ESPERANTO} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_ESPERANTO} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/estonian.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_ESTONIAN} "Desinstalli qBittor
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_ESTONIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ESTONIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_ESTONIAN} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/farsi.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_FARSI} "Uninstall qBittorrent"
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_FARSI} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_FARSI} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_FARSI} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/finnish.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_FINNISH} "Uninstall qBittorren
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_FINNISH} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_FINNISH} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_FINNISH} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/french.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_FRENCH} "Désinstaller qBittor
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_FRENCH} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_FRENCH} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_FRENCH} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/galician.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_GALICIAN} "Uninstall qBittorre
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_GALICIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_GALICIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_GALICIAN} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/german.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_GERMAN} "qBittorrent deinstall
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_GERMAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_GERMAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_GERMAN} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/greek.nsh

@@ -36,8 +36,7 @@ LangString inst_uninstall_link_description ${LANG_GREEK} "Uninstall qBittorrent"
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_GREEK} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_GREEK} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
+
-LangString inst_already_running ${LANG_GREEK} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/hebrew.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_HEBREW} "הסר את ההתק
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_HEBREW} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_HEBREW} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_HEBREW} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/hungarian.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_HUNGARIAN} "qBittorrent eltáv
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_HUNGARIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_HUNGARIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_HUNGARIAN} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/icelandic.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_ICELANDIC} "Uninstall qBittorr
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_ICELANDIC} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ICELANDIC} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_ICELANDIC} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/indonesian.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_INDONESIAN} "Hapus qBittorrent
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_INDONESIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_INDONESIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_INDONESIAN} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/irish.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_IRISH} "Uninstall qBittorrent"
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_IRISH} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_IRISH} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_IRISH} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/italian.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_ITALIAN} "Disinstalla qBittorr
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_ITALIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ITALIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_ITALIAN} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/japanese.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_JAPANESE} "qBittorrent をア
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_JAPANESE} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_JAPANESE} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_JAPANESE} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/korean.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_KOREAN} "qBittorrent 제거"
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_KOREAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_KOREAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_KOREAN} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/kurdish.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_KURDISH} "کیووبیتتۆر
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_KURDISH} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_KURDISH} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_KURDISH} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/latvian.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_LATVIAN} "Atinstalēt qBittorr
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_LATVIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_LATVIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_LATVIAN} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/lithuanian.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_LITHUANIAN} "Pašalinti qBitto
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_LITHUANIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_LITHUANIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_LITHUANIAN} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/luxembourgish.nsh

@@ -36,8 +36,7 @@ LangString inst_uninstall_link_description ${LANG_LUXEMBOURGISH} "qBittorrent de
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_LUXEMBOURGISH} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_LUXEMBOURGISH} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
+
-LangString inst_already_running ${LANG_LUXEMBOURGISH} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/macedonian.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_MACEDONIAN} "Uninstall qBittor
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_MACEDONIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_MACEDONIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_MACEDONIAN} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/malay.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_MALAY} "Uninstall qBittorrent"
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_MALAY} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_MALAY} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_MALAY} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/mongolian.nsh

@@ -36,8 +36,7 @@ LangString inst_uninstall_link_description ${LANG_MONGOLIAN} "Uninstall qBittorr
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_MONGOLIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_MONGOLIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
+
-LangString inst_already_running ${LANG_MONGOLIAN} "Another instance of the installer is already running."
 ;------------------------------------
 ;Uninstaller strings
 

dist/windows/installer-translations/norwegian.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_NORWEGIAN} "Uninstall qBittorr
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_NORWEGIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_NORWEGIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_NORWEGIAN} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/norwegiannynorsk.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_NORWEGIANNYNORSK} "Uninstall q
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_NORWEGIANNYNORSK} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_NORWEGIANNYNORSK} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_NORWEGIANNYNORSK} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/polish.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_POLISH} "Odinstaluj qBittorren
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_POLISH} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_POLISH} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_POLISH} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/portuguese.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_PORTUGUESE} "Desinstalar qBitt
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_PORTUGUESE} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_PORTUGUESE} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_PORTUGUESE} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/portugueseBR.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_PORTUGUESEBR} "Desinstalar o q
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_PORTUGUESEBR} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_PORTUGUESEBR} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_PORTUGUESEBR} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/romanian.nsh

@@ -36,8 +36,7 @@ LangString inst_uninstall_link_description ${LANG_ROMANIAN} "Dezinstalați qBitt
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_ROMANIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ROMANIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
+
-LangString inst_already_running ${LANG_ROMANIAN} "Another instance of the installer is already running."
 ;------------------------------------
 ;Uninstaller strings
 

dist/windows/installer-translations/russian.nsh

@@ -33,11 +33,9 @@ LangString inst_requires_win10 ${LANG_RUSSIAN}  "Для работы этого
 ;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
 LangString inst_uninstall_link_description ${LANG_RUSSIAN} "Удалить qBittorrent"
 ;LangString inst_arch_mismatch_x64_on_arm64 ${LANG_ENGLISH} "Error: This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
-LangString inst_arch_mismatch_x64_on_arm64 ${LANG_RUSSIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
+LangString inst_arch_mismatch_x64_on_arm64 ${LANG_RUSSIAN} "Эта версия qBittorrent для x64 не может работать на системах ARM64. Пожалуйста, скачайте установщик для ARM64."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-LangString inst_arch_mismatch_arm64_on_x64 ${LANG_RUSSIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
+LangString inst_arch_mismatch_arm64_on_x64 ${LANG_RUSSIAN} "Эта версия qBittorrent для ARM64 не может работать на системах x64. Пожалуйста, скачайте установщик для x64."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_RUSSIAN} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/serbian.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_SERBIAN} "Uninstall qBittorren
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_SERBIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_SERBIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_SERBIAN} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/serbianlatin.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_SERBIANLATIN} "Uninstall qBitt
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_SERBIANLATIN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_SERBIANLATIN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_SERBIANLATIN} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/simpchinese.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_SIMPCHINESE} "卸载 qBittorre
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_SIMPCHINESE} "X64 版本的 qBittorrent 不能运行在 ARM64 系统上。请下载 ARM64 安装程序。"
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_SIMPCHINESE} "ARM64 版本的 qBittorrent 不能运行在 X64 系统上。请下载 X64 安装程序。"
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_SIMPCHINESE} "另一个安装程序实例正在运行。"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/slovak.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_SLOVAK} "Odinštalovať qBitto
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_SLOVAK} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_SLOVAK} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_SLOVAK} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/slovenian.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_SLOVENIAN} "Uninstall qBittorr
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_SLOVENIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_SLOVENIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_SLOVENIAN} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/spanish.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_SPANISH} "Desinstalar qBittorr
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_SPANISH} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_SPANISH} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_SPANISH} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/spanishinternational.nsh

@@ -36,8 +36,7 @@ LangString inst_uninstall_link_description ${LANG_SPANISHINTERNATIONAL} "Desinst
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_SPANISHINTERNATIONAL} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_SPANISHINTERNATIONAL} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
+
-LangString inst_already_running ${LANG_SPANISHINTERNATIONAL} "Another instance of the installer is already running."
 ;------------------------------------
 ;Uninstaller strings
 

dist/windows/installer-translations/swedish.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_SWEDISH} "Avinstallera qBittor
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_SWEDISH} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_SWEDISH} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_SWEDISH} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/thai.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_THAI} "Uninstall qBittorrent"
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_THAI} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_THAI} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_THAI} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/tradchinese.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_TRADCHINESE} "移除 qBittorre
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_TRADCHINESE} "X64 版本的 qBittorrent 無法在 ARM64 系統上執行。請下載 ARM64 安裝程式。"
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_TRADCHINESE} "ARM64 版本的 qBittorrent 無法在 X64 系統上執行。請下載 X64 安裝程式。"
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_TRADCHINESE} "另一個安裝程式實例正在運行。"
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/turkish.nsh

@@ -21,7 +21,7 @@ LangString inst_firewallinfo ${LANG_TURKISH} "Windows Güvenlik Duvarı kuralı
 ;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} "Şu anki sürüm kaldırılacak. Kullanıcı ayarları ve torrent'ler bozulmadan kalacaktı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."
@@ -33,11 +33,9 @@ LangString inst_requires_win10 ${LANG_TURKISH}  "Bu yükleyici en az Windows 10
 ;LangString inst_uninstall_link_description ${LANG_ENGLISH} "Uninstall qBittorrent"
 LangString inst_uninstall_link_description ${LANG_TURKISH} "qBittorrent'i kaldır"
 ;LangString inst_arch_mismatch_x64_on_arm64 ${LANG_ENGLISH} "Error: This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
-LangString inst_arch_mismatch_x64_on_arm64 ${LANG_TURKISH} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
+LangString inst_arch_mismatch_x64_on_arm64 ${LANG_TURKISH} "qBittorrent'in bu x64 sürümü ARM64 sistemlerde çalışamaz. Lütfen ARM64 yükleyicisini indirin."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-LangString inst_arch_mismatch_arm64_on_x64 ${LANG_TURKISH} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
+LangString inst_arch_mismatch_arm64_on_x64 ${LANG_TURKISH} "qBittorrent'in bu ARM64 sürümü x64 sistemlerde çalışamaz. Lütfen x64 yükleyicisini indirin."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_TURKISH} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/ukrainian.nsh

@@ -36,8 +36,6 @@ LangString inst_uninstall_link_description ${LANG_UKRAINIAN} "Uninstall qBittorr
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_UKRAINIAN} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_UKRAINIAN} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
-LangString inst_already_running ${LANG_UKRAINIAN} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/uzbek.nsh

@@ -36,8 +36,7 @@ LangString inst_uninstall_link_description ${LANG_UZBEK} "qBittorrent oʻchirils
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_UZBEK} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_UZBEK} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
+
-LangString inst_already_running ${LANG_UZBEK} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer-translations/welsh.nsh

@@ -36,8 +36,7 @@ LangString inst_uninstall_link_description ${LANG_WELSH} "Uninstall qBittorrent"
 LangString inst_arch_mismatch_x64_on_arm64 ${LANG_WELSH} "This x64 version of qBittorrent cannot run on ARM64 systems. Please download the ARM64 installer."
 ;LangString inst_arch_mismatch_arm64_on_x64 ${LANG_ENGLISH} "Error: This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
 LangString inst_arch_mismatch_arm64_on_x64 ${LANG_WELSH} "This ARM64 version of qBittorrent cannot run on x64 systems. Please download the x64 installer."
-;LangString inst_already_running ${LANG_ENGLISH} "Another instance of the installer is already running."
+
-LangString inst_already_running ${LANG_WELSH} "Another instance of the installer is already running."
 
 ;------------------------------------
 ;Uninstaller strings

dist/windows/installer.nsh

@@ -112,18 +112,6 @@ SectionEnd
 ;--------------------------------
 
 Function .onInit
-  ; create a mutex to ensure only one installer is running
-  System::Call 'kernel32::CreateMutex(p 0, b 0, t "qbt_installer") p . r1 ?e'
-  Var /GLOBAL CreateMutexResult
-  Pop $CreateMutexResult
-  IntCmpU $CreateMutexResult 183 isDuplicateInstance isUniqueInstance isUniqueInstance
-
-  isDuplicateInstance:
-    MessageBox MB_OK|MB_ICONEXCLAMATION $(inst_already_running) /SD IDOK
-    SetErrorLevel 183 # WinError.h: `ERROR_ALREADY_EXISTS`
-    Abort
-
-  isUniqueInstance:
 
   !insertmacro Init "installer"
   !insertmacro MUI_LANGDLL_DISPLAY

src/app/upgrade.cpp

@@ -32,7 +32,7 @@
 #include <QCoreApplication>
 #include <QMetaEnum>
 
-#include "base/bittorrent/sharelimitaction.h"
+#include "base/bittorrent/sharelimits.h"
 #include "base/bittorrent/torrentcontentlayout.h"
 #include "base/global.h"
 #include "base/logger.h"

src/base/CMakeLists.txt

@@ -34,7 +34,7 @@ add_library(qbt_base STATIC
     bittorrent/session.h
     bittorrent/sessionimpl.h
     bittorrent/sessionstatus.h
-    bittorrent/sharelimitaction.h
+    bittorrent/sharelimits.h
     bittorrent/speedmonitor.h
     bittorrent/sslparameters.h
     bittorrent/torrent.h

src/base/bittorrent/addtorrentparams.cpp

@@ -125,9 +125,9 @@ BitTorrent::AddTorrentParams BitTorrent::parseAddTorrentParams(const QJsonObject
         .useAutoTMM = getOptionalBool(jsonObj, PARAM_AUTOTMM),
         .uploadLimit = jsonObj.value(PARAM_UPLOADLIMIT).toInt(-1),
         .downloadLimit = jsonObj.value(PARAM_DOWNLOADLIMIT).toInt(-1),
-        .seedingTimeLimit = jsonObj.value(PARAM_SEEDINGTIMELIMIT).toInt(Torrent::USE_GLOBAL_SEEDING_TIME),
+        .seedingTimeLimit = jsonObj.value(PARAM_SEEDINGTIMELIMIT).toInt(DEFAULT_SEEDING_TIME_LIMIT),
-        .inactiveSeedingTimeLimit = jsonObj.value(PARAM_INACTIVESEEDINGTIMELIMIT).toInt(Torrent::USE_GLOBAL_INACTIVE_SEEDING_TIME),
+        .inactiveSeedingTimeLimit = jsonObj.value(PARAM_INACTIVESEEDINGTIMELIMIT).toInt(DEFAULT_SEEDING_TIME_LIMIT),
-        .ratioLimit = jsonObj.value(PARAM_RATIOLIMIT).toDouble(Torrent::USE_GLOBAL_RATIO),
+        .ratioLimit = jsonObj.value(PARAM_RATIOLIMIT).toDouble(DEFAULT_RATIO_LIMIT),
         .shareLimitAction = getEnum<ShareLimitAction>(jsonObj, PARAM_SHARELIMITACTION, ShareLimitAction::Default),
         .sslParameters =
         {

src/base/bittorrent/addtorrentparams.h

@@ -36,7 +36,7 @@
 
 #include "base/path.h"
 #include "base/tagset.h"
-#include "sharelimitaction.h"
+#include "sharelimits.h"
 #include "sslparameters.h"
 #include "torrent.h"
 #include "torrentcontentlayout.h"
@@ -68,9 +68,9 @@ namespace BitTorrent
         std::optional<bool> useAutoTMM;
         int uploadLimit = -1;
         int downloadLimit = -1;
-        int seedingTimeLimit = Torrent::USE_GLOBAL_SEEDING_TIME;
+        int seedingTimeLimit = DEFAULT_SEEDING_TIME_LIMIT;
-        int inactiveSeedingTimeLimit = Torrent::USE_GLOBAL_INACTIVE_SEEDING_TIME;
+        int inactiveSeedingTimeLimit = DEFAULT_SEEDING_TIME_LIMIT;
-        qreal ratioLimit = Torrent::USE_GLOBAL_RATIO;
+        qreal ratioLimit = DEFAULT_RATIO_LIMIT;
         ShareLimitAction shareLimitAction = ShareLimitAction::Default;
         SSLParameters sslParameters;
 

src/base/bittorrent/bencoderesumedatastorage.cpp

@@ -239,8 +239,8 @@ BitTorrent::LoadResumeDataResult BitTorrent::BencodeResumeDataStorage::loadTorre
     torrentParams.comment = fromLTString(resumeDataRoot.dict_find_string_value("qBt-comment"));
     torrentParams.hasFinishedStatus = resumeDataRoot.dict_find_int_value("qBt-seedStatus");
     torrentParams.firstLastPiecePriority = resumeDataRoot.dict_find_int_value("qBt-firstLastPiecePriority");
-    torrentParams.seedingTimeLimit = resumeDataRoot.dict_find_int_value("qBt-seedingTimeLimit", Torrent::USE_GLOBAL_SEEDING_TIME);
+    torrentParams.seedingTimeLimit = resumeDataRoot.dict_find_int_value("qBt-seedingTimeLimit", DEFAULT_SEEDING_TIME_LIMIT);
-    torrentParams.inactiveSeedingTimeLimit = resumeDataRoot.dict_find_int_value("qBt-inactiveSeedingTimeLimit", Torrent::USE_GLOBAL_INACTIVE_SEEDING_TIME);
+    torrentParams.inactiveSeedingTimeLimit = resumeDataRoot.dict_find_int_value("qBt-inactiveSeedingTimeLimit", DEFAULT_SEEDING_TIME_LIMIT);
     torrentParams.shareLimitAction = Utils::String::toEnum(
             fromLTString(resumeDataRoot.dict_find_string_value("qBt-shareLimitAction")), ShareLimitAction::Default);
 
@@ -283,7 +283,7 @@ BitTorrent::LoadResumeDataResult BitTorrent::BencodeResumeDataStorage::loadTorre
 
     const lt::string_view ratioLimitString = resumeDataRoot.dict_find_string_value("qBt-ratioLimit");
     if (ratioLimitString.empty())
-        torrentParams.ratioLimit = resumeDataRoot.dict_find_int_value("qBt-ratioLimit", Torrent::USE_GLOBAL_RATIO * 1000) / 1000.0;
+        torrentParams.ratioLimit = resumeDataRoot.dict_find_int_value("qBt-ratioLimit", DEFAULT_RATIO_LIMIT * 1000) / 1000.0;
     else
         torrentParams.ratioLimit = fromLTString(ratioLimitString).toDouble();
 

src/base/bittorrent/categoryoptions.cpp

@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2021-2023  Vladimir Golovnev <glassez@yandex.ru>
+ * Copyright (C) 2021-2025  Vladimir Golovnev <glassez@yandex.ru>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -32,10 +32,16 @@
 #include <QJsonValue>
 
 #include "base/global.h"
+#include "base/utils/string.h"
 
 const QString OPTION_SAVEPATH = u"save_path"_s;
 const QString OPTION_DOWNLOADPATH = u"download_path"_s;
 
+const QString OPTION_RATIOLIMIT = u"ratio_limit"_s;
+const QString OPTION_SEEDINGTIMELIMIT = u"seeding_time_limit"_s;
+const QString OPTION_INACTIVESEEDINGTIMELIMIT = u"inactive_seeding_time_limit"_s;
+const QString OPTION_SHARELIMITACTION = u"share_limit_action"_s;
+
 BitTorrent::CategoryOptions BitTorrent::CategoryOptions::fromJSON(const QJsonObject &jsonObj)
 {
     CategoryOptions options;
@@ -47,6 +53,11 @@ BitTorrent::CategoryOptions BitTorrent::CategoryOptions::fromJSON(const QJsonObj
     else if (downloadPathValue.isString())
         options.downloadPath = {true, Path(downloadPathValue.toString())};
 
+    options.ratioLimit = jsonObj.value(OPTION_RATIOLIMIT).toDouble(DEFAULT_RATIO_LIMIT);
+    options.seedingTimeLimit = jsonObj.value(OPTION_SEEDINGTIMELIMIT).toInt(DEFAULT_SEEDING_TIME_LIMIT);
+    options.inactiveSeedingTimeLimit = jsonObj.value(OPTION_INACTIVESEEDINGTIMELIMIT).toInt(DEFAULT_SEEDING_TIME_LIMIT);
+    options.shareLimitAction = Utils::String::toEnum<ShareLimitAction>(jsonObj.value(OPTION_SHARELIMITACTION).toString(), ShareLimitAction::Default);
+
     return options;
 }
 
@@ -63,12 +74,10 @@ QJsonObject BitTorrent::CategoryOptions::toJSON() const
 
     return {
         {OPTION_SAVEPATH, savePath.data()},
-        {OPTION_DOWNLOADPATH, downloadPathValue}
+        {OPTION_DOWNLOADPATH, downloadPathValue},
+        {OPTION_RATIOLIMIT, ratioLimit},
+        {OPTION_SEEDINGTIMELIMIT, seedingTimeLimit},
+        {OPTION_INACTIVESEEDINGTIMELIMIT, inactiveSeedingTimeLimit},
+        {OPTION_SHARELIMITACTION, Utils::String::fromEnum(shareLimitAction)}
     };
 }
-
-bool BitTorrent::operator==(const BitTorrent::CategoryOptions &left, const BitTorrent::CategoryOptions &right)
-{
-    return ((left.savePath == right.savePath)
-            && (left.downloadPath == right.downloadPath));
-}

src/base/bittorrent/categoryoptions.h

@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2021-2023  Vladimir Golovnev <glassez@yandex.ru>
+ * Copyright (C) 2021-2025  Vladimir Golovnev <glassez@yandex.ru>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -34,6 +34,7 @@
 
 #include "base/path.h"
 #include "downloadpathoption.h"
+#include "sharelimits.h"
 
 class QJsonObject;
 
@@ -44,9 +45,14 @@ namespace BitTorrent
         Path savePath;
         std::optional<DownloadPathOption> downloadPath;
 
+        qreal ratioLimit = DEFAULT_RATIO_LIMIT;
+        int seedingTimeLimit = DEFAULT_SEEDING_TIME_LIMIT;
+        int inactiveSeedingTimeLimit = DEFAULT_SEEDING_TIME_LIMIT;
+        ShareLimitAction shareLimitAction = ShareLimitAction::Default;
+
         static CategoryOptions fromJSON(const QJsonObject &jsonObj);
         QJsonObject toJSON() const;
-    };
 
-    bool operator==(const CategoryOptions &left, const CategoryOptions &right);
+        friend bool operator==(const CategoryOptions &, const CategoryOptions &) = default;
+    };
 }

src/base/bittorrent/loadtorrentparams.h

@@ -34,7 +34,7 @@
 
 #include "base/path.h"
 #include "base/tagset.h"
-#include "sharelimitaction.h"
+#include "sharelimits.h"
 #include "sslparameters.h"
 #include "torrent.h"
 #include "torrentcontentlayout.h"
@@ -61,9 +61,9 @@ namespace BitTorrent
 
         bool addToQueueTop = false; // only for new torrents
 
-        qreal ratioLimit = Torrent::USE_GLOBAL_RATIO;
+        qreal ratioLimit = DEFAULT_RATIO_LIMIT;
-        int seedingTimeLimit = Torrent::USE_GLOBAL_SEEDING_TIME;
+        int seedingTimeLimit = DEFAULT_SEEDING_TIME_LIMIT;
-        int inactiveSeedingTimeLimit = Torrent::USE_GLOBAL_INACTIVE_SEEDING_TIME;
+        int inactiveSeedingTimeLimit = DEFAULT_SEEDING_TIME_LIMIT;
         ShareLimitAction shareLimitAction = ShareLimitAction::Default;
 
         SSLParameters sslParameters;

src/base/bittorrent/session.h

@@ -37,7 +37,7 @@
 #include "addtorrenterror.h"
 #include "addtorrentparams.h"
 #include "categoryoptions.h"
-#include "sharelimitaction.h"
+#include "sharelimits.h"
 #include "torrentcontentremoveoption.h"
 #include "trackerentry.h"
 #include "trackerentrystatus.h"
@@ -158,15 +158,17 @@ namespace BitTorrent
 
         virtual QStringList categories() const = 0;
         virtual CategoryOptions categoryOptions(const QString &categoryName) const = 0;
+        virtual bool setCategoryOptions(const QString &categoryName, const CategoryOptions &options) = 0;
         virtual Path categorySavePath(const QString &categoryName) const = 0;
         virtual Path categorySavePath(const QString &categoryName, const CategoryOptions &options) const = 0;
         virtual Path categoryDownloadPath(const QString &categoryName) const = 0;
         virtual Path categoryDownloadPath(const QString &categoryName, const CategoryOptions &options) const = 0;
+        virtual qreal categoryRatioLimit(const QString &categoryName) const = 0;
+        virtual int categorySeedingTimeLimit(const QString &categoryName) const = 0;
+        virtual int categoryInactiveSeedingTimeLimit(const QString &categoryName) const = 0;
+        virtual ShareLimitAction categoryShareLimitAction(const QString &categoryName) const = 0;
         virtual bool addCategory(const QString &name, const CategoryOptions &options = {}) = 0;
-        virtual bool editCategory(const QString &name, const CategoryOptions &options) = 0;
         virtual bool removeCategory(const QString &name) = 0;
-        virtual bool isSubcategoriesEnabled() const = 0;
-        virtual void setSubcategoriesEnabled(bool value) = 0;
         virtual bool useCategoryPathsInManualMode() const = 0;
         virtual void setUseCategoryPathsInManualMode(bool value) = 0;
 
@@ -385,8 +387,8 @@ namespace BitTorrent
         virtual void setOutgoingPortsMax(int max) = 0;
         virtual int UPnPLeaseDuration() const = 0;
         virtual void setUPnPLeaseDuration(int duration) = 0;
-        virtual int peerToS() const = 0;
+        virtual int peerDSCP() const = 0;
-        virtual void setPeerToS(int value) = 0;
+        virtual void setPeerDSCP(int value) = 0;
         virtual bool ignoreLimitsOnLAN() const = 0;
         virtual void setIgnoreLimitsOnLAN(bool ignore) = 0;
         virtual bool includeOverheadInLimits() const = 0;

src/base/bittorrent/sessionimpl.cpp

@@ -484,7 +484,7 @@ SessionImpl::SessionImpl(QObject *parent)
     , m_outgoingPortsMin(BITTORRENT_SESSION_KEY(u"OutgoingPortsMin"_s), 0)
     , m_outgoingPortsMax(BITTORRENT_SESSION_KEY(u"OutgoingPortsMax"_s), 0)
     , m_UPnPLeaseDuration(BITTORRENT_SESSION_KEY(u"UPnPLeaseDuration"_s), 0)
-    , m_peerToS(BITTORRENT_SESSION_KEY(u"PeerToS"_s), 0x04)
+    , m_peerDSCP(BITTORRENT_SESSION_KEY(u"PeerToS"_s), 0x01)
     , m_ignoreLimitsOnLAN(BITTORRENT_SESSION_KEY(u"IgnoreLimitsOnLAN"_s), false)
     , m_includeOverheadInLimits(BITTORRENT_SESSION_KEY(u"IncludeOverheadInLimits"_s), false)
     , m_announceIP(BITTORRENT_SESSION_KEY(u"AnnounceIP"_s))
@@ -513,9 +513,9 @@ SessionImpl::SessionImpl(QObject *parent)
     , m_additionalTrackersURL(BITTORRENT_SESSION_KEY(u"AdditionalTrackersURL"_s))
     , m_globalMaxRatio(BITTORRENT_SESSION_KEY(u"GlobalMaxRatio"_s), -1, [](qreal r) { return r < 0 ? -1. : r; })
     , m_globalMaxSeedingMinutes(BITTORRENT_SESSION_KEY(u"GlobalMaxSeedingMinutes"_s)
-        , Torrent::NO_SEEDING_TIME_LIMIT, lowerLimited(Torrent::NO_SEEDING_TIME_LIMIT))
+        , NO_SEEDING_TIME_LIMIT, lowerLimited(NO_SEEDING_TIME_LIMIT))
     , m_globalMaxInactiveSeedingMinutes(BITTORRENT_SESSION_KEY(u"GlobalMaxInactiveSeedingMinutes"_s)
-        , Torrent::NO_INACTIVE_SEEDING_TIME_LIMIT, lowerLimited(Torrent::NO_INACTIVE_SEEDING_TIME_LIMIT))
+        , NO_SEEDING_TIME_LIMIT, lowerLimited(NO_SEEDING_TIME_LIMIT))
     , m_isAddTorrentToQueueTop(BITTORRENT_SESSION_KEY(u"AddTorrentToTopOfQueue"_s), false)
     , m_isAddTorrentStopped(BITTORRENT_SESSION_KEY(u"AddTorrentStopped"_s), false)
     , m_torrentStopCondition(BITTORRENT_SESSION_KEY(u"TorrentStopCondition"_s), Torrent::StopCondition::None)
@@ -555,7 +555,6 @@ SessionImpl::SessionImpl(QObject *parent)
     , m_savePath(BITTORRENT_SESSION_KEY(u"DefaultSavePath"_s), specialFolderLocation(SpecialFolder::Downloads))
     , m_downloadPath(BITTORRENT_SESSION_KEY(u"TempPath"_s), (savePath() / Path(u"temp"_s)))
     , m_isDownloadPathEnabled(BITTORRENT_SESSION_KEY(u"TempPathEnabled"_s), false)
-    , m_isSubcategoriesEnabled(BITTORRENT_SESSION_KEY(u"SubcategoriesEnabled"_s), false)
     , m_useCategoryPathsInManualMode(BITTORRENT_SESSION_KEY(u"UseCategoryPathsInManualMode"_s), false)
     , m_isAutoTMMDisabledByDefault(BITTORRENT_SESSION_KEY(u"DisableAutoTMMByDefault"_s), true)
     , m_isDisableAutoTMMWhenCategoryChanged(BITTORRENT_SESSION_KEY(u"DisableAutoTMMTriggers/CategoryChanged"_s), false)
@@ -626,11 +625,6 @@ SessionImpl::SessionImpl(QObject *parent)
         enableBandwidthScheduler();
 
     loadCategories();
-    if (isSubcategoriesEnabled())
-    {
-        // if subcategories support changed manually
-        m_categories = expandCategories(m_categories);
-    }
 
     const QStringList storedTags = m_storedTags.get();
     for (const QString &tagStr : storedTags)
@@ -938,15 +932,8 @@ Path SessionImpl::categorySavePath(const QString &categoryName, const CategoryOp
     if (path.isEmpty())
     {
         // use implicit save path
-        if (isSubcategoriesEnabled())
+        path = Utils::Fs::toValidPath(subcategoryName(categoryName));
-        {
+        basePath = categorySavePath(parentCategoryName(categoryName));
-            path = Utils::Fs::toValidPath(subcategoryName(categoryName));
-            basePath = categorySavePath(parentCategoryName(categoryName));
-        }
-        else
-        {
-            path = Utils::Fs::toValidPath(categoryName);
-        }
     }
 
     return (path.isAbsolute() ? path : (basePath / path));
@@ -966,8 +953,7 @@ Path SessionImpl::categoryDownloadPath(const QString &categoryName, const Catego
     if (categoryName.isEmpty())
         return downloadPath();
 
-    const bool useSubcategories = isSubcategoriesEnabled();
+    const QString name = subcategoryName(categoryName);
-    const QString name = useSubcategories ? subcategoryName(categoryName) : categoryName;
     const Path path = !downloadPathOption.path.isEmpty()
             ? downloadPathOption.path
             : Utils::Fs::toValidPath(name); // use implicit download path
@@ -975,7 +961,7 @@ Path SessionImpl::categoryDownloadPath(const QString &categoryName, const Catego
     if (path.isAbsolute())
         return path;
 
-    const QString parentName = useSubcategories ? parentCategoryName(categoryName) : QString();
+    const QString parentName = parentCategoryName(categoryName);
     CategoryOptions parentOptions = categoryOptions(parentName);
     // Even if download path of parent category is disabled (directly or by inheritance)
     // we need to construct the one as if it would be enabled.
@@ -986,6 +972,62 @@ Path SessionImpl::categoryDownloadPath(const QString &categoryName, const Catego
     return (basePath / path);
 }
 
+qreal SessionImpl::categoryRatioLimit(const QString &categoryName) const
+{
+    if (categoryName.isEmpty())
+        return globalMaxRatio();
+
+    if (const auto ratioLimit = categoryOptions(categoryName).ratioLimit;
+            ratioLimit != DEFAULT_RATIO_LIMIT)
+    {
+        return ratioLimit;
+    }
+
+    return categoryRatioLimit(parentCategoryName(categoryName));
+}
+
+int SessionImpl::categorySeedingTimeLimit(const QString &categoryName) const
+{
+    if (categoryName.isEmpty())
+        return globalMaxSeedingMinutes();
+
+    if (const auto seedingTimeLimit = categoryOptions(categoryName).seedingTimeLimit;
+            seedingTimeLimit != DEFAULT_SEEDING_TIME_LIMIT)
+    {
+        return seedingTimeLimit;
+    }
+
+    return categorySeedingTimeLimit(parentCategoryName(categoryName));
+}
+
+int SessionImpl::categoryInactiveSeedingTimeLimit(const QString &categoryName) const
+{
+    if (categoryName.isEmpty())
+        return globalMaxInactiveSeedingMinutes();
+
+    if (const auto inactiveSeedingTimeLimit = categoryOptions(categoryName).inactiveSeedingTimeLimit;
+            inactiveSeedingTimeLimit != DEFAULT_SEEDING_TIME_LIMIT)
+    {
+        return inactiveSeedingTimeLimit;
+    }
+
+    return categoryInactiveSeedingTimeLimit(parentCategoryName(categoryName));
+}
+
+ShareLimitAction SessionImpl::categoryShareLimitAction(const QString &categoryName) const
+{
+    if (categoryName.isEmpty())
+        return shareLimitAction();
+
+    if (const auto shareLimitAction = categoryOptions(categoryName).shareLimitAction;
+            shareLimitAction != ShareLimitAction::Default)
+    {
+        return shareLimitAction;
+    }
+
+    return categoryShareLimitAction(parentCategoryName(categoryName));
+}
+
 DownloadPathOption SessionImpl::resolveCategoryDownloadPathOption(const QString &categoryName, const std::optional<DownloadPathOption> &option) const
 {
     if (categoryName.isEmpty())
@@ -994,7 +1036,7 @@ DownloadPathOption SessionImpl::resolveCategoryDownloadPathOption(const QString
     if (option.has_value())
         return *option;
 
-    const QString parentName = isSubcategoriesEnabled() ? parentCategoryName(categoryName) : QString();
+    const QString parentName = parentCategoryName(categoryName);
     return resolveCategoryDownloadPathOption(parentName, categoryOptions(parentName).downloadPath);
 }
 
@@ -1006,15 +1048,12 @@ bool SessionImpl::addCategory(const QString &name, const CategoryOptions &option
     if (!isValidCategoryName(name) || m_categories.contains(name))
         return false;
 
-    if (isSubcategoriesEnabled())
+    for (const QString &parent : asConst(expandCategory(name)))
     {
-        for (const QString &parent : asConst(expandCategory(name)))
+        if ((parent != name) && !m_categories.contains(parent))
         {
-            if ((parent != name) && !m_categories.contains(parent))
+            m_categories[parent] = {};
-            {
+            emit categoryAdded(parent);
-                m_categories[parent] = {};
-                emit categoryAdded(parent);
-            }
         }
     }
 
@@ -1025,9 +1064,9 @@ bool SessionImpl::addCategory(const QString &name, const CategoryOptions &option
     return true;
 }
 
-bool SessionImpl::editCategory(const QString &name, const CategoryOptions &options)
+bool SessionImpl::setCategoryOptions(const QString &categoryName, const CategoryOptions &options)
 {
-    const auto it = m_categories.find(name);
+    const auto it = m_categories.find(categoryName);
     if (it == m_categories.end())
         return false;
 
@@ -1035,14 +1074,15 @@ bool SessionImpl::editCategory(const QString &name, const CategoryOptions &optio
     if (options == currentOptions)
         return false;
 
-    if (isDisableAutoTMMWhenCategorySavePathChanged())
+    if (isDisableAutoTMMWhenCategorySavePathChanged()
+            && ((options.savePath != currentOptions.savePath) || (options.downloadPath != currentOptions.downloadPath)))
     {
         // This should be done before changing the category options
         // to prevent the torrent from being moved at the new save path.
 
         for (TorrentImpl *const torrent : asConst(m_torrents))
         {
-            if (torrent->category() == name)
+            if (torrent->category() == categoryName)
                 torrent->setAutoTMMEnabled(false);
         }
     }
@@ -1052,39 +1092,37 @@ bool SessionImpl::editCategory(const QString &name, const CategoryOptions &optio
 
     for (TorrentImpl *const torrent : asConst(m_torrents))
     {
-        if (torrent->category() == name)
+        if (torrent->category() == categoryName)
             torrent->handleCategoryOptionsChanged();
     }
 
-    emit categoryOptionsChanged(name);
+    emit categoryOptionsChanged(categoryName);
     return true;
 }
 
 bool SessionImpl::removeCategory(const QString &name)
 {
+    const QString parentCategory = parentCategoryName(name);
     for (TorrentImpl *const torrent : asConst(m_torrents))
     {
         if (torrent->belongsToCategory(name))
-            torrent->setCategory(u""_s);
+            torrent->setCategory(parentCategory);
     }
 
     // remove stored category and its subcategories if exist
     bool result = false;
-    if (isSubcategoriesEnabled())
+    // remove subcategories
+    const QString test = name + u'/';
+    Algorithm::removeIf(m_categories, [this, &test, &result](const QString &category, const CategoryOptions &)
     {
-        // remove subcategories
+        if (category.startsWith(test))
-        const QString test = name + u'/';
-        Algorithm::removeIf(m_categories, [this, &test, &result](const QString &category, const CategoryOptions &)
         {
-            if (category.startsWith(test))
+            result = true;
-            {
+            emit categoryRemoved(category);
-                result = true;
+            return true;
-                emit categoryRemoved(category);
+        }
-                return true;
+        return false;
-            }
+    });
-            return false;
-        });
-    }
 
     result = (m_categories.remove(name) > 0) || result;
 
@@ -1098,32 +1136,6 @@ bool SessionImpl::removeCategory(const QString &name)
     return result;
 }
 
-bool SessionImpl::isSubcategoriesEnabled() const
-{
-    return m_isSubcategoriesEnabled;
-}
-
-void SessionImpl::setSubcategoriesEnabled(const bool value)
-{
-    if (isSubcategoriesEnabled() == value) return;
-
-    if (value)
-    {
-        // expand categories to include all parent categories
-        m_categories = expandCategories(m_categories);
-        // update stored categories
-        storeCategories();
-    }
-    else
-    {
-        // reload categories
-        loadCategories();
-    }
-
-    m_isSubcategoriesEnabled = value;
-    emit subcategoriesSupportChanged();
-}
-
 bool SessionImpl::useCategoryPathsInManualMode() const
 {
     return m_useCategoryPathsInManualMode;
@@ -1281,7 +1293,7 @@ qreal SessionImpl::globalMaxRatio() const
 void SessionImpl::setGlobalMaxRatio(qreal ratio)
 {
     if (ratio < 0)
-        ratio = Torrent::NO_RATIO_LIMIT;
+        ratio = NO_RATIO_LIMIT;
 
     if (ratio != globalMaxRatio())
     {
@@ -1297,7 +1309,7 @@ int SessionImpl::globalMaxSeedingMinutes() const
 
 void SessionImpl::setGlobalMaxSeedingMinutes(int minutes)
 {
-    minutes = std::max(minutes, Torrent::NO_SEEDING_TIME_LIMIT);
+    minutes = std::max(minutes, NO_SEEDING_TIME_LIMIT);
 
     if (minutes != globalMaxSeedingMinutes())
     {
@@ -1313,7 +1325,7 @@ int SessionImpl::globalMaxInactiveSeedingMinutes() const
 
 void SessionImpl::setGlobalMaxInactiveSeedingMinutes(int minutes)
 {
-    minutes = std::max(minutes, Torrent::NO_INACTIVE_SEEDING_TIME_LIMIT);
+    minutes = std::max(minutes, NO_SEEDING_TIME_LIMIT);
 
     if (minutes != globalMaxInactiveSeedingMinutes())
     {
@@ -2057,7 +2069,7 @@ lt::settings_pack SessionImpl::loadLTSettings() const
     // UPnP lease duration
     settingsPack.set_int(lt::settings_pack::upnp_lease_duration, UPnPLeaseDuration());
     // Type of service
-    settingsPack.set_int(lt::settings_pack::peer_tos, peerToS());
+    settingsPack.set_int(lt::settings_pack::peer_dscp, peerDSCP());
     // Include overhead in transfer limits
     settingsPack.set_bool(lt::settings_pack::rate_limit_ip_overhead, includeOverheadInLimits());
     // IP address to announce to trackers
@@ -2356,14 +2368,9 @@ void SessionImpl::processTorrentShareLimits(TorrentImpl *torrent)
     if (!torrent->isFinished() || torrent->isForced())
         return;
 
-    const auto effectiveLimit = []<typename T>(const T limit, const T useGlobalLimit, const T globalLimit) -> T
+    const qreal ratioLimit = torrent->effectiveRatioLimit();
-    {
+    const int seedingTimeLimit = torrent->effectiveSeedingTimeLimit();
-        return (limit == useGlobalLimit) ? globalLimit : limit;
+    const int inactiveSeedingTimeLimit = torrent->effectiveInactiveSeedingTimeLimit();
-    };
-
-    const qreal ratioLimit = effectiveLimit(torrent->ratioLimit(), Torrent::USE_GLOBAL_RATIO, globalMaxRatio());
-    const int seedingTimeLimit = effectiveLimit(torrent->seedingTimeLimit(), Torrent::USE_GLOBAL_SEEDING_TIME, globalMaxSeedingMinutes());
-    const int inactiveSeedingTimeLimit = effectiveLimit(torrent->inactiveSeedingTimeLimit(), Torrent::USE_GLOBAL_INACTIVE_SEEDING_TIME, globalMaxInactiveSeedingMinutes());
 
     bool reached = false;
     QString description;
@@ -2390,7 +2397,7 @@ void SessionImpl::processTorrentShareLimits(TorrentImpl *torrent)
     if (reached)
     {
         const QString torrentName = tr("Torrent: \"%1\".").arg(torrent->name());
-        const ShareLimitAction shareLimitAction = (torrent->shareLimitAction() == ShareLimitAction::Default) ? m_shareLimitAction : torrent->shareLimitAction();
+        const ShareLimitAction shareLimitAction = torrent->effectiveShareLimitAction();
 
         if (shareLimitAction == ShareLimitAction::Remove)
         {
@@ -4882,17 +4889,17 @@ void SessionImpl::setUPnPLeaseDuration(const int duration)
     }
 }
 
-int SessionImpl::peerToS() const
+int SessionImpl::peerDSCP() const
 {
-    return m_peerToS;
+    return m_peerDSCP;
 }
 
-void SessionImpl::setPeerToS(const int value)
+void SessionImpl::setPeerDSCP(const int value)
 {
-    if (value == m_peerToS)
+    if (value == m_peerDSCP)
         return;
 
-    m_peerToS = value;
+    m_peerDSCP = value;
     configureDeferred();
 }
 
@@ -5218,9 +5225,9 @@ bool SessionImpl::isKnownTorrent(const InfoHash &infoHash) const
 
 void SessionImpl::updateSeedingLimitTimer()
 {
-    if ((globalMaxRatio() == Torrent::NO_RATIO_LIMIT) && !hasPerTorrentRatioLimit()
+    if ((globalMaxRatio() == NO_RATIO_LIMIT) && !hasPerTorrentRatioLimit()
-        && (globalMaxSeedingMinutes() == Torrent::NO_SEEDING_TIME_LIMIT) && !hasPerTorrentSeedingTimeLimit()
+        && (globalMaxSeedingMinutes() == NO_SEEDING_TIME_LIMIT) && !hasPerTorrentSeedingTimeLimit()
-        && (globalMaxInactiveSeedingMinutes() == Torrent::NO_INACTIVE_SEEDING_TIME_LIMIT) && !hasPerTorrentInactiveSeedingTimeLimit())
+        && (globalMaxInactiveSeedingMinutes() == NO_SEEDING_TIME_LIMIT) && !hasPerTorrentInactiveSeedingTimeLimit())
     {
         if (m_seedingLimitTimer->isActive())
             m_seedingLimitTimer->stop();
@@ -5584,6 +5591,8 @@ void SessionImpl::loadCategories()
         const auto categoryOptions = CategoryOptions::fromJSON(it.value().toObject());
         m_categories[categoryName] = categoryOptions;
     }
+
+    m_categories = expandCategories(m_categories);
 }
 
 bool SessionImpl::hasPerTorrentRatioLimit() const

src/base/bittorrent/sessionimpl.h

@@ -149,15 +149,17 @@ namespace BitTorrent
 
         QStringList categories() const override;
         CategoryOptions categoryOptions(const QString &categoryName) const override;
+        bool setCategoryOptions(const QString &categoryName, const CategoryOptions &options) override;
         Path categorySavePath(const QString &categoryName) const override;
         Path categorySavePath(const QString &categoryName, const CategoryOptions &options) const override;
         Path categoryDownloadPath(const QString &categoryName) const override;
         Path categoryDownloadPath(const QString &categoryName, const CategoryOptions &options) const override;
+        qreal categoryRatioLimit(const QString &categoryName) const override;
+        int categorySeedingTimeLimit(const QString &categoryName) const override;
+        int categoryInactiveSeedingTimeLimit(const QString &categoryName) const override;
+        ShareLimitAction categoryShareLimitAction(const QString &categoryName) const override;
         bool addCategory(const QString &name, const CategoryOptions &options = {}) override;
-        bool editCategory(const QString &name, const CategoryOptions &options) override;
         bool removeCategory(const QString &name) override;
-        bool isSubcategoriesEnabled() const override;
-        void setSubcategoriesEnabled(bool value) override;
         bool useCategoryPathsInManualMode() const override;
         void setUseCategoryPathsInManualMode(bool value) override;
 
@@ -359,8 +361,8 @@ namespace BitTorrent
         void setOutgoingPortsMax(int max) override;
         int UPnPLeaseDuration() const override;
         void setUPnPLeaseDuration(int duration) override;
-        int peerToS() const override;
+        int peerDSCP() const override;
-        void setPeerToS(int value) override;
+        void setPeerDSCP(int value) override;
         bool ignoreLimitsOnLAN() const override;
         void setIgnoreLimitsOnLAN(bool ignore) override;
         bool includeOverheadInLimits() const override;
@@ -690,7 +692,7 @@ namespace BitTorrent
         CachedSettingValue<int> m_outgoingPortsMin;
         CachedSettingValue<int> m_outgoingPortsMax;
         CachedSettingValue<int> m_UPnPLeaseDuration;
-        CachedSettingValue<int> m_peerToS;
+        CachedSettingValue<int> m_peerDSCP;
         CachedSettingValue<bool> m_ignoreLimitsOnLAN;
         CachedSettingValue<bool> m_includeOverheadInLimits;
         CachedSettingValue<QString> m_announceIP;
@@ -754,7 +756,6 @@ namespace BitTorrent
         CachedSettingValue<Path> m_savePath;
         CachedSettingValue<Path> m_downloadPath;
         CachedSettingValue<bool> m_isDownloadPathEnabled;
-        CachedSettingValue<bool> m_isSubcategoriesEnabled;
         CachedSettingValue<bool> m_useCategoryPathsInManualMode;
         CachedSettingValue<bool> m_isAutoTMMDisabledByDefault;
         CachedSettingValue<bool> m_isDisableAutoTMMWhenCategoryChanged;

src/base/bittorrent/sharelimits.h

@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2015-2024  Vladimir Golovnev <glassez@yandex.ru>
+ * Copyright (C) 2015-2025  Vladimir Golovnev <glassez@yandex.ru>
  * Copyright (C) 2006  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
@@ -33,6 +33,12 @@
 
 namespace BitTorrent
 {
+    inline const qreal DEFAULT_RATIO_LIMIT = -2;
+    inline const qreal NO_RATIO_LIMIT = -1;
+
+    inline const int DEFAULT_SEEDING_TIME_LIMIT = -2;
+    inline const int NO_SEEDING_TIME_LIMIT = -1;
+
     // Using `Q_ENUM_NS()` without a wrapper namespace in our case is not advised
     // since `Q_NAMESPACE` cannot be used when the same namespace resides at different files.
     // https://www.kdab.com/new-qt-5-8-meta-object-support-namespaces/#comment-143779

src/base/bittorrent/torrent.cpp

@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2015  Vladimir Golovnev <glassez@yandex.ru>
+ * Copyright (C) 2015-2025  Vladimir Golovnev <glassez@yandex.ru>
  * Copyright (C) 2006  Christophe Dumez <chris@qbittorrent.org>
  *
  * This program is free software; you can redistribute it and/or
@@ -44,15 +44,6 @@ namespace BitTorrent
 
     // Torrent
 
-    const qreal Torrent::USE_GLOBAL_RATIO = -2;
-    const qreal Torrent::NO_RATIO_LIMIT = -1;
-
-    const int Torrent::USE_GLOBAL_SEEDING_TIME = -2;
-    const int Torrent::NO_SEEDING_TIME_LIMIT = -1;
-
-    const int Torrent::USE_GLOBAL_INACTIVE_SEEDING_TIME = -2;
-    const int Torrent::NO_INACTIVE_SEEDING_TIME_LIMIT = -1;
-
     const qreal Torrent::MAX_RATIO = std::numeric_limits<qreal>::infinity();
 
     TorrentID Torrent::id() const

src/base/bittorrent/torrent.h

@@ -37,7 +37,7 @@
 #include "base/3rdparty/expected.hpp"
 #include "base/pathfwd.h"
 #include "base/tagset.h"
-#include "sharelimitaction.h"
+#include "sharelimits.h"
 #include "torrentannouncestatus.h"
 #include "torrentcontenthandler.h"
 
@@ -125,15 +125,6 @@ namespace BitTorrent
         };
         Q_ENUM(StopCondition)
 
-        static const qreal USE_GLOBAL_RATIO;
-        static const qreal NO_RATIO_LIMIT;
-
-        static const int USE_GLOBAL_SEEDING_TIME;
-        static const int NO_SEEDING_TIME_LIMIT;
-
-        static const int USE_GLOBAL_INACTIVE_SEEDING_TIME;
-        static const int NO_INACTIVE_SEEDING_TIME_LIMIT;
-
         static const qreal MAX_RATIO;
 
         using TorrentContentHandler::TorrentContentHandler;
@@ -236,6 +227,10 @@ namespace BitTorrent
         virtual void setInactiveSeedingTimeLimit(int limit) = 0;
         virtual ShareLimitAction shareLimitAction() const = 0;
         virtual void setShareLimitAction(ShareLimitAction action) = 0;
+        virtual qreal effectiveRatioLimit() const = 0;
+        virtual int effectiveSeedingTimeLimit() const = 0;
+        virtual int effectiveInactiveSeedingTimeLimit() const = 0;
+        virtual ShareLimitAction effectiveShareLimitAction() const = 0;
 
         virtual PathList filePaths() const = 0;
         virtual PathList actualFilePaths() const = 0;
@@ -279,9 +274,6 @@ namespace BitTorrent
         virtual bool isLSDDisabled() const = 0;
         virtual QBitArray pieces() const = 0;
         virtual qreal distributedCopies() const = 0;
-        virtual qreal maxRatio() const = 0;
-        virtual int maxSeedingTime() const = 0;
-        virtual int maxInactiveSeedingTime() const = 0;
         virtual qreal realRatio() const = 0;
         virtual qreal popularity() const = 0;
         virtual int uploadPayloadRate() const = 0;

src/base/bittorrent/torrentimpl.cpp

@@ -700,6 +700,7 @@ void TorrentImpl::removeTrackers(const QStringList &trackers)
     if (!removedTrackers.isEmpty())
     {
         m_nativeHandle.replace_trackers(nativeTrackers);
+        m_announceStatus.reset();
 
         deferredRequestResumeData();
         m_session->handleTorrentTrackersRemoved(this, removedTrackers);
@@ -727,6 +728,7 @@ void TorrentImpl::replaceTrackers(QList<TrackerEntry> trackers)
     }
 
     m_nativeHandle.replace_trackers(nativeTrackers);
+    m_announceStatus.reset();
 
     // Clear the peer list if it's a private torrent since
     // we do not want to keep connecting with peers from old tracker.
@@ -934,7 +936,7 @@ bool TorrentImpl::belongsToCategory(const QString &category) const
     if (m_category == category)
         return true;
 
-    return (m_session->isSubcategoriesEnabled() && m_category.startsWith(category + u'/'));
+    return m_category.startsWith(category + u'/');
 }
 
 TagSet TorrentImpl::tags() const
@@ -1338,16 +1340,16 @@ qlonglong TorrentImpl::eta() const
 
     if (isFinished())
     {
-        const qreal maxRatioValue = maxRatio();
+        const qreal maxRatioValue = effectiveRatioLimit();
-        const int maxSeedingTimeValue = maxSeedingTime();
+        const int maxSeedingTimeValue = effectiveSeedingTimeLimit();
-        const int maxInactiveSeedingTimeValue = maxInactiveSeedingTime();
+        const int maxInactiveSeedingTimeValue = effectiveInactiveSeedingTimeLimit();
-        if ((maxRatioValue < 0) && (maxSeedingTimeValue < 0) && (maxInactiveSeedingTimeValue < 0)) return MAX_ETA;
+        if ((maxRatioValue < 0) && (maxSeedingTimeValue < 0) && (maxInactiveSeedingTimeValue < 0))
+            return MAX_ETA;
 
         qlonglong ratioEta = MAX_ETA;
 
         if ((speedAverage.upload > 0) && (maxRatioValue >= 0))
         {
-
             qlonglong realDL = totalDownload();
             if (realDL <= 0)
                 realDL = wantedSize();
@@ -1479,30 +1481,38 @@ qreal TorrentImpl::distributedCopies() const
     return m_nativeStatus.distributed_copies;
 }
 
-qreal TorrentImpl::maxRatio() const
+qreal TorrentImpl::effectiveRatioLimit() const
 {
-    if (m_ratioLimit == USE_GLOBAL_RATIO)
+    if (m_ratioLimit == DEFAULT_RATIO_LIMIT)
-        return m_session->globalMaxRatio();
+        return m_session->categoryRatioLimit(category());
 
     return m_ratioLimit;
 }
 
-int TorrentImpl::maxSeedingTime() const
+int TorrentImpl::effectiveSeedingTimeLimit() const
 {
-    if (m_seedingTimeLimit == USE_GLOBAL_SEEDING_TIME)
+    if (m_seedingTimeLimit == DEFAULT_SEEDING_TIME_LIMIT)
-        return m_session->globalMaxSeedingMinutes();
+        return m_session->categorySeedingTimeLimit(category());
 
     return m_seedingTimeLimit;
 }
 
-int TorrentImpl::maxInactiveSeedingTime() const
+int TorrentImpl::effectiveInactiveSeedingTimeLimit() const
 {
-    if (m_inactiveSeedingTimeLimit == USE_GLOBAL_INACTIVE_SEEDING_TIME)
+    if (m_inactiveSeedingTimeLimit == DEFAULT_SEEDING_TIME_LIMIT)
-        return m_session->globalMaxInactiveSeedingMinutes();
+        return m_session->categoryInactiveSeedingTimeLimit(category());
 
     return m_inactiveSeedingTimeLimit;
 }
 
+ShareLimitAction TorrentImpl::effectiveShareLimitAction() const
+{
+    if (m_shareLimitAction == ShareLimitAction::Default)
+        return m_session->categoryShareLimitAction(category());
+
+    return m_shareLimitAction;
+}
+
 qreal TorrentImpl::realRatio() const
 {
     const int64_t upload = m_nativeStatus.all_time_upload;
@@ -2623,7 +2633,7 @@ void TorrentImpl::updateProgress()
 
 void TorrentImpl::setRatioLimit(qreal limit)
 {
-    if (limit < USE_GLOBAL_RATIO)
+    if (limit < DEFAULT_RATIO_LIMIT)
         limit = NO_RATIO_LIMIT;
 
     if (m_ratioLimit != limit)
@@ -2636,7 +2646,7 @@ void TorrentImpl::setRatioLimit(qreal limit)
 
 void TorrentImpl::setSeedingTimeLimit(int limit)
 {
-    if (limit < USE_GLOBAL_SEEDING_TIME)
+    if (limit < DEFAULT_SEEDING_TIME_LIMIT)
         limit = NO_SEEDING_TIME_LIMIT;
 
     if (m_seedingTimeLimit != limit)
@@ -2649,8 +2659,8 @@ void TorrentImpl::setSeedingTimeLimit(int limit)
 
 void TorrentImpl::setInactiveSeedingTimeLimit(int limit)
 {
-    if (limit < USE_GLOBAL_INACTIVE_SEEDING_TIME)
+    if (limit < DEFAULT_SEEDING_TIME_LIMIT)
-        limit = NO_INACTIVE_SEEDING_TIME_LIMIT;
+        limit = NO_SEEDING_TIME_LIMIT;
 
     if (m_inactiveSeedingTimeLimit != limit)
     {

src/base/bittorrent/torrentimpl.h

@@ -156,6 +156,10 @@ namespace BitTorrent
         void setInactiveSeedingTimeLimit(int limit) override;
         ShareLimitAction shareLimitAction() const override;
         void setShareLimitAction(ShareLimitAction action) override;
+        qreal effectiveRatioLimit() const override;
+        int effectiveSeedingTimeLimit() const override;
+        int effectiveInactiveSeedingTimeLimit() const override;
+        ShareLimitAction effectiveShareLimitAction() const override;
 
         Path filePath(int index) const override;
         Path actualFilePath(int index) const override;
@@ -205,9 +209,6 @@ namespace BitTorrent
         bool isLSDDisabled() const override;
         QBitArray pieces() const override;
         qreal distributedCopies() const override;
-        qreal maxRatio() const override;
-        int maxSeedingTime() const override;
-        int maxInactiveSeedingTime() const override;
         qreal realRatio() const override;
         qreal popularity() const override;
         int uploadPayloadRate() const override;

src/base/search/searchdownloadhandler.cpp

@@ -54,6 +54,7 @@ SearchDownloadHandler::SearchDownloadHandler(const QString &pluginName, const QS
     const QStringList params
     {
         Utils::ForeignApps::PYTHON_ISOLATE_MODE_FLAG,
+        Utils::ForeignApps::PYTHON_UTF8_MODE_FLAG,
         (SearchPluginManager::engineLocation() / Path(u"nova2dl.py"_s)).toString(),
         pluginName,
         url

src/base/search/searchhandler.cpp

@@ -102,6 +102,7 @@ SearchHandler::SearchHandler(const QString &pattern, const QString &category, co
     const QStringList params
     {
         Utils::ForeignApps::PYTHON_ISOLATE_MODE_FLAG,
+        Utils::ForeignApps::PYTHON_UTF8_MODE_FLAG,
         (SearchPluginManager::engineLocation() / Path(u"nova2.py"_s)).toString(),
         m_usedPlugins.join(u','),
         m_category

src/base/search/searchpluginmanager.cpp

@@ -554,6 +554,7 @@ void SearchPluginManager::update()
     const QStringList params
     {
         Utils::ForeignApps::PYTHON_ISOLATE_MODE_FLAG,
+        Utils::ForeignApps::PYTHON_UTF8_MODE_FLAG,
         (engineLocation() / Path(u"/nova2.py"_s)).toString(),
         u"--capabilities"_s
     };

src/base/torrentfileswatcher.cpp

@@ -434,9 +434,9 @@ void TorrentFilesWatcher::Worker::processFolder(const Path &path, const Path &wa
             }
             else
             {
-                if (!m_failedTorrents.value(path).contains(filePath))
+                if (!m_failedTorrents.value(watchedFolderPath).contains(filePath))
                 {
-                    m_failedTorrents[path][filePath] = 0;
+                    m_failedTorrents[watchedFolderPath][filePath] = 0;
                 }
             }
         }
@@ -471,7 +471,7 @@ void TorrentFilesWatcher::Worker::processFailedTorrents()
                 BitTorrent::AddTorrentParams addTorrentParams = options.addTorrentParams;
                 if (torrentPath != watchedFolderPath)
                 {
-                    const Path subdirPath = watchedFolderPath.relativePathOf(torrentPath);
+                    const Path subdirPath = watchedFolderPath.relativePathOf(torrentPath).parentPath();
                     const bool useAutoTMM = addTorrentParams.useAutoTMM.value_or(!BitTorrent::Session::instance()->isAutoTMMDisabledByDefault());
                     if (useAutoTMM)
                     {

src/base/utils/foreignapps.h

@@ -38,6 +38,7 @@
 namespace Utils::ForeignApps
 {
     inline const QString PYTHON_ISOLATE_MODE_FLAG = u"-I"_s;
+    inline const QString PYTHON_UTF8_MODE_FLAG = u"-Xutf8=1"_s;
 
     struct PythonInfo
     {

src/base/version.h.in

@@ -32,7 +32,7 @@
 #define QBT_VERSION_MINOR 2
 #define QBT_VERSION_BUGFIX 0
 #define QBT_VERSION_BUILD 0
-#define QBT_VERSION_STATUS "alpha1"  // Should be empty for stable releases!
+#define QBT_VERSION_STATUS "beta1"  // Should be empty for stable releases!
 
 #define QBT__STRINGIFY(x) #x
 #define QBT_STRINGIFY(x) QBT__STRINGIFY(x)

src/gui/addtorrentparamswidget.cpp

@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2023  Vladimir Golovnev <glassez@yandex.ru>
+ * Copyright (C) 2023-2025  Vladimir Golovnev <glassez@yandex.ru>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -190,6 +190,7 @@ void AddTorrentParamsWidget::populate()
         }
 
         populateDefaultPaths();
+        resetShareLimitsWidgetDefaults();
     });
 
     m_ui->savePathEdit->disconnect(this);
@@ -241,7 +242,7 @@ void AddTorrentParamsWidget::populate()
 
     m_ui->startTorrentComboBox->disconnect(this);
     m_ui->startTorrentComboBox->setCurrentIndex(m_addTorrentParams.addStopped
-                                                    ? m_ui->startTorrentComboBox->findData(!*m_addTorrentParams.addStopped) : 0);
+            ? m_ui->startTorrentComboBox->findData(!*m_addTorrentParams.addStopped) : 0);
     connect(m_ui->startTorrentComboBox, &QComboBox::currentIndexChanged, this, [this]
     {
         const QVariant data = m_ui->startTorrentComboBox->currentData();
@@ -270,6 +271,7 @@ void AddTorrentParamsWidget::populate()
             m_addTorrentParams.addToQueueTop = data.toBool();
     });
 
+    resetShareLimitsWidgetDefaults();
     m_ui->torrentShareLimitsWidget->setRatioLimit(m_addTorrentParams.ratioLimit);
     m_ui->torrentShareLimitsWidget->setSeedingTimeLimit(m_addTorrentParams.seedingTimeLimit);
     m_ui->torrentShareLimitsWidget->setInactiveSeedingTimeLimit(m_addTorrentParams.inactiveSeedingTimeLimit);
@@ -418,3 +420,11 @@ void AddTorrentParamsWidget::populateSavePathOptions()
 
     populateDefaultPaths();
 }
+
+void AddTorrentParamsWidget::resetShareLimitsWidgetDefaults()
+{
+    const auto *btSession = BitTorrent::Session::instance();
+    m_ui->torrentShareLimitsWidget->setDefaults((m_addTorrentParams.category.isEmpty() ? TorrentShareLimitsWidget::UsedDefaults::Global : TorrentShareLimitsWidget::UsedDefaults::Category)
+            , btSession->categoryRatioLimit(m_addTorrentParams.category), btSession->categorySeedingTimeLimit(m_addTorrentParams.category)
+            , btSession->categoryInactiveSeedingTimeLimit(m_addTorrentParams.category), btSession->categoryShareLimitAction(m_addTorrentParams.category));
+}

src/gui/addtorrentparamswidget.h

@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2023  Vladimir Golovnev <glassez@yandex.ru>
+ * Copyright (C) 2023-2025  Vladimir Golovnev <glassez@yandex.ru>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -57,7 +57,7 @@ private:
     void populateDefaultPaths();
     void populateDefaultDownloadPath();
     void populateSavePathOptions();
-
+    void resetShareLimitsWidgetDefaults();
 
     Ui::AddTorrentParamsWidget *m_ui;
     BitTorrent::AddTorrentParams m_addTorrentParams;

src/gui/advancedsettings.cpp

@@ -149,7 +149,7 @@ namespace
         OUTGOING_PORT_MIN,
         OUTGOING_PORT_MAX,
         UPNP_LEASE_DURATION,
-        PEER_TOS,
+        PEER_DSCP,
         UTP_MIX_MODE,
         HOSTNAME_CACHE_TTL,
         IDN_SUPPORT,
@@ -276,7 +276,7 @@ void AdvancedSettings::saveAdvancedSettings() const
     // UPnP lease duration
     session->setUPnPLeaseDuration(m_spinBoxUPnPLeaseDuration.value());
     // Type of service
-    session->setPeerToS(m_spinBoxPeerToS.value());
+    session->setPeerDSCP(m_spinBoxPeerDSCP.value());
     // uTP-TCP mixed mode
     session->setUtpMixedMode(m_comboBoxUtpMixedMode.currentData().value<BitTorrent::MixedModeAlgorithm>());
     // Hostname resolver cache TTL
@@ -723,11 +723,11 @@ void AdvancedSettings::loadAdvancedSettings()
     addRow(UPNP_LEASE_DURATION, (tr("UPnP lease duration [0: permanent lease]") + u' ' + makeLink(u"https://www.libtorrent.org/reference-Settings.html#upnp_lease_duration", u"(?)"))
         , &m_spinBoxUPnPLeaseDuration);
     // Type of service
-    m_spinBoxPeerToS.setMinimum(0);
+    m_spinBoxPeerDSCP.setMinimum(0);
-    m_spinBoxPeerToS.setMaximum(255);
+    m_spinBoxPeerDSCP.setMaximum(255);
-    m_spinBoxPeerToS.setValue(session->peerToS());
+    m_spinBoxPeerDSCP.setValue(session->peerDSCP());
-    addRow(PEER_TOS, (tr("Type of service (ToS) for connections to peers") + u' ' + makeLink(u"https://www.libtorrent.org/reference-Settings.html#peer_tos", u"(?)"))
+    addRow(PEER_DSCP, (tr("Differentiated Services Code Point (DSCP) for connections to peers") + u' ' + makeLink(u"https://www.libtorrent.org/reference-Settings.html#peer_dscp", u"(?)"))
-        , &m_spinBoxPeerToS);
+        , &m_spinBoxPeerDSCP);
     // uTP-TCP mixed mode
     m_comboBoxUtpMixedMode.addItem(tr("Prefer TCP"), QVariant::fromValue(BitTorrent::MixedModeAlgorithm::TCP));
     m_comboBoxUtpMixedMode.addItem(tr("Peer proportional (throttles TCP)"), QVariant::fromValue(BitTorrent::MixedModeAlgorithm::Proportional));

src/gui/advancedsettings.h

@@ -70,7 +70,7 @@ private:
 
     QSpinBox m_spinBoxSaveResumeDataInterval, m_spinBoxSaveStatisticsInterval, m_spinBoxTorrentFileSizeLimit, m_spinBoxBdecodeDepthLimit, m_spinBoxBdecodeTokenLimit,
              m_spinBoxAsyncIOThreads, m_spinBoxFilePoolSize, m_spinBoxCheckingMemUsage, m_spinBoxDiskQueueSize,
-             m_spinBoxOutgoingPortsMin, m_spinBoxOutgoingPortsMax, m_spinBoxUPnPLeaseDuration, m_spinBoxPeerToS, m_spinBoxHostnameCacheTTL,
+             m_spinBoxOutgoingPortsMin, m_spinBoxOutgoingPortsMax, m_spinBoxUPnPLeaseDuration, m_spinBoxPeerDSCP, m_spinBoxHostnameCacheTTL,
              m_spinBoxListRefresh, m_spinBoxTrackerPort, m_spinBoxSendBufferWatermark, m_spinBoxSendBufferLowWatermark,
              m_spinBoxSendBufferWatermarkFactor, m_spinBoxConnectionSpeed, m_spinBoxSocketSendBufferSize, m_spinBoxSocketReceiveBufferSize, m_spinBoxSocketBacklogSize,
              m_spinBoxAnnouncePort, m_spinBoxMaxConcurrentHTTPAnnounces, m_spinBoxStopTrackerTimeout, m_spinBoxSessionShutdownTimeout,

src/gui/optionsdialog.cpp

@@ -48,7 +48,7 @@
 #include <QTranslator>
 
 #include "base/bittorrent/session.h"
-#include "base/bittorrent/sharelimitaction.h"
+#include "base/bittorrent/sharelimits.h"
 #include "base/exceptions.h"
 #include "base/global.h"
 #include "base/net/downloadmanager.h"
@@ -625,7 +625,6 @@ void OptionsDialog::loadDownloadsTabOptions()
     m_ui->comboCategoryChanged->setCurrentIndex(session->isDisableAutoTMMWhenCategorySavePathChanged());
     m_ui->comboCategoryDefaultPathChanged->setCurrentIndex(session->isDisableAutoTMMWhenDefaultSavePathChanged());
 
-    m_ui->checkUseSubcategories->setChecked(session->isSubcategoriesEnabled());
     m_ui->checkUseCategoryPaths->setChecked(session->useCategoryPathsInManualMode());
 
     m_ui->textSavePath->setDialogCaption(tr("Choose a save directory"));
@@ -730,7 +729,6 @@ void OptionsDialog::loadDownloadsTabOptions()
     connect(m_ui->comboCategoryChanged, qComboBoxCurrentIndexChanged, this, &ThisType::enableApplyButton);
     connect(m_ui->comboCategoryDefaultPathChanged, qComboBoxCurrentIndexChanged, this, &ThisType::enableApplyButton);
 
-    connect(m_ui->checkUseSubcategories, &QAbstractButton::toggled, this, &ThisType::enableApplyButton);
     connect(m_ui->checkUseCategoryPaths, &QAbstractButton::toggled, this, &ThisType::enableApplyButton);
 
     connect(m_ui->textSavePath, &FileSystemPathEdit::selectedPathChanged, this, &ThisType::enableApplyButton);
@@ -802,7 +800,6 @@ void OptionsDialog::saveDownloadsTabOptions() const
     session->setDisableAutoTMMWhenCategorySavePathChanged(m_ui->comboCategoryChanged->currentIndex() == 1);
     session->setDisableAutoTMMWhenDefaultSavePathChanged(m_ui->comboCategoryDefaultPathChanged->currentIndex() == 1);
 
-    session->setSubcategoriesEnabled(m_ui->checkUseSubcategories->isChecked());
     session->setUseCategoryPathsInManualMode(m_ui->checkUseCategoryPaths->isChecked());
 
     session->setSavePath(Path(m_ui->textSavePath->selectedPath()));

src/gui/optionsdialog.ui

@@ -1381,13 +1381,6 @@ Manual: Various torrent properties (e.g. save path) must be assigned manually</s
                  </item>
                 </layout>
                </item>
-               <item>
-                <widget class="QCheckBox" name="checkUseSubcategories">
-                 <property name="text">
-                  <string>Use Subcategories</string>
-                 </property>
-                </widget>
-               </item>
                <item>
                 <widget class="QCheckBox" name="checkUseCategoryPaths">
                  <property name="toolTip">

src/gui/torrentcategorydialog.cpp

@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2017, 2021  Vladimir Golovnev <glassez@yandex.ru>
+ * Copyright (C) 2017-2025  Vladimir Golovnev <glassez@yandex.ru>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -32,11 +32,12 @@
 #include <QPushButton>
 
 #include "base/bittorrent/session.h"
-#include "base/utils/fs.h"
+#include "base/bittorrent/torrent.h"
+#include "torrentsharelimitswidget.h"
 #include "ui_torrentcategorydialog.h"
 
 TorrentCategoryDialog::TorrentCategoryDialog(QWidget *parent)
-    : QDialog {parent}
+    : QDialog(parent)
     , m_ui {new Ui::TorrentCategoryDialog}
 {
     m_ui->setupUi(this);
@@ -56,6 +57,15 @@ TorrentCategoryDialog::TorrentCategoryDialog(QWidget *parent)
 
     connect(m_ui->textCategoryName, &QLineEdit::textChanged, this, &TorrentCategoryDialog::categoryNameChanged);
     connect(m_ui->comboUseDownloadPath, &QComboBox::currentIndexChanged, this, &TorrentCategoryDialog::useDownloadPathChanged);
+
+    resetShareLimitsWidgetDefaults();
+}
+
+TorrentCategoryDialog::TorrentCategoryDialog(QWidget *parent, const QString &categoryName, const BitTorrent::CategoryOptions &categoryOptions)
+    : TorrentCategoryDialog(parent)
+{
+    setCategoryName(categoryName);
+    setCategoryOptions(categoryOptions);
 }
 
 TorrentCategoryDialog::~TorrentCategoryDialog()
@@ -73,8 +83,7 @@ QString TorrentCategoryDialog::createCategory(QWidget *parent, const QString &pa
         newCategoryName += u'/';
     newCategoryName += tr("New Category");
 
-    TorrentCategoryDialog dialog {parent};
+    TorrentCategoryDialog dialog {parent, newCategoryName, {}};
-    dialog.setCategoryName(newCategoryName);
     while (dialog.exec() == TorrentCategoryDialog::Accepted)
     {
         newCategoryName = dialog.categoryName();
@@ -110,14 +119,12 @@ void TorrentCategoryDialog::editCategory(QWidget *parent, const QString &categor
 
     Q_ASSERT(Session::instance()->categories().contains(categoryName));
 
-    auto *dialog = new TorrentCategoryDialog(parent);
+    auto *dialog = new TorrentCategoryDialog(parent, categoryName, Session::instance()->categoryOptions(categoryName));
     dialog->setAttribute(Qt::WA_DeleteOnClose);
     dialog->setCategoryNameEditable(false);
-    dialog->setCategoryName(categoryName);
-    dialog->setCategoryOptions(Session::instance()->categoryOptions(categoryName));
     connect(dialog, &TorrentCategoryDialog::accepted, parent, [dialog, categoryName]()
     {
-        Session::instance()->editCategory(categoryName, dialog->categoryOptions());
+        Session::instance()->setCategoryOptions(categoryName, dialog->categoryOptions());
     });
     dialog->open();
 }
@@ -149,6 +156,11 @@ BitTorrent::CategoryOptions TorrentCategoryDialog::categoryOptions() const
     else if (m_ui->comboUseDownloadPath->currentIndex() == 2)
         categoryOptions.downloadPath = {false, {}};
 
+    categoryOptions.ratioLimit = m_ui->torrentShareLimitsWidget->ratioLimit().value_or(BitTorrent::DEFAULT_RATIO_LIMIT);
+    categoryOptions.seedingTimeLimit = m_ui->torrentShareLimitsWidget->seedingTimeLimit().value_or(BitTorrent::DEFAULT_SEEDING_TIME_LIMIT);
+    categoryOptions.inactiveSeedingTimeLimit = m_ui->torrentShareLimitsWidget->inactiveSeedingTimeLimit().value_or(BitTorrent::DEFAULT_SEEDING_TIME_LIMIT);
+    categoryOptions.shareLimitAction = m_ui->torrentShareLimitsWidget->shareLimitAction().value_or(BitTorrent::ShareLimitAction::Default);
+
     return categoryOptions;
 }
 
@@ -165,6 +177,11 @@ void TorrentCategoryDialog::setCategoryOptions(const BitTorrent::CategoryOptions
         m_ui->comboUseDownloadPath->setCurrentIndex(0);
         m_ui->comboDownloadPath->setSelectedPath({});
     }
+
+    m_ui->torrentShareLimitsWidget->setRatioLimit(categoryOptions.ratioLimit);
+    m_ui->torrentShareLimitsWidget->setSeedingTimeLimit(categoryOptions.seedingTimeLimit);
+    m_ui->torrentShareLimitsWidget->setInactiveSeedingTimeLimit(categoryOptions.inactiveSeedingTimeLimit);
+    m_ui->torrentShareLimitsWidget->setShareLimitAction(categoryOptions.shareLimitAction);
 }
 
 void TorrentCategoryDialog::categoryNameChanged(const QString &categoryName)
@@ -177,6 +194,13 @@ void TorrentCategoryDialog::categoryNameChanged(const QString &categoryName)
     if (useDownloadPath)
         m_ui->comboDownloadPath->setPlaceholder(btSession->categoryDownloadPath(categoryName, categoryOptions()));
 
+    const QString parentCategoryName = BitTorrent::Session::parentCategoryName(categoryName);
+    if (m_parentCategoryName != parentCategoryName)
+    {
+        m_parentCategoryName = parentCategoryName;
+        resetShareLimitsWidgetDefaults();
+    }
+
     m_ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(!categoryName.isEmpty());
 }
 
@@ -195,3 +219,11 @@ void TorrentCategoryDialog::useDownloadPathChanged(const int index)
     const Path categoryPath = btSession->categoryDownloadPath(categoryName, categoryOptions());
     m_ui->comboDownloadPath->setPlaceholder(useDownloadPath ? categoryPath : Path());
 }
+
+void TorrentCategoryDialog::resetShareLimitsWidgetDefaults()
+{
+    const auto *btSession = BitTorrent::Session::instance();
+    m_ui->torrentShareLimitsWidget->setDefaults((m_parentCategoryName.isEmpty() ? TorrentShareLimitsWidget::UsedDefaults::Global : TorrentShareLimitsWidget::UsedDefaults::Category)
+            , btSession->categoryRatioLimit(m_parentCategoryName), btSession->categorySeedingTimeLimit(m_parentCategoryName)
+            , btSession->categoryInactiveSeedingTimeLimit(m_parentCategoryName), btSession->categoryShareLimitAction(m_parentCategoryName));
+}

src/gui/torrentcategorydialog.h

@@ -1,6 +1,6 @@
 /*
  * Bittorrent Client using Qt and libtorrent.
- * Copyright (C) 2017, 2021  Vladimir Golovnev <glassez@yandex.ru>
+ * Copyright (C) 2017-2025  Vladimir Golovnev <glassez@yandex.ru>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -52,6 +52,7 @@ public:
     static void editCategory(QWidget *parent, const QString &categoryName);
 
     explicit TorrentCategoryDialog(QWidget *parent = nullptr);
+    TorrentCategoryDialog(QWidget *parent, const QString &categoryName, const BitTorrent::CategoryOptions &categoryOptions);
     ~TorrentCategoryDialog() override;
 
     void setCategoryNameEditable(bool editable);
@@ -65,6 +66,9 @@ private slots:
     void useDownloadPathChanged(int index);
 
 private:
+    void resetShareLimitsWidgetDefaults();
+
     Ui::TorrentCategoryDialog *m_ui = nullptr;
     Path m_lastEnteredDownloadPath;
+    QString m_parentCategoryName;
 };

src/gui/torrentcategorydialog.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>493</width>
-    <height>208</height>
+    <height>268</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -140,6 +140,18 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QGroupBox" name="torrentShareLimitsBox">
+     <property name="title">
+      <string>Torrent share limits</string>
+     </property>
+     <layout class="QVBoxLayout" name="torrentShareLimitsBoxLayout">
+      <item>
+       <widget class="TorrentShareLimitsWidget" name="torrentShareLimitsWidget" native="true"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <spacer name="verticalSpacer_2">
      <property name="orientation">
@@ -172,6 +184,12 @@
    <header>gui/fspathedit.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>TorrentShareLimitsWidget</class>
+   <extends>QWidget</extends>
+   <header>gui/torrentsharelimitswidget.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

src/gui/torrentcontentmodelitem.cpp

@@ -112,7 +112,7 @@ QString TorrentContentModelItem::displayData(const int column) const
         case BitTorrent::DownloadPriority::Mixed:
             return tr("Mixed", "Mixed (priorities");
         case BitTorrent::DownloadPriority::Ignored:
-            return tr("Not downloaded");
+            return tr("Do not download", "Do not download (priority)");
         case BitTorrent::DownloadPriority::High:
             return tr("High", "High (priority)");
         case BitTorrent::DownloadPriority::Maximum: