Merge pull request #15950 from theguymadmax/revert-sort-index-number

Revert "always sort season by index number"
Merge pull request #15961 from theguymadmax/fix-bad-plugin-url
2026-01-16 08:08:16 +00:00 · 2026-01-09 18:38:23 +01:00 · 2026-01-09 18:24:48 +01:00 · 2026-01-06 11:57:25 -05:00 · 2026-01-05 11:06:25 -05:00 · 2026-01-04 11:20:34 -07:00
116 changed files with 705 additions and 1561 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,11 +1,4 @@
-# Joshua must review all changes to bump_version and any files it touches
-bump_version                                            @joshuaboniface
-.github/ISSUE_TEMPLATE                                  @joshuaboniface
-MediaBrowser.Common/MediaBrowser.Common.csproj          @joshuaboniface
-Jellyfin.Data/Jellyfin.Data.csproj                      @joshuaboniface
-MediaBrowser.Controller/MediaBrowser.Controller.csproj  @joshuaboniface
-MediaBrowser.Model/MediaBrowser.Model.csproj            @joshuaboniface
-Emby.Naming/Emby.Naming.csproj                          @joshuaboniface
-src/Jellyfin.Extensions/Jellyfin.Extensions.csproj      @joshuaboniface
-# Core must approve all changes within the repo config
-.github/                                                @jellyfin/core
+# Joshua must review all changes to deployment and build.sh
+.ci/*           @joshuaboniface
+deployment/*    @joshuaboniface
+build.sh        @joshuaboniface
--- a/.github/ISSUE_TEMPLATE/issue
+++ b/.github/ISSUE_TEMPLATE/issue
@@ -87,12 +87,7 @@ body:
      label: Jellyfin Server version
      description: What version of Jellyfin are you using?
      options:
-        - 10.11.5
-        - 10.11.4
-        - 10.11.3
-        - 10.11.2
-        - 10.11.1
-        - 10.11.0
+        - 10.10.0+
        - Master
        - Unstable
        - Older*
@@ -141,14 +136,13 @@ body:
        - **FFmpeg Version**: [e.g. 5.1.2-Jellyfin]
        - **Playback**: [Direct Play, Remux, Direct Stream, Transcode]
        - **Hardware Acceleration**: [e.g. none, VAAPI, NVENC, etc.]
-        - **CPU Model**: [e.g. AMD Ryzen 5 9600X, Intel Core i7-8565U, etc.]
        - **GPU Model**: [e.g. none, UHD630, GTX1050, etc.]
        - **Installed Plugins**: [e.g. none, Fanart, Anime, etc.]
        - **Reverse Proxy**: [e.g. none, nginx, apache, etc.]
        - **Base URL**: [e.g. none, yes: /example]
        - **Networking**: [e.g. Host, Bridge/NAT]
-        - **Jellyfin Data Storage & Filesystem**: [e.g. local SATA SSD - ext4, local HDD - NTFS]
-        - **Media Storage & Filesystem**: [e.g. Local HDD - ext4, SMB Share]
+        - **Jellyfin Data Storage**: [e.g. local SATA SSD, local HDD]
+        - **Media Storage**: [e.g. Local HDD, SMB Share]
        - **External Integrations**: [e.g. Jellystat, Jellyseerr]
      value: |
        - OS:
@@ -159,14 +153,13 @@ body:
        - FFmpeg Version:
        - Playback Method:
        - Hardware Acceleration:
-        - CPU Model:
        - GPU Model:
        - Plugins:
        - Reverse Proxy:
        - Base URL:
        - Networking:
-        - Jellyfin Data Storage & Filesystem:
-        - Media Storage & Filesystem:
+        - Jellyfin Data Storage:
+        - Media Storage:
        - External Integrations:
      render: markdown
    validations:
--- a/.github/workflows/ci-codeql-analysis.yml
+++ b/.github/workflows/ci-codeql-analysis.yml
@@ -21,20 +21,17 @@ jobs:
    steps:
    - name: Checkout repository
      uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
-
    - name: Setup .NET
-      uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
+      uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5.0.1
      with:
        dotnet-version: '9.0.x'

    - name: Initialize CodeQL
-      uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
+      uses: github/codeql-action/init@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
      with:
        languages: ${{ matrix.language }}
        queries: +security-extended
-
    - name: Autobuild
-      uses: github/codeql-action/autobuild@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
-
+      uses: github/codeql-action/autobuild@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
+      uses: github/codeql-action/analyze@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
--- a/.github/workflows/ci-compat.yml
+++ b/.github/workflows/ci-compat.yml
@@ -17,7 +17,7 @@ jobs:
          repository: ${{ github.event.pull_request.head.repo.full_name }}

      - name: Setup .NET
-        uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
+        uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5.0.1
        with:
          dotnet-version: '9.0.x'

@@ -26,7 +26,7 @@ jobs:
          dotnet build Jellyfin.Server -o ./out

      - name: Upload Head
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
        with:
          name: abi-head
          retention-days: 14
@@ -47,7 +47,7 @@ jobs:
          fetch-depth: 0

      - name: Setup .NET
-        uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
+        uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5.0.1
        with:
          dotnet-version: '9.0.x'

@@ -65,7 +65,7 @@ jobs:
          dotnet build Jellyfin.Server -o ./out

      - name: Upload Head
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
        with:
          name: abi-base
          retention-days: 14
@@ -85,13 +85,13 @@ jobs:

    steps:
      - name: Download abi-head
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
        with:
          name: abi-head
          path: abi-head

      - name: Download abi-base
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
        with:
          name: abi-base
          path: abi-base
@@ -106,7 +106,7 @@ jobs:
          {
            echo 'body<<EOF'
            for file in Jellyfin.Data.dll MediaBrowser.Common.dll MediaBrowser.Controller.dll MediaBrowser.Model.dll Emby.Naming.dll Jellyfin.Extensions.dll Jellyfin.MediaEncoding.Keyframes.dll Jellyfin.Database.Implementations.dll; do
-              COMPAT_OUTPUT="$( { apicompat --left ./abi-base/${file} --right ./abi-head/${file}; } 2>&1 || true )"
+              COMPAT_OUTPUT="$( { apicompat --left ./abi-base/${file} --right ./abi-head/${file}; } 2>&1 )"
              if [ "APICompat ran successfully without finding any breaking changes." != "${COMPAT_OUTPUT}" ]; then
                printf "\n${file}\n${COMPAT_OUTPUT}\n"
              fi
--- a/.github/workflows/ci-openapi.yml
+++ b/.github/workflows/ci-openapi.yml
@@ -20,17 +20,14 @@ jobs:
        with:
          ref: ${{ github.event.pull_request.head.sha }}
          repository: ${{ github.event.pull_request.head.repo.full_name }}
-
      - name: Setup .NET
-        uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
+        uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5.0.1
        with:
          dotnet-version: '9.0.x'
-
      - name: Generate openapi.json
        run: dotnet test tests/Jellyfin.Server.Integration.Tests/Jellyfin.Server.Integration.Tests.csproj -c Release --filter "Jellyfin.Server.Integration.Tests.OpenApiSpecTests"
-
      - name: Upload openapi.json
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
        with:
          name: openapi-head
          retention-days: 14
@@ -49,7 +46,6 @@ jobs:
          ref: ${{ github.event.pull_request.head.sha }}
          repository: ${{ github.event.pull_request.head.repo.full_name }}
          fetch-depth: 0
-
      - name: Checkout common ancestor
        env:
          HEAD_REF: ${{ github.head_ref }}
@@ -58,17 +54,14 @@ jobs:
          git -c protocol.version=2 fetch --prune --progress --no-recurse-submodules upstream +refs/heads/*:refs/remotes/upstream/* +refs/tags/*:refs/tags/*
          ANCESTOR_REF=$(git merge-base upstream/${{ github.base_ref }} origin/$HEAD_REF)
          git checkout --progress --force $ANCESTOR_REF
-
      - name: Setup .NET
-        uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
+        uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5.0.1
        with:
          dotnet-version: '9.0.x'
-
      - name: Generate openapi.json
        run: dotnet test tests/Jellyfin.Server.Integration.Tests/Jellyfin.Server.Integration.Tests.csproj -c Release --filter "Jellyfin.Server.Integration.Tests.OpenApiSpecTests"
-
      - name: Upload openapi.json
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
        with:
          name: openapi-base
          retention-days: 14
@@ -77,7 +70,7 @@ jobs:

  openapi-diff:
    permissions:
-      pull-requests: write
+      pull-requests: write  #  to create or update comment (peter-evans/create-or-update-comment)

    name: OpenAPI - Difference
    if: ${{ github.event_name == 'pull_request_target' }}
@@ -87,27 +80,71 @@ jobs:
      - openapi-base
    steps:
      - name: Download openapi-head
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
        with:
          name: openapi-head
          path: openapi-head
-
      - name: Download openapi-base
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
        with:
          name: openapi-base
          path: openapi-base
-
-      - name: Detect OpenAPI changes
-        id: openapi-diff
-        uses: jellyfin/openapi-diff-action@9274f6bda9d01ab091942a4a8334baa53692e8a4 # v1.0.0
+      - name: Workaround openapi-diff issue
+        run: |
+          sed -i 's/"allOf"/"oneOf"/g' openapi-head/openapi.json
+          sed -i 's/"allOf"/"oneOf"/g' openapi-base/openapi.json
+      - name: Calculate OpenAPI difference
+        uses: docker://openapitools/openapi-diff
+        continue-on-error: true
        with:
-          old-spec: openapi-base/openapi.json
-          new-spec: openapi-head/openapi.json
-          markdown: openapi-changelog.md
-          add-pr-comment: true
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          args: --fail-on-changed --markdown openapi-changes.md openapi-base/openapi.json openapi-head/openapi.json
+      - id: read-diff
+        name: Read openapi-diff output
+        run: |
+          # Read and fix markdown
+          body=$(cat openapi-changes.md)
+          # Write to workflow summary
+          echo "$body" >> $GITHUB_STEP_SUMMARY
+          # Set ApiChanged var
+          if [ "$body" != '' ]; then
+            echo "ApiChanged=1" >> "$GITHUB_OUTPUT"
+          else
+            echo "ApiChanged=0" >> "$GITHUB_OUTPUT"
+          fi
+          # Add header/footer for diff comment
+          echo '<!--openapi-diff-workflow-comment-->' > openapi-changes-reply.md
+          echo "<details>" >> openapi-changes-reply.md
+          echo "<summary>Changes in OpenAPI specification found. Expand to see details.</summary>" >> openapi-changes-reply.md
+          echo "" >> openapi-changes-reply.md
+          echo "$body" >> openapi-changes-reply.md
+          echo "" >> openapi-changes-reply.md
+          echo "</details>" >> openapi-changes-reply.md
+      - name: Find difference comment
+        uses: peter-evans/find-comment@b30e6a3c0ed37e7c023ccd3f1db5c6c0b0c23aad # v4.0.0
+        id: find-comment
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          direction: last
+          body-includes: openapi-diff-workflow-comment
+      - name: Reply or edit difference comment (changed)
+        uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
+        if: ${{ steps.read-diff.outputs.ApiChanged == '1' }}
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-id: ${{ steps.find-comment.outputs.comment-id }}
+          edit-mode: replace
+          body-path: openapi-changes-reply.md
+      - name: Edit difference comment (unchanged)
+        uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
+        if: ${{ steps.read-diff.outputs.ApiChanged == '0' && steps.find-comment.outputs.comment-id != '' }}
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-id: ${{ steps.find-comment.outputs.comment-id }}
+          edit-mode: replace
+          body: |
+            <!--openapi-diff-workflow-comment-->

+            No changes to OpenAPI specification found. See history of this comment for previous changes.

  publish-unstable:
    name: OpenAPI - Publish Unstable Spec
@@ -121,7 +158,7 @@ jobs:
        run: |-
          echo "JELLYFIN_VERSION=$(date +'%Y%m%d%H%M%S')" >> $GITHUB_ENV
      - name: Download openapi-head
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
        with:
          name: openapi-head
          path: openapi-head
@@ -141,6 +178,7 @@ jobs:
          username: "${{ secrets.REPO_USER }}"
          key: "${{ secrets.REPO_KEY }}"
          debug: false
+          script_stop: false
          script: |
            if ! test -d /run/workflows; then
                sudo mkdir -p /run/workflows
@@ -182,7 +220,7 @@ jobs:
        run: |-
          echo "JELLYFIN_VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
      - name: Download openapi-head
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
        with:
          name: openapi-head
          path: openapi-head
@@ -202,6 +240,7 @@ jobs:
          username: "${{ secrets.REPO_USER }}"
          key: "${{ secrets.REPO_KEY }}"
          debug: false
+          script_stop: false
          script: |
            if ! test -d /run/workflows; then
                sudo mkdir -p /run/workflows
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -22,7 +22,7 @@ jobs:
    steps:
      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1

-      - uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
+      - uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # v5.0.1
        with:
          dotnet-version: ${{ env.SDK_VERSION }}

--- a/.github/workflows/commands.yml
+++ b/.github/workflows/commands.yml
@@ -43,16 +43,13 @@ jobs:
        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          repository: jellyfin/jellyfin-triage-script
-
      - name: install python
        uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
        with:
          python-version: '3.14'
          cache: 'pip'
-
      - name: install python packages
        run: pip install -r rename/requirements.txt
-
      - name: run rename script
        run: python3 rename.py
        working-directory: ./rename
--- a/.github/workflows/issue-template-check.yml
+++ b/.github/workflows/issue-template-check.yml
@@ -13,16 +13,13 @@ jobs:
        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
        with:
          repository: jellyfin/jellyfin-triage-script
-
      - name: install python
        uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
        with:
          python-version: '3.14'
          cache: 'pip'
-
      - name: install python packages
        run: pip install -r main-repo-triage/requirements.txt
-
      - name: check and comment issue
        working-directory: ./main-repo-triage
        run: python3 single_issue_gha.py
--- a/.github/workflows/project-automation.yml
+++ b/.github/workflows/project-automation.yml
@@ -21,7 +21,6 @@ jobs:
        with:
          project: Current Release
          action: delete
-          column: In progress
          repo-token: ${{ secrets.JF_BOT_TOKEN }}

      - name: Add to 'Release Next' project
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -206,10 +206,7 @@
 - [theshoeshiner](https://github.com/theshoeshiner)
 - [TokerX](https://github.com/TokerX)
 - [GeneMarks](https://github.com/GeneMarks)
- - [Kirill Nikiforov](https://github.com/allmazz)
- - [bjorntp](https://github.com/bjorntp)
 - [martenumberto](https://github.com/martenumberto)
- - [ZeusCraft10](https://github.com/ZeusCraft10)

 # Emby Contributors

--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -25,7 +25,7 @@
    <PackageVersion Include="Jellyfin.XmlTv" Version="10.8.0" />
    <PackageVersion Include="libse" Version="4.0.12" />
    <PackageVersion Include="LrcParser" Version="2025.623.0" />
-    <PackageVersion Include="MetaBrainz.MusicBrainz" Version="7.0.0" />
+    <PackageVersion Include="MetaBrainz.MusicBrainz" Version="6.1.0" />
    <PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="9.0.11" />
    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.11" />
    <PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="4.14.0" />
@@ -74,26 +74,26 @@
    <PackageVersion Include="SerilogAnalyzer" Version="0.15.0" />
    <PackageVersion Include="SharpFuzz" Version="2.2.0" />
    <!-- Pinned to 3.116.1 because https://github.com/jellyfin/jellyfin/pull/14255 -->
-    <PackageVersion Include="SkiaSharp" Version="[3.116.1]" />
-    <PackageVersion Include="SkiaSharp.HarfBuzz" Version="[3.116.1]" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="[3.116.1]" />
+    <PackageVersion Include="SkiaSharp" Version="3.116.1" />
+    <PackageVersion Include="SkiaSharp.HarfBuzz" Version="3.116.1" />
+    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="3.116.1" />
    <PackageVersion Include="SmartAnalyzers.MultithreadingAnalyzer" Version="1.1.31" />
    <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
    <PackageVersion Include="Svg.Skia" Version="3.2.1" />
-    <PackageVersion Include="Swashbuckle.AspNetCore.ReDoc" Version="6.9.0" />
-    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.9.0" />
+    <PackageVersion Include="Swashbuckle.AspNetCore.ReDoc" Version="6.5.0" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.2.3" />
    <PackageVersion Include="System.Globalization" Version="4.3.0" />
    <PackageVersion Include="System.Linq.Async" Version="6.0.3" />
    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.11" />
    <PackageVersion Include="System.Text.Json" Version="9.0.11" />
    <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="9.0.11" />
    <PackageVersion Include="TagLibSharp" Version="2.3.0" />
-    <PackageVersion Include="z440.atl.core" Version="7.10.0" />
+    <PackageVersion Include="z440.atl.core" Version="7.9.0" />
    <PackageVersion Include="TMDbLib" Version="2.3.0" />
    <PackageVersion Include="UTF.Unknown" Version="2.6.0" />
    <PackageVersion Include="Xunit.Priority" Version="1.1.6" />
    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
-    <PackageVersion Include="Xunit.SkippableFact" Version="1.5.61" />
+    <PackageVersion Include="Xunit.SkippableFact" Version="1.5.23" />
    <PackageVersion Include="xunit" Version="2.9.3" />
  </ItemGroup>
 </Project>
--- a/Emby.Naming/Book/BookFileNameParser.cs
+++ b/Emby.Naming/Book/BookFileNameParser.cs
@@ -1,75 +0,0 @@
-using System.Text.RegularExpressions;
-
-namespace Emby.Naming.Book
-{
-    /// <summary>
-    /// Helper class to retrieve basic metadata from a book filename.
-    /// </summary>
-    public static class BookFileNameParser
-    {
-        private const string NameMatchGroup = "name";
-        private const string IndexMatchGroup = "index";
-        private const string YearMatchGroup = "year";
-        private const string SeriesNameMatchGroup = "seriesName";
-
-        private static readonly Regex[] _nameMatches =
-        [
-            // seriesName (seriesYear) #index (of count) (year) where only seriesName and index are required
-            new Regex(@"^(?<seriesName>.+?)((\s\((?<seriesYear>[0-9]{4})\))?)\s#(?<index>[0-9]+)((\s\(of\s(?<count>[0-9]+)\))?)((\s\((?<year>[0-9]{4})\))?)$"),
-            new Regex(@"^(?<name>.+?)\s\((?<seriesName>.+?),\s#(?<index>[0-9]+)\)((\s\((?<year>[0-9]{4})\))?)$"),
-            new Regex(@"^(?<index>[0-9]+)\s\-\s(?<name>.+?)((\s\((?<year>[0-9]{4})\))?)$"),
-            new Regex(@"(?<name>.*)\((?<year>[0-9]{4})\)"),
-            // last resort matches the whole string as the name
-            new Regex(@"(?<name>.*)")
-        ];
-
-        /// <summary>
-        /// Parse a filename name to retrieve the book name, series name, index, and year.
-        /// </summary>
-        /// <param name="name">Book filename to parse for information.</param>
-        /// <returns>Returns <see cref="BookFileNameParserResult"/> object.</returns>
-        public static BookFileNameParserResult Parse(string? name)
-        {
-            var result = new BookFileNameParserResult();
-
-            if (name == null)
-            {
-                return result;
-            }
-
-            foreach (var regex in _nameMatches)
-            {
-                var match = regex.Match(name);
-
-                if (!match.Success)
-                {
-                    continue;
-                }
-
-                if (match.Groups.TryGetValue(NameMatchGroup, out Group? nameGroup) && nameGroup.Success)
-                {
-                    result.Name = nameGroup.Value.Trim();
-                }
-
-                if (match.Groups.TryGetValue(IndexMatchGroup, out Group? indexGroup) && indexGroup.Success && int.TryParse(indexGroup.Value, out var index))
-                {
-                    result.Index = index;
-                }
-
-                if (match.Groups.TryGetValue(YearMatchGroup, out Group? yearGroup) && yearGroup.Success && int.TryParse(yearGroup.Value, out var year))
-                {
-                    result.Year = year;
-                }
-
-                if (match.Groups.TryGetValue(SeriesNameMatchGroup, out Group? seriesGroup) && seriesGroup.Success)
-                {
-                    result.SeriesName = seriesGroup.Value.Trim();
-                }
-
-                break;
-            }
-
-            return result;
-        }
-    }
-}
--- a/Emby.Naming/Book/BookFileNameParserResult.cs
+++ b/Emby.Naming/Book/BookFileNameParserResult.cs
@@ -1,41 +0,0 @@
-using System;
-
-namespace Emby.Naming.Book
-{
-    /// <summary>
-    /// Data object used to pass metadata parsed from a book filename.
-    /// </summary>
-    public class BookFileNameParserResult
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BookFileNameParserResult"/> class.
-        /// </summary>
-        public BookFileNameParserResult()
-        {
-            Name = null;
-            Index = null;
-            Year = null;
-            SeriesName = null;
-        }
-
-        /// <summary>
-        /// Gets or sets the name of the book.
-        /// </summary>
-        public string? Name { get; set; }
-
-        /// <summary>
-        /// Gets or sets the book index.
-        /// </summary>
-        public int? Index { get; set; }
-
-        /// <summary>
-        /// Gets or sets the publication year.
-        /// </summary>
-        public int? Year { get; set; }
-
-        /// <summary>
-        /// Gets or sets the series name.
-        /// </summary>
-        public string? SeriesName { get; set; }
-    }
-}
--- a/Emby.Naming/Emby.Naming.csproj
+++ b/Emby.Naming/Emby.Naming.csproj
@@ -36,7 +36,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Naming</PackageId>
-    <VersionPrefix>10.12.0</VersionPrefix>
+    <VersionPrefix>10.11.5</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/Emby.Naming/TV/SeriesResolver.cs
+++ b/Emby.Naming/TV/SeriesResolver.cs
@@ -17,13 +17,6 @@ namespace Emby.Naming.TV
        [GeneratedRegex(@"((?<a>[^\._]{2,})[\._]*)|([\._](?<b>[^\._]{2,}))")]
        private static partial Regex SeriesNameRegex();

-        /// <summary>
-        /// Regex that matches titles with year in parentheses. Captures the title (which may be
-        /// numeric) before the year, i.e. turns "1923 (2022)" into "1923".
-        /// </summary>
-        [GeneratedRegex(@"(?<title>.+?)\s*\(\d{4}\)")]
-        private static partial Regex TitleWithYearRegex();
-
        /// <summary>
        /// Resolve information about series from path.
        /// </summary>
@@ -34,20 +27,6 @@ namespace Emby.Naming.TV
        {
            string seriesName = Path.GetFileName(path);

-            // First check if the filename matches a title with year pattern (handles numeric titles)
-            if (!string.IsNullOrEmpty(seriesName))
-            {
-                var titleWithYearMatch = TitleWithYearRegex().Match(seriesName);
-                if (titleWithYearMatch.Success)
-                {
-                    seriesName = titleWithYearMatch.Groups["title"].Value.Trim();
-                    return new SeriesInfo(path)
-                    {
-                        Name = seriesName
-                    };
-                }
-            }
-
            SeriesPathParserResult result = SeriesPathParser.Parse(options, path);
            if (result.Success)
            {
--- a/Emby.Server.Implementations/Cryptography/CryptographyProvider.cs
+++ b/Emby.Server.Implementations/Cryptography/CryptographyProvider.cs
@@ -39,24 +39,22 @@ namespace Emby.Server.Implementations.Cryptography
        {
            if (string.Equals(hash.Id, "PBKDF2", StringComparison.Ordinal))
            {
-                var iterations = GetIterationsParameter(hash);
                return hash.Hash.SequenceEqual(
                    Rfc2898DeriveBytes.Pbkdf2(
                        password,
                        hash.Salt,
-                        iterations,
+                        int.Parse(hash.Parameters["iterations"], CultureInfo.InvariantCulture),
                        HashAlgorithmName.SHA1,
                        32));
            }

            if (string.Equals(hash.Id, "PBKDF2-SHA512", StringComparison.Ordinal))
            {
-                var iterations = GetIterationsParameter(hash);
                return hash.Hash.SequenceEqual(
                    Rfc2898DeriveBytes.Pbkdf2(
                        password,
                        hash.Salt,
-                        iterations,
+                        int.Parse(hash.Parameters["iterations"], CultureInfo.InvariantCulture),
                        HashAlgorithmName.SHA512,
                        DefaultOutputLength));
            }
@@ -64,27 +62,6 @@ namespace Emby.Server.Implementations.Cryptography
            throw new NotSupportedException($"Can't verify hash with id: {hash.Id}");
        }

-        /// <summary>
-        /// Extracts and validates the iterations parameter from a password hash.
-        /// </summary>
-        /// <param name="hash">The password hash containing parameters.</param>
-        /// <returns>The number of iterations.</returns>
-        /// <exception cref="FormatException">Thrown when iterations parameter is missing or invalid.</exception>
-        private static int GetIterationsParameter(PasswordHash hash)
-        {
-            if (!hash.Parameters.TryGetValue("iterations", out var iterationsStr))
-            {
-                throw new FormatException($"Password hash with id '{hash.Id}' is missing required 'iterations' parameter.");
-            }
-
-            if (!int.TryParse(iterationsStr, CultureInfo.InvariantCulture, out var iterations))
-            {
-                throw new FormatException($"Password hash with id '{hash.Id}' has invalid 'iterations' parameter: '{iterationsStr}'.");
-            }
-
-            return iterations;
-        }
-
        /// <inheritdoc />
        public byte[] GenerateSalt()
            => GenerateSalt(DefaultSaltLength);
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -2144,7 +2144,7 @@ namespace Emby.Server.Implementations.Library

            item.ValidateImages();

-            await _itemRepository.SaveImagesAsync(item).ConfigureAwait(false);
+            _itemRepository.SaveImages(item);

            RegisterItem(item);
        }
--- a/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Books/BookResolver.cs
@@ -5,12 +5,12 @@
 using System;
 using System.IO;
 using System.Linq;
-using Emby.Naming.Book;
 using Jellyfin.Data.Enums;
 using Jellyfin.Extensions;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Resolvers;
+using MediaBrowser.Model.Entities;

 namespace Emby.Server.Implementations.Library.Resolvers.Books
 {
@@ -35,22 +35,17 @@ namespace Emby.Server.Implementations.Library.Resolvers.Books

            var extension = Path.GetExtension(args.Path.AsSpan());

-            if (!_validExtensions.Contains(extension, StringComparison.OrdinalIgnoreCase))
+            if (_validExtensions.Contains(extension, StringComparison.OrdinalIgnoreCase))
            {
-                return null;
+                // It's a book
+                return new Book
+                {
+                    Path = args.Path,
+                    IsInMixedFolder = true
+                };
            }

-            var result = BookFileNameParser.Parse(Path.GetFileNameWithoutExtension(args.Path));
-
-            return new Book
-            {
-                Path = args.Path,
-                Name = result.Name ?? string.Empty,
-                IndexNumber = result.Index,
-                ProductionYear = result.Year,
-                SeriesName = result.SeriesName ?? Path.GetFileName(Path.GetDirectoryName(args.Path)),
-                IsInMixedFolder = true,
-            };
+            return null;
        }

        private Book GetBook(ItemResolveArgs args)
@@ -64,22 +59,15 @@ namespace Emby.Server.Implementations.Library.Resolvers.Books
                    StringComparison.OrdinalIgnoreCase);
            }).ToList();

-            // directory is only considered a book when it contains exactly one supported file
-            // other library structures with multiple books to a directory will get picked up as individual files
+            // Don't return a Book if there is more (or less) than one document in the directory
            if (bookFiles.Count != 1)
            {
                return null;
            }

-            var result = BookFileNameParser.Parse(Path.GetFileName(args.Path));
-
            return new Book
            {
-                Path = bookFiles[0].FullName,
-                Name = result.Name ?? string.Empty,
-                IndexNumber = result.Index,
-                ProductionYear = result.Year,
-                SeriesName = result.SeriesName ?? string.Empty,
+                Path = bookFiles[0].FullName
            };
        }
    }
--- a/Emby.Server.Implementations/Library/SearchEngine.cs
+++ b/Emby.Server.Implementations/Library/SearchEngine.cs
@@ -42,7 +42,7 @@ namespace Emby.Server.Implementations.Library
                results = results.GetRange(query.StartIndex.Value, totalRecordCount - query.StartIndex.Value);
            }

-            if (query.Limit.HasValue && query.Limit.Value > 0)
+            if (query.Limit.HasValue)
            {
                results = results.GetRange(0, Math.Min(query.Limit.Value, results.Count));
            }
--- a/Emby.Server.Implementations/Localization/Core/ar.json
+++ b/Emby.Server.Implementations/Localization/Core/ar.json
@@ -2,13 +2,13 @@
    "Albums": "ألبومات",
    "AppDeviceValues": "تطبيق: {0}, جهاز: {1}",
    "Application": "تطبيق",
-    "Artists": "فنانون",
+    "Artists": "الفنانون",
    "AuthenticationSucceededWithUserName": "نجحت عملية التوثيق بـ {0}",
    "Books": "الكتب",
    "CameraImageUploadedFrom": "رُفعت صورة الكاميرا الجديدة من {0}",
    "Channels": "القنوات",
    "ChapterNameValue": "الفصل {0}",
-    "Collections": "مجموعات",
+    "Collections": "المجموعات",
    "DeviceOfflineWithName": "قُطِع الاتصال ب{0}",
    "DeviceOnlineWithName": "{0} متصل",
    "FailedLoginAttemptWithUserName": "محاولة تسجيل الدخول فاشلة من {0}",
@@ -16,7 +16,7 @@
    "Folders": "المجلدات",
    "Genres": "التصنيفات",
    "HeaderAlbumArtists": "فناني الألبوم",
-    "HeaderContinueWatching": "متابعة المشاهدة",
+    "HeaderContinueWatching": "إستئناف المشاهدة",
    "HeaderFavoriteAlbums": "الألبومات المفضلة",
    "HeaderFavoriteArtists": "الفنانون المفضلون",
    "HeaderFavoriteEpisodes": "الحلقات المفضلة",
--- a/Emby.Server.Implementations/Localization/Core/be.json
+++ b/Emby.Server.Implementations/Localization/Core/be.json
@@ -16,7 +16,7 @@
    "Collections": "Калекцыі",
    "Default": "Па змаўчанні",
    "FailedLoginAttemptWithUserName": "Няўдалая спроба ўваходу з {0}",
-    "Folders": "Папкі",
+    "Folders": "Тэчкі",
    "Favorites": "Абранае",
    "External": "Знешні",
    "Genres": "Жанры",
@@ -95,7 +95,7 @@
    "ServerNameNeedsToBeRestarted": "{0} патрабуе перазапуску",
    "Shows": "Шоу",
    "StartupEmbyServerIsLoading": "Jellyfin Server загружаецца. Калі ласка, паўтарыце спробу крыху пазней.",
-    "SubtitleDownloadFailureFromForItem": "Субцітры для {1} не ўдалося спампаваць з {0}",
+    "SubtitleDownloadFailureFromForItem": "Не атрымалася спампаваць субтытры з {0} для {1}",
    "TvShows": "Тэлепраграма",
    "Undefined": "Нявызначана",
    "UserLockedOutWithName": "Карыстальнік {0} быў заблакіраваны",
@@ -104,7 +104,7 @@
    "UserStartedPlayingItemWithValues": "{0} прайграваецца {1} на {2}",
    "UserStoppedPlayingItemWithValues": "{0} скончыў прайграванне {1} на {2}",
    "ValueHasBeenAddedToLibrary": "{0} быў дададзены ў вашу медыятэку",
-    "ValueSpecialEpisodeName": "Спецвыпуск - {0}",
+    "ValueSpecialEpisodeName": "Спецэпізод - {0}",
    "VersionNumber": "Версія {0}",
    "TasksMaintenanceCategory": "Абслугоўванне",
    "TasksLibraryCategory": "Бібліятэка",
@@ -114,7 +114,7 @@
    "TaskCleanCacheDescription": "Выдаляе файлы кэша, якія больш не патрэбныя сістэме.",
    "TaskRefreshChapterImages": "Вынуць выявы раздзелаў",
    "TaskRefreshLibrary": "Сканаваць бібліятэку",
-    "TaskRefreshLibraryDescription": "Сканіруе вашу медыятэку на наяўнасць новых файлаў і абнаўляе метаданыя.",
+    "TaskRefreshLibraryDescription": "Скануе вашу медыятэку на наяўнасць новых файлаў і абнаўляе метададзеныя.",
    "TaskCleanLogs": "Ачысціць журнал",
    "TaskRefreshPeople": "Абнавіць выканаўцаў",
    "TaskRefreshPeopleDescription": "Абнаўленне метаданых для акцёраў і рэжысёраў у вашай медыятэцы.",
@@ -137,5 +137,5 @@
    "TaskExtractMediaSegments": "Сканіраванне медыя-сегмента",
    "TaskMoveTrickplayImages": "Перанесці месцазнаходжанне выявы Trickplay",
    "CleanupUserDataTask": "Задача па ачыстцы дадзеных карыстальніка",
-    "CleanupUserDataTaskDescription": "Ачышчае ўсе даныя карыстальніка (стан прагляду, абранае і г.д.) для медыяфайлаў, што адсутнічаюць больш за 90 дзён."
+    "CleanupUserDataTaskDescription": "Ачысьціць усе дадзеныя карыстальніка (стан прагляду, абранае і г.д.) для медыяфайлаў, што адсутнічаюць больш за 90 дзён."
 }
--- a/Emby.Server.Implementations/Localization/Core/cy.json
+++ b/Emby.Server.Implementations/Localization/Core/cy.json
@@ -8,7 +8,7 @@
    "CameraImageUploadedFrom": "Mae delwedd camera newydd wedi'i lanlwytho o {0}",
    "Books": "Llyfrau",
    "AuthenticationSucceededWithUserName": "{0} wedi’i ddilysu’n llwyddiannus",
-    "Artists": "Crewyr",
+    "Artists": "Artistiaid",
    "AppDeviceValues": "Ap: {0}, Dyfais: {1}",
    "Albums": "Albwmau",
    "Genres": "Genres",
@@ -67,7 +67,7 @@
    "NotificationOptionAudioPlayback": "Dechreuwyd chwarae sain",
    "MessageServerConfigurationUpdated": "Mae gosodiadau gweinydd wedi'i ddiweddaru",
    "MessageNamedServerConfigurationUpdatedWithValue": "Mae adran gosodiadau gweinydd {0} wedi'i diweddaru",
-    "FailedLoginAttemptWithUserName": "Cais mewngofnodi wedi methu o {0}",
+    "FailedLoginAttemptWithUserName": "Cais mewngofnodi wedi methu gan {0}",
    "ValueHasBeenAddedToLibrary": "{0} wedi'i hychwanegu at eich llyfrgell gyfryngau",
    "UserStoppedPlayingItemWithValues": "{0} wedi gorffen chwarae {1} ar {2}",
    "UserStartedPlayingItemWithValues": "{0} yn chwarae {1} ar {2}",
@@ -123,14 +123,5 @@
    "TaskRefreshChapterImages": "Echdynnu Lluniau Pennod",
    "TaskCleanCacheDescription": "Dileu ffeiliau cache nad oes eu hangen ar y system mwyach.",
    "TaskCleanCache": "Gwaghau Ffolder Cache",
-    "HearingImpaired": "Nam ar y clyw",
-    "TaskAudioNormalization": "Gwastatau Sain",
-    "TaskAudioNormalizationDescription": "Yn sganio ffeiliau am ddata gwastatau sain.",
-    "TaskRefreshTrickplayImages": "Creuwch lluniau Trickplay",
-    "TaskRefreshTrickplayImagesDescription": "Creu rhagolygon Trickplay ar gyfer fideos mewn llyfrgelloedd gweithredol.",
-    "TaskDownloadMissingLyrics": "Lawrlwytho geiriau coll",
-    "TaskDownloadMissingLyricsDescription": "Lawrlwytho geiriau caneuon",
-    "TaskCleanCollectionsAndPlaylists": "Glanhau casgliadau a rhestrau chwarae",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Dileu eitemau o gasgliadau a rhestrau chwarae sydd ddim yn bodoli bellach.",
-    "TaskExtractMediaSegments": "Sganio Darnau Cyfryngau"
+    "HearingImpaired": "Nam ar y clyw"
 }
--- a/Emby.Server.Implementations/Localization/Core/de.json
+++ b/Emby.Server.Implementations/Localization/Core/de.json
@@ -9,9 +9,9 @@
    "Channels": "Kanäle",
    "ChapterNameValue": "Kapitel {0}",
    "Collections": "Sammlungen",
-    "DeviceOfflineWithName": "{0} ist offline",
-    "DeviceOnlineWithName": "{0} ist online",
-    "FailedLoginAttemptWithUserName": "Anmeldung von {0} fehlgeschlagen",
+    "DeviceOfflineWithName": "{0} hat die Verbindung getrennt",
+    "DeviceOnlineWithName": "{0} ist verbunden",
+    "FailedLoginAttemptWithUserName": "Fehlgeschlagener Anmeldeversuch von {0}",
    "Favorites": "Favoriten",
    "Folders": "Verzeichnisse",
    "Genres": "Genres",
@@ -21,7 +21,7 @@
    "HeaderFavoriteArtists": "Lieblingsinterpreten",
    "HeaderFavoriteEpisodes": "Lieblingsepisoden",
    "HeaderFavoriteShows": "Lieblingsserien",
-    "HeaderFavoriteSongs": "Lieblingssongs",
+    "HeaderFavoriteSongs": "Lieblingslieder",
    "HeaderLiveTV": "Live TV",
    "HeaderNextUp": "Als Nächstes",
    "HeaderRecordingGroups": "Aufnahme-Gruppen",
@@ -46,7 +46,7 @@
    "NewVersionIsAvailable": "Eine neue Jellyfin-Serverversion steht zum Download bereit.",
    "NotificationOptionApplicationUpdateAvailable": "Anwendungsaktualisierung verfügbar",
    "NotificationOptionApplicationUpdateInstalled": "Anwendungsaktualisierung installiert",
-    "NotificationOptionAudioPlayback": "Audio wird abgespielt",
+    "NotificationOptionAudioPlayback": "Audiowiedergabe gestartet",
    "NotificationOptionAudioPlaybackStopped": "Audiowiedergabe gestoppt",
    "NotificationOptionCameraImageUploaded": "Foto hochgeladen",
    "NotificationOptionInstallationFailed": "Installation fehlgeschlagen",
@@ -57,8 +57,8 @@
    "NotificationOptionPluginUpdateInstalled": "Pluginaktualisierung installiert",
    "NotificationOptionServerRestartRequired": "Serverneustart notwendig",
    "NotificationOptionTaskFailed": "Geplante Aufgabe fehlgeschlagen",
-    "NotificationOptionUserLockedOut": "Benutzer gesperrt",
-    "NotificationOptionVideoPlayback": "Video wird abgespielt",
+    "NotificationOptionUserLockedOut": "Benutzer ausgeschlossen",
+    "NotificationOptionVideoPlayback": "Videowiedergabe gestartet",
    "NotificationOptionVideoPlaybackStopped": "Videowiedergabe gestoppt",
    "Photos": "Fotos",
    "Playlists": "Wiedergabelisten",
@@ -82,7 +82,7 @@
    "UserCreatedWithName": "Benutzer {0} wurde erstellt",
    "UserDeletedWithName": "Benutzer {0} wurde gelöscht",
    "UserDownloadingItemWithValues": "{0} lädt {1} herunter",
-    "UserLockedOutWithName": "Benutzer {0} wurde gesperrt",
+    "UserLockedOutWithName": "Benutzer {0} wurde ausgeschlossen",
    "UserOfflineFromDevice": "{0} wurde getrennt von {1}",
    "UserOnlineFromDevice": "{0} ist online von {1}",
    "UserPasswordChangedWithName": "Das Passwort für Benutzer {0} wurde geändert",
@@ -97,25 +97,25 @@
    "TaskRefreshChannelsDescription": "Aktualisiert Internet-Kanal-Informationen.",
    "TaskRefreshChannels": "Kanäle aktualisieren",
    "TaskCleanTranscodeDescription": "Löscht Transkodierungsdateien, die älter als einen Tag sind.",
-    "TaskCleanTranscode": "Transkodierungsverzeichnis leeren",
+    "TaskCleanTranscode": "Transkodierungs-Verzeichnis aufräumen",
    "TaskUpdatePluginsDescription": "Lädt Updates für Plugins herunter, welche für automatische Updates konfiguriert sind und installiert diese.",
    "TaskUpdatePlugins": "Plugins aktualisieren",
    "TaskRefreshPeopleDescription": "Aktualisiert Metadaten für Schauspieler und Regisseure in deinen Bibliotheken.",
    "TaskRefreshPeople": "Personen aktualisieren",
    "TaskCleanLogsDescription": "Lösche Log-Dateien, die älter als {0} Tage sind.",
-    "TaskCleanLogs": "Protokollverzeichnis leeren",
-    "TaskRefreshLibraryDescription": "Durchsucht deine Medienbibliothek nach neuen Dateien und aktualisiert Metadaten.",
+    "TaskCleanLogs": "Log-Verzeichnis aufräumen",
+    "TaskRefreshLibraryDescription": "Durchsucht alle Bibliotheken nach neu hinzugefügten Dateien und aktualisiert Metadaten.",
    "TaskRefreshLibrary": "Medien-Bibliothek scannen",
-    "TaskRefreshChapterImagesDescription": "Erstellt Vorschaubilder für Videokapitel.",
-    "TaskRefreshChapterImages": "Kapitelvorschauen erstellen",
-    "TaskCleanCacheDescription": "Löscht Cache-Dateien, die vom System nicht mehr benötigt werden.",
-    "TaskCleanCache": "Cache-Verzeichnis leeren",
+    "TaskRefreshChapterImagesDescription": "Erstellt Vorschaubilder für Videos, die Kapitel besitzen.",
+    "TaskRefreshChapterImages": "Kapitel-Bilder extrahieren",
+    "TaskCleanCacheDescription": "Löscht vom System nicht mehr benötigte Zwischenspeicherdateien.",
+    "TaskCleanCache": "Zwischenspeicher-Verzeichnis aufräumen",
    "TasksChannelsCategory": "Internet-Kanäle",
    "TasksApplicationCategory": "Anwendung",
    "TasksLibraryCategory": "Bibliothek",
    "TasksMaintenanceCategory": "Wartung",
    "TaskCleanActivityLogDescription": "Löscht Aktivitätsprotokolleinträge, die älter als das konfigurierte Alter sind.",
-    "TaskCleanActivityLog": "Aktivitätsverlauf bereinigen",
+    "TaskCleanActivityLog": "Aktivitätsprotokolle aufräumen",
    "Undefined": "Undefiniert",
    "Forced": "Erzwungen",
    "Default": "Standard",
--- a/Emby.Server.Implementations/Localization/Core/es-AR.json
+++ b/Emby.Server.Implementations/Localization/Core/es-AR.json
@@ -70,7 +70,7 @@
    "ScheduledTaskFailedWithName": "{0} falló",
    "ScheduledTaskStartedWithName": "{0} iniciado",
    "ServerNameNeedsToBeRestarted": "{0} necesita ser reiniciado",
-    "Shows": "Series",
+    "Shows": "Programas",
    "Songs": "Canciones",
    "StartupEmbyServerIsLoading": "El servidor Jellyfin se está cargando. Vuelve a intentarlo en breve.",
    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
--- a/Emby.Server.Implementations/Localization/Core/es-MX.json
+++ b/Emby.Server.Implementations/Localization/Core/es-MX.json
@@ -30,7 +30,7 @@
    "ItemAddedWithName": "{0} fue agregado a la biblioteca",
    "ItemRemovedWithName": "{0} fue removido de la biblioteca",
    "LabelIpAddressValue": "Dirección IP: {0}",
-    "LabelRunningTimeValue": "Tiempo corriendo: {0}",
+    "LabelRunningTimeValue": "Tiempo de reproducción: {0}",
    "Latest": "Recientes",
    "MessageApplicationUpdated": "El servidor Jellyfin ha sido actualizado",
    "MessageApplicationUpdatedTo": "El servidor Jellyfin ha sido actualizado a {0}",
--- a/Emby.Server.Implementations/Localization/Core/et.json
+++ b/Emby.Server.Implementations/Localization/Core/et.json
@@ -72,7 +72,7 @@
    "NotificationOptionApplicationUpdateAvailable": "Rakenduse uuendus on saadaval",
    "NewVersionIsAvailable": "Jellyfin serveri uus versioon on allalaadimiseks saadaval.",
    "NameSeasonUnknown": "Tundmatu hooaeg",
-    "NameSeasonNumber": "{0}. hooaeg",
+    "NameSeasonNumber": "Hooaeg {0}",
    "NameInstallFailed": "{0} paigaldamine nurjus",
    "MusicVideos": "Muusikavideod",
    "Music": "Muusika",
@@ -137,5 +137,5 @@
    "TaskExtractMediaSegmentsDescription": "Eraldab või võtab meediasegmendid MediaSegment'i lubavatest pluginatest.",
    "TaskMoveTrickplayImages": "Muuda trickplay piltide asukoht",
    "CleanupUserDataTask": "Puhasta kasutajaandmed",
-    "CleanupUserDataTaskDescription": "Puhastab kõik kasutajaandmed (vaatamise olek, lemmikute olek jne) meediast, mida pole enam vähemalt 90 päeva saadaval olnud."
+    "CleanupUserDataTaskDescription": "Puhastab kõik kasutajaandmed (vaatamise olek, lemmikute olek jne) meediast, mis pole enam vähemalt 90 päeva saadaval olnud."
 }
--- a/Emby.Server.Implementations/Localization/Core/gsw.json
+++ b/Emby.Server.Implementations/Localization/Core/gsw.json
@@ -11,7 +11,7 @@
    "Collections": "Sammlungen",
    "DeviceOfflineWithName": "{0} wurde getrennt",
    "DeviceOnlineWithName": "{0} ist verbunden",
-    "FailedLoginAttemptWithUserName": "Fählgschlagene Ameldeversuech vo {0}",
+    "FailedLoginAttemptWithUserName": "Fehlgeschlagener Anmeldeversuch von {0}",
    "Favorites": "Favorite",
    "Folders": "Ordner",
    "Genres": "Genre",
--- a/Emby.Server.Implementations/Localization/Core/hi.json
+++ b/Emby.Server.Implementations/Localization/Core/hi.json
@@ -129,12 +129,5 @@
    "TaskAudioNormalization": "श्रव्य सामान्यीकरण",
    "TaskAudioNormalizationDescription": "श्रव्य सामान्यीकरण के लिए फाइलें अन्वेषण करें",
    "TaskDownloadMissingLyrics": "लापता गानों के बोल डाउनलोड करेँ",
-    "TaskDownloadMissingLyricsDescription": "गानों के बोल डाउनलोड करता है",
-    "TaskExtractMediaSegments": "मीडिया सेगमेंट स्कैन",
-    "TaskExtractMediaSegmentsDescription": "मीडियासेगमेंट सक्षम प्लगइन्स से मीडिया सेगमेंट निकालता है या प्राप्त करता है।",
-    "TaskMoveTrickplayImages": "ट्रिकप्ले छवि स्थान माइग्रेट करें",
-    "TaskMoveTrickplayImagesDescription": "लाइब्रेरी सेटिंग्स के अनुसार मौजूदा ट्रिकप्ले फ़ाइलों को स्थानांतरित करता है।",
-    "TaskCleanCollectionsAndPlaylistsDescription": "संग्रहों और प्लेलिस्टों से उन आइटमों को हटाता है जो अब मौजूद नहीं हैं।",
-    "TaskCleanCollectionsAndPlaylists": "संग्रह और प्लेलिस्ट साफ़ करें",
-    "CleanupUserDataTask": "यूज़र डेटा की सफाई करता है।"
+    "TaskDownloadMissingLyricsDescription": "गानों के बोल डाउनलोड करता है"
 }
--- a/Emby.Server.Implementations/Localization/Core/ko.json
+++ b/Emby.Server.Implementations/Localization/Core/ko.json
@@ -136,7 +136,5 @@
    "TaskMoveTrickplayImages": "트릭플레이 이미지 위치 마이그레이션",
    "TaskMoveTrickplayImagesDescription": "추출된 트릭플레이 이미지를 라이브러리 설정에 따라 이동합니다.",
    "TaskDownloadMissingLyrics": "누락된 가사 다운로드",
-    "TaskDownloadMissingLyricsDescription": "가사 다운로드",
-    "CleanupUserDataTask": "사용자 데이터 정리 작업",
-    "CleanupUserDataTaskDescription": "최소 90일 이상 존재하지 않는 미디어에 대한 사용자 데이터(시청 상태, 즐겨찾기 등)를 정리합니다."
+    "TaskDownloadMissingLyricsDescription": "가사 다운로드"
 }
--- a/Emby.Server.Implementations/Localization/Core/mi.json
+++ b/Emby.Server.Implementations/Localization/Core/mi.json
@@ -1,9 +0,0 @@
-{
-    "Albums": "Pukaemi",
-    "AppDeviceValues": "Taupānga: {0}, Pūrere: {1}",
-    "Application": "Taupānga",
-    "Artists": "Kaiwaiata",
-    "AuthenticationSucceededWithUserName": "{0} has been successfully authenticated",
-    "Books": "Ngā pukapuka",
-    "CameraImageUploadedFrom": "Kua tuku ake he whakaahua kāmera hou mai i {0}"
-}
--- a/Emby.Server.Implementations/Localization/Core/ml.json
+++ b/Emby.Server.Implementations/Localization/Core/ml.json
@@ -2,12 +2,12 @@
    "AppDeviceValues": "അപ്ലിക്കേഷൻ: {0}, ഉപകരണം: {1}",
    "Application": "അപ്ലിക്കേഷൻ",
    "AuthenticationSucceededWithUserName": "{0} വിജയകരമായി പ്രാമാണീകരിച്ചു",
-    "CameraImageUploadedFrom": "{0} എന്നതിൽ നിന്ന് ഒരു പുതിയ ക്യാമറ ചിത്രം അപ്‌ലോഡുചെയ്‌തു",
+    "CameraImageUploadedFrom": "Camera 0 from എന്നതിൽ നിന്ന് ഒരു പുതിയ ക്യാമറ ചിത്രം അപ്‌ലോഡുചെയ്‌തു",
    "ChapterNameValue": "അധ്യായം {0}",
    "DeviceOfflineWithName": "{0} വിച്ഛേദിച്ചു",
    "DeviceOnlineWithName": "{0} ബന്ധിപ്പിച്ചു",
    "FailedLoginAttemptWithUserName": "{0}ൽ നിന്നുള്ള പ്രവേശന ശ്രമം പരാജയപ്പെട്ടു",
-    "Forced": "നിർബന്ധിതമായി",
+    "Forced": "നിർബന്ധിച്ചു",
    "HeaderFavoriteAlbums": "പ്രിയപ്പെട്ട ആൽബങ്ങൾ",
    "HeaderFavoriteArtists": "പ്രിയപ്പെട്ട കലാകാരന്മാർ",
    "HeaderFavoriteEpisodes": "പ്രിയപ്പെട്ട എപ്പിസോഡുകൾ",
@@ -114,7 +114,7 @@
    "Artists": "കലാകാരന്മാർ",
    "Shows": "ഷോകൾ",
    "Default": "സ്ഥിരസ്ഥിതി",
-    "Favorites": "പ്രിയപ്പെട്ടവ",
+    "Favorites": "പ്രിയങ്കരങ്ങൾ",
    "Books": "പുസ്തകങ്ങൾ",
    "Genres": "വിഭാഗങ്ങൾ",
    "Channels": "ചാനലുകൾ",
--- a/Emby.Server.Implementations/Localization/Core/mn.json
+++ b/Emby.Server.Implementations/Localization/Core/mn.json
@@ -3,7 +3,7 @@
    "HeaderNextUp": "Дараа нь",
    "HeaderContinueWatching": "Үргэлжлүүлэн үзэх",
    "Songs": "Дуунууд",
-    "Playlists": "Тоглуулах жагсаалтууд",
+    "Playlists": "Playlist-ууд",
    "Movies": "Кинонууд",
    "Latest": "Сүүлийн үеийн",
    "Genres": "Төрлүүд",
@@ -71,7 +71,7 @@
    "Forced": "Хүчээр",
    "HeaderAlbumArtists": "Цомгийн уран бүтээлчид",
    "HeaderFavoriteAlbums": "Дуртай цомгууд",
-    "HeaderLiveTV": "Шууд ТВ",
+    "HeaderLiveTV": "Шууд",
    "HeaderRecordingGroups": "Бичлэгийн бүлгүүд",
    "HearingImpaired": "Сонсголын бэрхшээлтэй",
    "HomeVideos": "Үндсэн дүрсүүд",
@@ -109,7 +109,7 @@
    "ScheduledTaskStartedWithName": "{0}-г эхлүүлэв",
    "ServerNameNeedsToBeRestarted": "{0}-г дахин асаана уу",
    "Shows": "Шоу",
-    "Sync": "Синхрончлох",
+    "Sync": "Дахин",
    "System": "Систем",
    "TvShows": "ТВ нэвтрүүлгүүд",
    "Undefined": "Танисангүй",
--- a/Emby.Server.Implementations/Localization/Core/mr.json
+++ b/Emby.Server.Implementations/Localization/Core/mr.json
@@ -132,10 +132,5 @@
    "TaskDownloadMissingLyrics": "उपलब्ध नसलेली गीतपट्टी (Lyrics) डाउनलोड करा",
    "TaskAudioNormalization": "ऑडिओ सामान्यीकरण",
    "TaskAudioNormalizationDescription": "ऑडिओ सामान्यीकरणाचा डाटा स्कॅन करतो.",
-    "TaskDownloadMissingLyricsDescription": "गाण्यांची गीतपट्टी (Lyrics) डाउनलोड करतो",
-    "TaskExtractMediaSegmentsDescription": "सक्रिय असलेल्या प्लगिनमधून मीडिया विभाग प्राप्त करते.",
-    "TaskMoveTrickplayImagesDescription": "लायब्ररीच्या सेटिंग्जप्रमाणे आधीपासून अस्तित्वात असलेल्या ट्रिकप्ले फाइल्सचे स्थान बदलते.",
-    "TaskCleanCollectionsAndPlaylistsDescription": "जे संग्रह आणि प्लेलिस्ट आता अस्तित्वात नाहीत, त्यांमधील घटक हटवते.",
-    "CleanupUserDataTask": "वापरकर्ता डेटाची स्वच्छता प्रक्रिया",
-    "CleanupUserDataTaskDescription": "९० दिवसांहून अधिक काळ अनुपस्थित असलेल्या माध्यमांवरील सर्व वापरकर्ता माहिती (जसे पाहण्याची स्थिती, आवडी इ.) हटवते."
+    "TaskDownloadMissingLyricsDescription": "गाण्यांची गीतपट्टी (Lyrics) डाउनलोड करतो"
 }
--- a/Emby.Server.Implementations/Localization/Core/oc.json
+++ b/Emby.Server.Implementations/Localization/Core/oc.json
@@ -1 +0,0 @@
-{}
--- a/Emby.Server.Implementations/Localization/Core/pa.json
+++ b/Emby.Server.Implementations/Localization/Core/pa.json
@@ -134,8 +134,6 @@
    "TaskCleanCollectionsAndPlaylistsDescription": "ਕਲੈਕਸ਼ਨਾਂ ਅਤੇ ਪਲੇਲਿਸਟਾਂ ਵਿੱਚੋਂ ਉਹ ਆਈਟਮ ਹਟਾਉਂਦਾ ਹੈ ਜੋ ਹੁਣ ਮੌਜੂਦ ਨਹੀਂ ਹਨ।",
    "TaskCleanCollectionsAndPlaylists": "ਕਲੈਕਸ਼ਨਾਂ ਅਤੇ ਪਲੇਲਿਸਟਾਂ ਨੂੰ ਸਾਫ ਕਰੋ",
    "TaskAudioNormalization": "ਆਵਾਜ਼ ਸਧਾਰਣੀਕਰਨ",
-    "TaskRefreshTrickplayImagesDescription": "ਵੀਡੀਓ ਲਈ ਟ੍ਰਿਕਪਲੇ ਪ੍ਰੀਵਿਊ ਬਣਾਉਂਦਾ ਹੈ (ਜੇ ਲਾਇਬ੍ਰੇਰੀ ਵਿੱਚ ਚੁਣਿਆ ਗਿਆ ਹੈ)।",
-    "TaskKeyframeExtractorDescription": "ਕੀ-ਫ੍ਰੇਮਜ਼ ਨੂੰ ਵੀਡੀਓ ਫਾਈਲਾਂ ਵਿੱਚੋਂ ਨਿਕਾਲਦਾ ਹੈ ਤਾਂ ਜੋ ਹੋਰ ਜ਼ਿਆਦਾ ਸਟਿਕ ਹੋਣ ਵਾਲੀਆਂ HLS ਪਲੇਲਿਸਟਾਂ ਬਣਾਈਆਂ ਜਾ ਸਕਣ। ਇਹ ਕੰਮ ਲੰਬੇ ਸਮੇਂ ਤੱਕ ਚੱਲ ਸਕਦਾ ਹੈ।",
-    "CleanupUserDataTaskDescription": "ਘੱਟੋ-ਘੱਟ 90 ਦਿਨਾਂ ਤੋਂ ਮੌਜੂਦ ਨਾ ਹੋਣ ਵਾਲੇ ਮੀਡੀਆ ਤੋਂ ਸਾਰੇ ਉਪਭੋਗਤਾ ਡੇਟਾ (ਵਾਚ ਸਟੇਟ, ਮਨਪਸੰਦ ਸਟੇਟਸ ਆਦਿ) ਨੂੰ ਸਾਫ਼ ਕਰਦਾ ਹੈ।",
-    "CleanupUserDataTask": "ਯੂਜ਼ਰ ਡਾਟਾ ਸਾਫ਼ ਕਰਨ ਦਾ ਕੰਮ"
+    "TaskRefreshTrickplayImagesDescription": "ਚਲ ਰਹੀ ਲਾਇਬ੍ਰੇਰੀਆਂ ਵਿੱਚ ਵੀਡੀਓਜ਼ ਲਈ ਟ੍ਰਿਕਪਲੇ ਪ੍ਰੀਵਿਊ ਬਣਾਉਂਦਾ ਹੈ।",
+    "TaskKeyframeExtractorDescription": "ਕੀ-ਫ੍ਰੇਮਜ਼ ਨੂੰ ਵੀਡੀਓ ਫਾਈਲਾਂ ਵਿੱਚੋਂ ਨਿਕਾਲਦਾ ਹੈ ਤਾਂ ਜੋ ਹੋਰ ਜ਼ਿਆਦਾ ਸਟਿਕ ਹੋਣ ਵਾਲੀਆਂ HLS ਪਲੇਲਿਸਟਾਂ ਬਣਾਈਆਂ ਜਾ ਸਕਣ। ਇਹ ਕੰਮ ਲੰਬੇ ਸਮੇਂ ਤੱਕ ਚੱਲ ਸਕਦਾ ਹੈ।"
 }
--- a/Emby.Server.Implementations/Localization/Core/pl.json
+++ b/Emby.Server.Implementations/Localization/Core/pl.json
@@ -125,8 +125,8 @@
    "TaskKeyframeExtractorDescription": "Wyodrębnia klatki kluczowe z plików wideo w celu utworzenia bardziej precyzyjnych list odtwarzania HLS. To zadanie może trwać przez długi czas.",
    "TaskKeyframeExtractor": "Ekstraktor klatek kluczowych",
    "HearingImpaired": "Niedosłyszący",
-    "TaskRefreshTrickplayImages": "Generuj obrazy Trickplay",
-    "TaskRefreshTrickplayImagesDescription": "Tworzy podglądy Trickplay dla filmów we włączonych bibliotekach.",
+    "TaskRefreshTrickplayImages": "Generuj obrazy trickplay",
+    "TaskRefreshTrickplayImagesDescription": "Tworzy podglądy trickplay dla filmów we włączonych bibliotekach.",
    "TaskCleanCollectionsAndPlaylistsDescription": "Usuwa elementy z kolekcji i list odtwarzania, które już nie istnieją.",
    "TaskCleanCollectionsAndPlaylists": "Oczyść kolekcje i listy odtwarzania",
    "TaskAudioNormalization": "Normalizacja dźwięku",
--- a/Emby.Server.Implementations/Localization/Core/pr.json
+++ b/Emby.Server.Implementations/Localization/Core/pr.json
@@ -16,7 +16,7 @@
    "Collections": "Barrels",
    "ItemAddedWithName": "{0} is now with yer treasure",
    "Default": "Normal-like",
-    "FailedLoginAttemptWithUserName": "Ye failed to enter from {0}",
+    "FailedLoginAttemptWithUserName": "Ye failed to get in, try from {0}",
    "Favorites": "Finest Loot",
    "ItemRemovedWithName": "{0} was taken from yer treasure",
    "LabelIpAddressValue": "Ship's coordinates: {0}",
@@ -113,10 +113,5 @@
    "TaskCleanCache": "Sweep the Cache Chest",
    "TaskRefreshChapterImages": "Claim chapter portraits",
    "TaskRefreshChapterImagesDescription": "Paints wee portraits fer videos that own chapters.",
-    "TaskRefreshLibrary": "Scan the Treasure Trove",
-    "TasksChannelsCategory": "Channels o' thy Internet",
-    "TaskRefreshTrickplayImages": "Summon the picture tricks",
-    "TaskRefreshTrickplayImagesDescription": "Summons picture trick previews for videos in ye enabled book roost",
-    "TaskUpdatePlugins": "Resummon yer Plugins",
-    "TaskCleanTranscode": "Swab Ye Transcode Directory"
+    "TaskRefreshLibrary": "Scan the Treasure Trove"
 }
--- a/Emby.Server.Implementations/Localization/Core/pt-PT.json
+++ b/Emby.Server.Implementations/Localization/Core/pt-PT.json
@@ -5,7 +5,7 @@
    "Artists": "Artistas",
    "AuthenticationSucceededWithUserName": "{0} autenticado com sucesso",
    "Books": "Livros",
-    "CameraImageUploadedFrom": "Uma nova imagem da câmara foi enviada a partir de {0}",
+    "CameraImageUploadedFrom": "Uma nova imagem de câmara foi enviada a partir de {0}",
    "Channels": "Canais",
    "ChapterNameValue": "Capítulo {0}",
    "Collections": "Coleções",
@@ -125,8 +125,8 @@
    "TaskKeyframeExtractor": "Extrator de Quadros-chave",
    "External": "Externo",
    "HearingImpaired": "Surdo",
-    "TaskRefreshTrickplayImages": "Gerar Imagens de Trickplay",
-    "TaskRefreshTrickplayImagesDescription": "Cria ficheiros de trickplay para vídeos nas bibliotecas ativas.",
+    "TaskRefreshTrickplayImages": "Gerar imagens de truques",
+    "TaskRefreshTrickplayImagesDescription": "Cria vizualizações de truques para videos nas librarias ativas.",
    "TaskCleanCollectionsAndPlaylistsDescription": "Remove itens de coleções e listas de reprodução que já não existem.",
    "TaskCleanCollectionsAndPlaylists": "Limpar coleções e listas de reprodução",
    "TaskAudioNormalizationDescription": "Analisa os ficheiros para obter dados de normalização de áudio.",
--- a/Emby.Server.Implementations/Localization/Core/sw.json
+++ b/Emby.Server.Implementations/Localization/Core/sw.json
@@ -1 +0,0 @@
-{}
--- a/Emby.Server.Implementations/Localization/Core/th.json
+++ b/Emby.Server.Implementations/Localization/Core/th.json
@@ -135,7 +135,5 @@
    "TaskExtractMediaSegments": "การสแกนส่วนของสื่อมีเดีย",
    "TaskMoveTrickplayImagesDescription": "ย้ายไฟล์ Trickplay ตามการตั้งค่าของไลบรารี",
    "TaskExtractMediaSegmentsDescription": "แยกหรือดึงส่วนของสื่อจากปลั๊กอินที่เปิดใช้งาน MediaSegment",
-    "TaskMoveTrickplayImages": "ย้ายตำแหน่งเก็บภาพตัวอย่าง Trickplay",
-    "CleanupUserDataTask": "ส่วนงานล้างข้อมูลผู้ใช้",
-    "CleanupUserDataTaskDescription": "ล้างข้อมูลผู้ใช้ทั้งหมด (สถานะการรับชม สถานะรายการโปรด ฯลฯ) จากสื่อที่ไม่ได้ใช้งานแล้วอย่างน้อย 90 วัน"
+    "TaskMoveTrickplayImages": "ย้ายตำแหน่งเก็บภาพตัวอย่าง Trickplay"
 }
--- a/Emby.Server.Implementations/Localization/Core/vi.json
+++ b/Emby.Server.Implementations/Localization/Core/vi.json
@@ -39,7 +39,7 @@
    "TasksMaintenanceCategory": "Bảo Trì",
    "VersionNumber": "Phiên Bản {0}",
    "ValueHasBeenAddedToLibrary": "{0} đã được thêm vào thư viện của bạn",
-    "UserStoppedPlayingItemWithValues": "{0} đã kết thúc phát {1} trên {2}",
+    "UserStoppedPlayingItemWithValues": "{0} đã phát xong {1} trên {2}",
    "UserStartedPlayingItemWithValues": "{0} đang phát {1} trên {2}",
    "UserPolicyUpdatedWithName": "Chính sách người dùng đã được cập nhật cho {0}",
    "UserPasswordChangedWithName": "Mật khẩu đã được thay đổi cho người dùng {0}",
--- a/Emby.Server.Implementations/Localization/Core/zh-HK.json
+++ b/Emby.Server.Implementations/Localization/Core/zh-HK.json
@@ -23,7 +23,7 @@
    "HeaderFavoriteShows": "最愛的節目",
    "HeaderFavoriteSongs": "最愛的歌曲",
    "HeaderLiveTV": "電視直播",
-    "HeaderNextUp": "繼續觀看",
+    "HeaderNextUp": "接著播放",
    "HeaderRecordingGroups": "錄製組",
    "HomeVideos": "家庭影片",
    "Inherit": "繼承",
@@ -127,8 +127,8 @@
    "HearingImpaired": "聽力障礙",
    "TaskRefreshTrickplayImages": "建立 Trickplay 圖像",
    "TaskRefreshTrickplayImagesDescription": "為已啟用 Trickplay 的媒體庫內的影片建立 Trickplay 預覽圖。",
-    "TaskExtractMediaSegments": "掃描媒體分段資訊",
-    "TaskExtractMediaSegmentsDescription": "從允許MediaSegment 功能的插件中獲取媒體片段。",
+    "TaskExtractMediaSegments": "掃描媒體段落",
+    "TaskExtractMediaSegmentsDescription": "從MediaSegment中被允許的插件獲取媒體段落。",
    "TaskDownloadMissingLyrics": "下載欠缺歌詞",
    "TaskDownloadMissingLyricsDescription": "下載歌詞",
    "TaskCleanCollectionsAndPlaylists": "整理媒體與播放清單",
@@ -137,6 +137,5 @@
    "TaskCleanCollectionsAndPlaylistsDescription": "從資料庫及播放清單中移除已不存在的項目。",
    "TaskMoveTrickplayImagesDescription": "根據媒體庫設定移動現有的 Trickplay 檔案。",
    "TaskMoveTrickplayImages": "轉移 Trickplay 影像位置",
-    "CleanupUserDataTask": "用戶資料清理工作",
-    "CleanupUserDataTaskDescription": "從用戶數據中清除已經被刪除超過 90 日的媒體相關資料。"
+    "CleanupUserDataTask": "用戶資料清理工作"
 }
--- a/Emby.Server.Implementations/Localization/iso6392.txt
+++ b/Emby.Server.Implementations/Localization/iso6392.txt
@@ -347,8 +347,8 @@ pli||pi|Pali|pali
 pol||pl|Polish|polonais
 pon|||Pohnpeian|pohnpei
 por||pt|Portuguese|portugais
-por||pt-pt|Portuguese (Portugal)|portugais (pt-pt)
-por||pt-br|Portuguese (Brazil)|portugais (pt-br)
+pop||pt-pt|Portuguese (Portugal)|portugais (pt-pt)
+pob||pt-br|Portuguese (Brazil)|portugais (pt-br)
 pra|||Prakrit languages|prâkrit, langues
 pro|||Provençal, Old (to 1500)|provençal ancien (jusqu'à 1500)
 pus||ps|Pushto; Pashto|pachto
--- a/Emby.Server.Implementations/TV/TVSeriesManager.cs
+++ b/Emby.Server.Implementations/TV/TVSeriesManager.cs
@@ -266,7 +266,7 @@ namespace Emby.Server.Implementations.TV
                items = items.Skip(query.StartIndex.Value);
            }

-            if (query.Limit.HasValue && query.Limit.Value > 0)
+            if (query.Limit.HasValue)
            {
                items = items.Take(query.Limit.Value);
            }
--- a/Jellyfin.Api/Controllers/ActivityLogController.cs
+++ b/Jellyfin.Api/Controllers/ActivityLogController.cs
@@ -1,16 +1,13 @@
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
-using Jellyfin.Data.Enums;
+using Jellyfin.Api.Constants;
 using Jellyfin.Data.Queries;
-using Jellyfin.Database.Implementations.Enums;
 using MediaBrowser.Common.Api;
 using MediaBrowser.Model.Activity;
 using MediaBrowser.Model.Querying;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;

 namespace Jellyfin.Api.Controllers;

@@ -35,20 +32,10 @@ public class ActivityLogController : BaseJellyfinApiController
    /// <summary>
    /// Gets activity log entries.
    /// </summary>
-    /// <param name="startIndex">The record index to start at. All items with a lower index will be dropped from the results.</param>
-    /// <param name="limit">The maximum number of records to return.</param>
-    /// <param name="minDate">The minimum date.</param>
-    /// <param name="maxDate">The maximum date.</param>
-    /// <param name="hasUserId">Filter log entries if it has user id, or not.</param>
-    /// <param name="name">Filter by name.</param>
-    /// <param name="overview">Filter by overview.</param>
-    /// <param name="shortOverview">Filter by short overview.</param>
-    /// <param name="type">Filter by type.</param>
-    /// <param name="itemId">Filter by item id.</param>
-    /// <param name="username">Filter by username.</param>
-    /// <param name="severity">Filter by log severity.</param>
-    /// <param name="sortBy">Specify one or more sort orders. Format: SortBy=Name,Type.</param>
-    /// <param name="sortOrder">Sort Order..</param>
+    /// <param name="startIndex">Optional. The record index to start at. All items with a lower index will be dropped from the results.</param>
+    /// <param name="limit">Optional. The maximum number of records to return.</param>
+    /// <param name="minDate">Optional. The minimum date. Format = ISO.</param>
+    /// <param name="hasUserId">Optional. Filter log entries if it has user id, or not.</param>
    /// <response code="200">Activity log returned.</response>
    /// <returns>A <see cref="QueryResult{ActivityLogEntry}"/> containing the log entries.</returns>
    [HttpGet("Entries")]
@@ -57,62 +44,14 @@ public class ActivityLogController : BaseJellyfinApiController
        [FromQuery] int? startIndex,
        [FromQuery] int? limit,
        [FromQuery] DateTime? minDate,
-        [FromQuery] DateTime? maxDate,
-        [FromQuery] bool? hasUserId,
-        [FromQuery] string? name,
-        [FromQuery] string? overview,
-        [FromQuery] string? shortOverview,
-        [FromQuery] string? type,
-        [FromQuery] Guid? itemId,
-        [FromQuery] string? username,
-        [FromQuery] LogLevel? severity,
-        [FromQuery] ActivityLogSortBy[]? sortBy,
-        [FromQuery] SortOrder[]? sortOrder)
+        [FromQuery] bool? hasUserId)
    {
-        var query = new ActivityLogQuery
+        return await _activityManager.GetPagedResultAsync(new ActivityLogQuery
        {
            Skip = startIndex,
            Limit = limit,
            MinDate = minDate,
-            MaxDate = maxDate,
-            HasUserId = hasUserId,
-            Name = name,
-            Overview = overview,
-            ShortOverview = shortOverview,
-            Type = type,
-            ItemId = itemId,
-            Username = username,
-            Severity = severity,
-            OrderBy = GetOrderBy(sortBy ?? [], sortOrder ?? []),
-        };
-
-        return await _activityManager.GetPagedResultAsync(query).ConfigureAwait(false);
-    }
-
-    private static (ActivityLogSortBy SortBy, SortOrder SortOrder)[] GetOrderBy(
-        IReadOnlyList<ActivityLogSortBy> sortBy,
-        IReadOnlyList<SortOrder> requestedSortOrder)
-    {
-        if (sortBy.Count == 0)
-        {
-            return [];
-        }
-
-        var result = new (ActivityLogSortBy, SortOrder)[sortBy.Count];
-        var i = 0;
-        for (; i < requestedSortOrder.Count; i++)
-        {
-            result[i] = (sortBy[i], requestedSortOrder[i]);
-        }
-
-        // Add remaining elements with the first specified SortOrder
-        // or the default one if no SortOrders are specified
-        var order = requestedSortOrder.Count > 0 ? requestedSortOrder[0] : SortOrder.Ascending;
-        for (; i < sortBy.Count; i++)
-        {
-            result[i] = (sortBy[i], order);
-        }
-
-        return result;
+            HasUserId = hasUserId
+        }).ConfigureAwait(false);
    }
 }
--- a/Jellyfin.Api/Controllers/ArtistsController.cs
+++ b/Jellyfin.Api/Controllers/ArtistsController.cs
@@ -122,6 +122,7 @@ public class ArtistsController : BaseJellyfinApiController
    {
        userId = RequestHelpers.GetUserId(User, userId);
        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

        User? user = null;
@@ -325,6 +326,7 @@ public class ArtistsController : BaseJellyfinApiController
    {
        userId = RequestHelpers.GetUserId(User, userId);
        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

        User? user = null;
@@ -465,7 +467,7 @@ public class ArtistsController : BaseJellyfinApiController
    public ActionResult<BaseItemDto> GetArtistByName([FromRoute, Required] string name, [FromQuery] Guid? userId)
    {
        userId = RequestHelpers.GetUserId(User, userId);
-        var dtoOptions = new DtoOptions();
+        var dtoOptions = new DtoOptions().AddClientFields(User);

        var item = _libraryManager.GetArtist(name, dtoOptions);

--- a/Jellyfin.Api/Controllers/CollectionController.cs
+++ b/Jellyfin.Api/Controllers/CollectionController.cs
@@ -65,7 +65,7 @@ public class CollectionController : BaseJellyfinApiController
            UserIds = new[] { userId }
        }).ConfigureAwait(false);

-        var dtoOptions = new DtoOptions();
+        var dtoOptions = new DtoOptions().AddClientFields(User);

        var dto = _dtoService.GetBaseItemDto(item, dtoOptions);

--- a/Jellyfin.Api/Controllers/GenresController.cs
+++ b/Jellyfin.Api/Controllers/GenresController.cs
@@ -94,6 +94,7 @@ public class GenresController : BaseJellyfinApiController
    {
        userId = RequestHelpers.GetUserId(User, userId);
        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, false, imageTypeLimit, enableImageTypes);

        User? user = userId.IsNullOrEmpty()
@@ -158,7 +159,8 @@ public class GenresController : BaseJellyfinApiController
    public ActionResult<BaseItemDto> GetGenre([FromRoute, Required] string genreName, [FromQuery] Guid? userId)
    {
        userId = RequestHelpers.GetUserId(User, userId);
-        var dtoOptions = new DtoOptions();
+        var dtoOptions = new DtoOptions()
+            .AddClientFields(User);

        Genre? item;
        if (genreName.Contains(BaseItem.SlugChar, StringComparison.OrdinalIgnoreCase))
--- a/Jellyfin.Api/Controllers/InstantMixController.cs
+++ b/Jellyfin.Api/Controllers/InstantMixController.cs
@@ -90,6 +90,7 @@ public class InstantMixController : BaseJellyfinApiController
        }

        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
        var items = _musicManager.GetInstantMixFromItem(item, user, dtoOptions);
        return GetResult(items, user, limit, dtoOptions);
@@ -133,6 +134,7 @@ public class InstantMixController : BaseJellyfinApiController
        }

        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
        var items = _musicManager.GetInstantMixFromItem(item, user, dtoOptions);
        return GetResult(items, user, limit, dtoOptions);
@@ -176,6 +178,7 @@ public class InstantMixController : BaseJellyfinApiController
        }

        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
        var items = _musicManager.GetInstantMixFromItem(item, user, dtoOptions);
        return GetResult(items, user, limit, dtoOptions);
@@ -211,6 +214,7 @@ public class InstantMixController : BaseJellyfinApiController
            ? null
            : _userManager.GetUserById(userId.Value);
        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
        var items = _musicManager.GetInstantMixFromGenres(new[] { name }, user, dtoOptions);
        return GetResult(items, user, limit, dtoOptions);
@@ -254,6 +258,7 @@ public class InstantMixController : BaseJellyfinApiController
        }

        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
        var items = _musicManager.GetInstantMixFromItem(item, user, dtoOptions);
        return GetResult(items, user, limit, dtoOptions);
@@ -297,6 +302,7 @@ public class InstantMixController : BaseJellyfinApiController
        }

        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
        var items = _musicManager.GetInstantMixFromItem(item, user, dtoOptions);
        return GetResult(items, user, limit, dtoOptions);
@@ -379,6 +385,7 @@ public class InstantMixController : BaseJellyfinApiController
        }

        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
        var items = _musicManager.GetInstantMixFromItem(item, user, dtoOptions);
        return GetResult(items, user, limit, dtoOptions);
--- a/Jellyfin.Api/Controllers/ItemUpdateController.cs
+++ b/Jellyfin.Api/Controllers/ItemUpdateController.cs
@@ -180,14 +180,11 @@ public class ItemUpdateController : BaseJellyfinApiController
                info.ContentTypeOptions = GetContentTypeOptions(true).ToArray();
                info.ContentType = configuredContentType;

-                if (inheritedContentType is null
-                    || inheritedContentType == CollectionType.tvshows
-                    || inheritedContentType == CollectionType.movies)
+                if (inheritedContentType is null || inheritedContentType == CollectionType.tvshows)
                {
                    info.ContentTypeOptions = info.ContentTypeOptions
                        .Where(i => string.IsNullOrWhiteSpace(i.Value)
-                                    || string.Equals(i.Value, "TvShows", StringComparison.OrdinalIgnoreCase)
-                                    || string.Equals(i.Value, "Movies", StringComparison.OrdinalIgnoreCase))
+                                    || string.Equals(i.Value, "TvShows", StringComparison.OrdinalIgnoreCase))
                        .ToArray();
                }
            }
--- a/Jellyfin.Api/Controllers/ItemsController.cs
+++ b/Jellyfin.Api/Controllers/ItemsController.cs
@@ -268,6 +268,7 @@ public class ItemsController : BaseJellyfinApiController
        }

        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

        if (includeItemTypes.Length == 1
@@ -848,6 +849,7 @@ public class ItemsController : BaseJellyfinApiController

        var parentIdGuid = parentId ?? Guid.Empty;
        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

        var ancestorIds = Array.Empty<Guid>();
--- a/Jellyfin.Api/Controllers/LibraryController.cs
+++ b/Jellyfin.Api/Controllers/LibraryController.cs
@@ -188,7 +188,7 @@ public class LibraryController : BaseJellyfinApiController
            item = parent;
        }

-        var dtoOptions = new DtoOptions();
+        var dtoOptions = new DtoOptions().AddClientFields(User);
        var items = themeItems
            .Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user, item))
            .ToArray();
@@ -261,7 +261,7 @@ public class LibraryController : BaseJellyfinApiController
            item = parent;
        }

-        var dtoOptions = new DtoOptions();
+        var dtoOptions = new DtoOptions().AddClientFields(User);
        var items = themeItems
            .Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user, item))
            .ToArray();
@@ -497,7 +497,7 @@ public class LibraryController : BaseJellyfinApiController

        var baseItemDtos = new List<BaseItemDto>();

-        var dtoOptions = new DtoOptions();
+        var dtoOptions = new DtoOptions().AddClientFields(User);
        BaseItem? parent = item.GetParent();

        while (parent is not null)
@@ -557,7 +557,7 @@ public class LibraryController : BaseJellyfinApiController
            items = items.Where(i => i.IsHidden == val).ToList();
        }

-        var dtoOptions = new DtoOptions();
+        var dtoOptions = new DtoOptions().AddClientFields(User);
        var resultArray = _dtoService.GetBaseItemDtos(items, dtoOptions);
        return new QueryResult<BaseItemDto>(resultArray);
    }
@@ -759,7 +759,8 @@ public class LibraryController : BaseJellyfinApiController
            return new QueryResult<BaseItemDto>();
        }

-        var dtoOptions = new DtoOptions { Fields = fields };
+        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User);

        var program = item as IHasProgramAttributes;
        bool? isMovie = item is Movie || (program is not null && program.IsMovie) || item is Trailer;
--- a/Jellyfin.Api/Controllers/LiveTvController.cs
+++ b/Jellyfin.Api/Controllers/LiveTvController.cs
@@ -170,6 +170,7 @@ public class LiveTvController : BaseJellyfinApiController
    {
        userId = RequestHelpers.GetUserId(User, userId);
        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

        var channelResult = _liveTvManager.GetInternalChannels(
@@ -241,7 +242,8 @@ public class LiveTvController : BaseJellyfinApiController
            return NotFound();
        }

-        var dtoOptions = new DtoOptions();
+        var dtoOptions = new DtoOptions()
+            .AddClientFields(User);
        return _dtoService.GetBaseItemDto(item, dtoOptions, user);
    }

@@ -295,6 +297,7 @@ public class LiveTvController : BaseJellyfinApiController
    {
        userId = RequestHelpers.GetUserId(User, userId);
        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

        return await _liveTvManager.GetRecordingsAsync(
@@ -441,7 +444,8 @@ public class LiveTvController : BaseJellyfinApiController
            return NotFound();
        }

-        var dtoOptions = new DtoOptions();
+        var dtoOptions = new DtoOptions()
+            .AddClientFields(User);

        return _dtoService.GetBaseItemDto(item, dtoOptions, user);
    }
@@ -631,6 +635,7 @@ public class LiveTvController : BaseJellyfinApiController
        }

        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
        return await _liveTvManager.GetPrograms(query, dtoOptions, CancellationToken.None).ConfigureAwait(false);
    }
@@ -685,6 +690,7 @@ public class LiveTvController : BaseJellyfinApiController
        }

        var dtoOptions = new DtoOptions { Fields = body.Fields ?? [] }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(body.EnableImages, body.EnableUserData, body.ImageTypeLimit, body.EnableImageTypes ?? []);
        return await _liveTvManager.GetPrograms(query, dtoOptions, CancellationToken.None).ConfigureAwait(false);
    }
@@ -754,6 +760,7 @@ public class LiveTvController : BaseJellyfinApiController
        };

        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
        return await _liveTvManager.GetRecommendedProgramsAsync(query, dtoOptions, CancellationToken.None).ConfigureAwait(false);
    }
--- a/Jellyfin.Api/Controllers/MoviesController.cs
+++ b/Jellyfin.Api/Controllers/MoviesController.cs
@@ -74,7 +74,8 @@ public class MoviesController : BaseJellyfinApiController
        var user = userId.IsNullOrEmpty()
            ? null
            : _userManager.GetUserById(userId.Value);
-        var dtoOptions = new DtoOptions { Fields = fields };
+        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User);

        var categories = new List<RecommendationDto>();

--- a/Jellyfin.Api/Controllers/MusicGenresController.cs
+++ b/Jellyfin.Api/Controllers/MusicGenresController.cs
@@ -94,6 +94,7 @@ public class MusicGenresController : BaseJellyfinApiController
    {
        userId = RequestHelpers.GetUserId(User, userId);
        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, false, imageTypeLimit, enableImageTypes);

        User? user = userId.IsNullOrEmpty()
@@ -147,7 +148,7 @@ public class MusicGenresController : BaseJellyfinApiController
    public ActionResult<BaseItemDto> GetMusicGenre([FromRoute, Required] string genreName, [FromQuery] Guid? userId)
    {
        userId = RequestHelpers.GetUserId(User, userId);
-        var dtoOptions = new DtoOptions();
+        var dtoOptions = new DtoOptions().AddClientFields(User);

        MusicGenre? item;

--- a/Jellyfin.Api/Controllers/PersonsController.cs
+++ b/Jellyfin.Api/Controllers/PersonsController.cs
@@ -81,6 +81,7 @@ public class PersonsController : BaseJellyfinApiController
    {
        userId = RequestHelpers.GetUserId(User, userId);
        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

        User? user = userId.IsNullOrEmpty()
@@ -120,7 +121,8 @@ public class PersonsController : BaseJellyfinApiController
    public ActionResult<BaseItemDto> GetPerson([FromRoute, Required] string name, [FromQuery] Guid? userId)
    {
        userId = RequestHelpers.GetUserId(User, userId);
-        var dtoOptions = new DtoOptions();
+        var dtoOptions = new DtoOptions()
+            .AddClientFields(User);

        var item = _libraryManager.GetPerson(name);
        if (item is null)
--- a/Jellyfin.Api/Controllers/PlaylistsController.cs
+++ b/Jellyfin.Api/Controllers/PlaylistsController.cs
@@ -548,6 +548,7 @@ public class PlaylistsController : BaseJellyfinApiController
        }

        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

        var dtos = _dtoService.GetBaseItemDtos(items.Select(i => i.Item2).ToList(), dtoOptions, user);
--- a/Jellyfin.Api/Controllers/StudiosController.cs
+++ b/Jellyfin.Api/Controllers/StudiosController.cs
@@ -89,6 +89,7 @@ public class StudiosController : BaseJellyfinApiController
    {
        userId = RequestHelpers.GetUserId(User, userId);
        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

        User? user = userId.IsNullOrEmpty()
@@ -141,7 +142,7 @@ public class StudiosController : BaseJellyfinApiController
    public ActionResult<BaseItemDto> GetStudio([FromRoute, Required] string name, [FromQuery] Guid? userId)
    {
        userId = RequestHelpers.GetUserId(User, userId);
-        var dtoOptions = new DtoOptions();
+        var dtoOptions = new DtoOptions().AddClientFields(User);

        var item = _libraryManager.GetStudio(name);
        if (!userId.IsNullOrEmpty())
--- a/Jellyfin.Api/Controllers/SuggestionsController.cs
+++ b/Jellyfin.Api/Controllers/SuggestionsController.cs
@@ -77,7 +77,7 @@ public class SuggestionsController : BaseJellyfinApiController
            user = _userManager.GetUserById(requestUserId);
        }

-        var dtoOptions = new DtoOptions();
+        var dtoOptions = new DtoOptions().AddClientFields(User);
        var result = _libraryManager.GetItemsResult(new InternalItemsQuery(user)
        {
            OrderBy = new[] { (ItemSortBy.Random, SortOrder.Descending) },
--- a/Jellyfin.Api/Controllers/TvShowsController.cs
+++ b/Jellyfin.Api/Controllers/TvShowsController.cs
@@ -99,6 +99,7 @@ public class TvShowsController : BaseJellyfinApiController
        }

        var options = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

        var result = _tvSeriesManager.GetNextUp(
@@ -160,6 +161,7 @@ public class TvShowsController : BaseJellyfinApiController
        var parentIdGuid = parentId ?? Guid.Empty;

        var options = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

        var itemsResult = _libraryManager.GetItemList(new InternalItemsQuery(user)
@@ -229,6 +231,7 @@ public class TvShowsController : BaseJellyfinApiController
        List<BaseItem> episodes;

        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
        var shouldIncludeMissingEpisodes = (user is not null && user.DisplayMissingEpisodes) || User.GetIsApiKey();

@@ -357,6 +360,7 @@ public class TvShowsController : BaseJellyfinApiController
        });

        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

        var returnItems = _dtoService.GetBaseItemDtos(seasons, dtoOptions, user);
--- a/Jellyfin.Api/Controllers/UserLibraryController.cs
+++ b/Jellyfin.Api/Controllers/UserLibraryController.cs
@@ -13,7 +13,6 @@ using Jellyfin.Extensions;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Dto;
@@ -95,7 +94,7 @@ public class UserLibraryController : BaseJellyfinApiController

        await RefreshItemOnDemandIfNeeded(item).ConfigureAwait(false);

-        var dtoOptions = new DtoOptions();
+        var dtoOptions = new DtoOptions().AddClientFields(User);

        return _dtoService.GetBaseItemDto(item, dtoOptions, user);
    }
@@ -134,7 +133,7 @@ public class UserLibraryController : BaseJellyfinApiController
        }

        var item = _libraryManager.GetUserRootFolder();
-        var dtoOptions = new DtoOptions();
+        var dtoOptions = new DtoOptions().AddClientFields(User);
        return _dtoService.GetBaseItemDto(item, dtoOptions, user);
    }

@@ -181,7 +180,7 @@ public class UserLibraryController : BaseJellyfinApiController
        }

        var items = await _libraryManager.GetIntros(item, user).ConfigureAwait(false);
-        var dtoOptions = new DtoOptions();
+        var dtoOptions = new DtoOptions().AddClientFields(User);
        var dtos = items.Select(i => _dtoService.GetBaseItemDto(i, dtoOptions, user)).ToArray();

        return new QueryResult<BaseItemDto>(dtos);
@@ -423,7 +422,7 @@ public class UserLibraryController : BaseJellyfinApiController
            return NotFound();
        }

-        var dtoOptions = new DtoOptions();
+        var dtoOptions = new DtoOptions().AddClientFields(User);
        if (item is IHasTrailers hasTrailers)
        {
            var trailers = hasTrailers.LocalTrailers;
@@ -479,7 +478,7 @@ public class UserLibraryController : BaseJellyfinApiController
            return NotFound();
        }

-        var dtoOptions = new DtoOptions();
+        var dtoOptions = new DtoOptions().AddClientFields(User);

        return Ok(item
            .GetExtras()
@@ -550,6 +549,7 @@ public class UserLibraryController : BaseJellyfinApiController
        }

        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

        var list = _userViewManager.GetLatestItems(
@@ -569,7 +569,7 @@ public class UserLibraryController : BaseJellyfinApiController
            var item = i.Item2[0];
            var childCount = 0;

-            if (i.Item1 is not null && (i.Item2.Count > 1 || i.Item1 is MusicAlbum || i.Item1 is Series ))
+            if (i.Item1 is not null && (i.Item2.Count > 1 || i.Item1 is MusicAlbum))
            {
                item = i.Item1;
                childCount = i.Item2.Count;
--- a/Jellyfin.Api/Controllers/UserViewsController.cs
+++ b/Jellyfin.Api/Controllers/UserViewsController.cs
@@ -86,7 +86,7 @@ public class UserViewsController : BaseJellyfinApiController

        var folders = _userViewManager.GetUserViews(query);

-        var dtoOptions = new DtoOptions();
+        var dtoOptions = new DtoOptions().AddClientFields(User);
        dtoOptions.Fields = [..dtoOptions.Fields, ItemFields.PrimaryImageAspectRatio, ItemFields.DisplayPreferencesId];

        var dtos = Array.ConvertAll(folders, i => _dtoService.GetBaseItemDto(i, dtoOptions, user));
--- a/Jellyfin.Api/Controllers/VideosController.cs
+++ b/Jellyfin.Api/Controllers/VideosController.cs
@@ -111,6 +111,7 @@ public class VideosController : BaseJellyfinApiController
        }

        var dtoOptions = new DtoOptions();
+        dtoOptions = dtoOptions.AddClientFields(User);

        BaseItemDto[] items;
        if (item is Video video)
--- a/Jellyfin.Api/Controllers/YearsController.cs
+++ b/Jellyfin.Api/Controllers/YearsController.cs
@@ -89,6 +89,7 @@ public class YearsController : BaseJellyfinApiController
    {
        userId = RequestHelpers.GetUserId(User, userId);
        var dtoOptions = new DtoOptions { Fields = fields }
+            .AddClientFields(User)
            .AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

        User? user = userId.IsNullOrEmpty()
@@ -181,7 +182,8 @@ public class YearsController : BaseJellyfinApiController
            return NotFound();
        }

-        var dtoOptions = new DtoOptions();
+        var dtoOptions = new DtoOptions()
+            .AddClientFields(User);

        if (!userId.IsNullOrEmpty())
        {
--- a/Jellyfin.Api/Extensions/DtoExtensions.cs
+++ b/Jellyfin.Api/Extensions/DtoExtensions.cs
@@ -1,6 +1,10 @@
+using System;
 using System.Collections.Generic;
+using System.Security.Claims;
+using Jellyfin.Extensions;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;

 namespace Jellyfin.Api.Extensions;

@@ -9,6 +13,55 @@ namespace Jellyfin.Api.Extensions;
 /// </summary>
 public static class DtoExtensions
 {
+    /// <summary>
+    /// Add additional fields depending on client.
+    /// </summary>
+    /// <remarks>
+    /// Use in place of GetDtoOptions.
+    /// Legacy order: 2.
+    /// </remarks>
+    /// <param name="dtoOptions">DtoOptions object.</param>
+    /// <param name="user">Current claims principal.</param>
+    /// <returns>Modified DtoOptions object.</returns>
+    internal static DtoOptions AddClientFields(
+        this DtoOptions dtoOptions, ClaimsPrincipal user)
+    {
+        string? client = user.GetClient();
+
+        // No client in claim
+        if (string.IsNullOrEmpty(client))
+        {
+            return dtoOptions;
+        }
+
+        if (!dtoOptions.ContainsField(ItemFields.RecursiveItemCount))
+        {
+            if (client.Contains("kodi", StringComparison.OrdinalIgnoreCase) ||
+                client.Contains("wmc", StringComparison.OrdinalIgnoreCase) ||
+                client.Contains("media center", StringComparison.OrdinalIgnoreCase) ||
+                client.Contains("classic", StringComparison.OrdinalIgnoreCase))
+            {
+                dtoOptions.Fields = [..dtoOptions.Fields, ItemFields.RecursiveItemCount];
+            }
+        }
+
+        if (!dtoOptions.ContainsField(ItemFields.ChildCount))
+        {
+            if (client.Contains("kodi", StringComparison.OrdinalIgnoreCase) ||
+                client.Contains("wmc", StringComparison.OrdinalIgnoreCase) ||
+                client.Contains("media center", StringComparison.OrdinalIgnoreCase) ||
+                client.Contains("classic", StringComparison.OrdinalIgnoreCase) ||
+                client.Contains("roku", StringComparison.OrdinalIgnoreCase) ||
+                client.Contains("samsung", StringComparison.OrdinalIgnoreCase) ||
+                client.Contains("androidtv", StringComparison.OrdinalIgnoreCase))
+            {
+                dtoOptions.Fields = [..dtoOptions.Fields, ItemFields.ChildCount];
+            }
+        }
+
+        return dtoOptions;
+    }
+
    /// <summary>
    /// Add additional DtoOptions.
    /// </summary>
--- a/Jellyfin.Api/Helpers/DynamicHlsHelper.cs
+++ b/Jellyfin.Api/Helpers/DynamicHlsHelper.cs
@@ -754,9 +754,7 @@ public class DynamicHlsHelper
    {
        if (string.Equals(state.ActualOutputAudioCodec, "aac", StringComparison.OrdinalIgnoreCase))
        {
-            string? profile = EncodingHelper.IsCopyCodec(state.OutputAudioCodec)
-                ? state.AudioStream?.Profile : state.GetRequestedProfiles("aac").FirstOrDefault();
-
+            string? profile = state.GetRequestedProfiles("aac").FirstOrDefault();
            return HlsCodecStringHelpers.GetAACString(profile);
        }

@@ -790,19 +788,6 @@ public class DynamicHlsHelper
            return HlsCodecStringHelpers.GetOPUSString();
        }

-        if (string.Equals(state.ActualOutputAudioCodec, "truehd", StringComparison.OrdinalIgnoreCase))
-        {
-            return HlsCodecStringHelpers.GetTRUEHDString();
-        }
-
-        if (string.Equals(state.ActualOutputAudioCodec, "dts", StringComparison.OrdinalIgnoreCase))
-        {
-            // lavc only support encoding DTS core profile
-            string? profile = EncodingHelper.IsCopyCodec(state.OutputAudioCodec) ? state.AudioStream?.Profile : "DTS";
-
-            return HlsCodecStringHelpers.GetDTSString(profile);
-        }
-
        return string.Empty;
    }

--- a/Jellyfin.Api/Helpers/HlsCodecStringHelpers.cs
+++ b/Jellyfin.Api/Helpers/HlsCodecStringHelpers.cs
@@ -41,11 +41,6 @@ public static class HlsCodecStringHelpers
    /// </summary>
    public const string OPUS = "Opus";

-    /// <summary>
-    /// Codec name for TRUEHD.
-    /// </summary>
-    public const string TRUEHD = "mlpa";
-
    /// <summary>
    /// Gets a MP3 codec string.
    /// </summary>
@@ -64,7 +59,7 @@ public static class HlsCodecStringHelpers
    {
        StringBuilder result = new StringBuilder("mp4a", 9);

-        if (string.Equals(profile, "HE-AAC", StringComparison.OrdinalIgnoreCase))
+        if (string.Equals(profile, "HE", StringComparison.OrdinalIgnoreCase))
        {
            result.Append(".40.5");
        }
@@ -122,46 +117,6 @@ public static class HlsCodecStringHelpers
        return OPUS;
    }

-    /// <summary>
-    /// Gets an TRUEHD codec string.
-    /// </summary>
-    /// <returns>TRUEHD codec string.</returns>
-    public static string GetTRUEHDString()
-    {
-        return TRUEHD;
-    }
-
-    /// <summary>
-    /// Gets an DTS codec string.
-    /// </summary>
-    /// <param name="profile">DTS profile.</param>
-    /// <returns>DTS codec string.</returns>
-    public static string GetDTSString(string? profile)
-    {
-        if (string.Equals(profile, "DTS", StringComparison.OrdinalIgnoreCase)
-            || string.Equals(profile, "DTS-ES", StringComparison.OrdinalIgnoreCase)
-            || string.Equals(profile, "DTS 96/24", StringComparison.OrdinalIgnoreCase))
-        {
-            return "dtsc";
-        }
-
-        if (string.Equals(profile, "DTS-HD HRA", StringComparison.OrdinalIgnoreCase)
-            || string.Equals(profile, "DTS-HD MA", StringComparison.OrdinalIgnoreCase)
-            || string.Equals(profile, "DTS-HD MA + DTS:X", StringComparison.OrdinalIgnoreCase)
-            || string.Equals(profile, "DTS-HD MA + DTS:X IMAX", StringComparison.OrdinalIgnoreCase))
-        {
-            return "dtsh";
-        }
-
-        if (string.Equals(profile, "DTS Express", StringComparison.OrdinalIgnoreCase))
-        {
-            return "dtse";
-        }
-
-        // Default to DTS core if profile is invalid
-        return "dtsc";
-    }
-
    /// <summary>
    /// Gets a H.264 codec string.
    /// </summary>
--- a/Jellyfin.Api/Middleware/LegacyEmbyRouteRewriteMiddleware.cs
+++ b/Jellyfin.Api/Middleware/LegacyEmbyRouteRewriteMiddleware.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Logging;
+
+namespace Jellyfin.Api.Middleware;
+
+/// <summary>
+/// Removes /emby and /mediabrowser from requested route.
+/// </summary>
+public class LegacyEmbyRouteRewriteMiddleware
+{
+    private const string EmbyPath = "/emby";
+    private const string MediabrowserPath = "/mediabrowser";
+
+    private readonly RequestDelegate _next;
+    private readonly ILogger<LegacyEmbyRouteRewriteMiddleware> _logger;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="LegacyEmbyRouteRewriteMiddleware"/> class.
+    /// </summary>
+    /// <param name="next">The next delegate in the pipeline.</param>
+    /// <param name="logger">The logger.</param>
+    public LegacyEmbyRouteRewriteMiddleware(
+        RequestDelegate next,
+        ILogger<LegacyEmbyRouteRewriteMiddleware> logger)
+    {
+        _next = next;
+        _logger = logger;
+    }
+
+    /// <summary>
+    /// Executes the middleware action.
+    /// </summary>
+    /// <param name="httpContext">The current HTTP context.</param>
+    /// <returns>The async task.</returns>
+    public async Task Invoke(HttpContext httpContext)
+    {
+        var localPath = httpContext.Request.Path.ToString();
+        if (localPath.StartsWith(EmbyPath, StringComparison.OrdinalIgnoreCase))
+        {
+            httpContext.Request.Path = localPath[EmbyPath.Length..];
+            _logger.LogDebug("Removing {EmbyPath} from route.", EmbyPath);
+        }
+        else if (localPath.StartsWith(MediabrowserPath, StringComparison.OrdinalIgnoreCase))
+        {
+            httpContext.Request.Path = localPath[MediabrowserPath.Length..];
+            _logger.LogDebug("Removing {MediabrowserPath} from route.", MediabrowserPath);
+        }
+
+        await _next(httpContext).ConfigureAwait(false);
+    }
+}
--- a/Jellyfin.Data/Enums/ActivityLogSortBy.cs
+++ b/Jellyfin.Data/Enums/ActivityLogSortBy.cs
@@ -1,49 +0,0 @@
-namespace Jellyfin.Data.Enums;
-
-/// <summary>
-/// Activity log sorting options.
-/// </summary>
-public enum ActivityLogSortBy
-{
-    /// <summary>
-    /// Sort by name.
-    /// </summary>
-    Name = 0,
-
-    /// <summary>
-    /// Sort by overview.
-    /// </summary>
-    Overiew = 1,
-
-    /// <summary>
-    /// Sort by short overview.
-    /// </summary>
-    ShortOverview = 2,
-
-    /// <summary>
-    /// Sort by type.
-    /// </summary>
-    Type = 3,
-
-    /*
-    /// <summary>
-    /// Sort by item name.
-    /// </summary>
-    Item = 4,
-    */
-
-    /// <summary>
-    /// Sort by date.
-    /// </summary>
-    DateCreated = 5,
-
-    /// <summary>
-    /// Sort by username.
-    /// </summary>
-    Username = 6,
-
-    /// <summary>
-    /// Sort by severity.
-    /// </summary>
-    LogSeverity = 7
-}
--- a/Jellyfin.Data/Jellyfin.Data.csproj
+++ b/Jellyfin.Data/Jellyfin.Data.csproj
@@ -18,7 +18,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Data</PackageId>
-    <VersionPrefix>10.12.0</VersionPrefix>
+    <VersionPrefix>10.11.5</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/Jellyfin.Data/Queries/ActivityLogQuery.cs
+++ b/Jellyfin.Data/Queries/ActivityLogQuery.cs
@@ -1,68 +1,20 @@
 using System;
-using System.Collections.Generic;
-using Jellyfin.Data.Enums;
-using Jellyfin.Database.Implementations.Enums;
-using Microsoft.Extensions.Logging;

-namespace Jellyfin.Data.Queries;
-
-/// <summary>
-/// A class representing a query to the activity logs.
-/// </summary>
-public class ActivityLogQuery : PaginatedQuery
+namespace Jellyfin.Data.Queries
 {
    /// <summary>
-    /// Gets or sets a value indicating whether to take entries with a user id.
+    /// A class representing a query to the activity logs.
    /// </summary>
-    public bool? HasUserId { get; set; }
+    public class ActivityLogQuery : PaginatedQuery
+    {
+        /// <summary>
+        /// Gets or sets a value indicating whether to take entries with a user id.
+        /// </summary>
+        public bool? HasUserId { get; set; }

-    /// <summary>
-    /// Gets or sets the minimum date to query for.
-    /// </summary>
-    public DateTime? MinDate { get; set; }
-
-    /// <summary>
-    /// Gets or sets the maximum date to query for.
-    /// </summary>
-    public DateTime? MaxDate { get; set; }
-
-    /// <summary>
-    /// Gets or sets the name filter.
-    /// </summary>
-    public string? Name { get; set; }
-
-    /// <summary>
-    /// Gets or sets the overview filter.
-    /// </summary>
-    public string? Overview { get; set; }
-
-    /// <summary>
-    /// Gets or sets the short overview filter.
-    /// </summary>
-    public string? ShortOverview { get; set; }
-
-    /// <summary>
-    /// Gets or sets the type filter.
-    /// </summary>
-    public string? Type { get; set; }
-
-    /// <summary>
-    /// Gets or sets the item filter.
-    /// </summary>
-    public Guid? ItemId { get; set; }
-
-    /// <summary>
-    /// Gets or sets the username filter.
-    /// </summary>
-    public string? Username { get; set; }
-
-    /// <summary>
-    /// Gets or sets the log level filter.
-    /// </summary>
-    public LogLevel? Severity { get; set; }
-
-    /// <summary>
-    /// Gets or sets the result ordering.
-    /// </summary>
-    public IReadOnlyCollection<(ActivityLogSortBy, SortOrder)>? OrderBy { get; set; }
+        /// <summary>
+        /// Gets or sets the minimum date to query for.
+        /// </summary>
+        public DateTime? MinDate { get; set; }
+    }
 }
--- a/Jellyfin.Server.Implementations/Activity/ActivityManager.cs
+++ b/Jellyfin.Server.Implementations/Activity/ActivityManager.cs
@@ -1,213 +1,103 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
 using System.Threading.Tasks;
-using Jellyfin.Data.Enums;
 using Jellyfin.Data.Events;
 using Jellyfin.Data.Queries;
 using Jellyfin.Database.Implementations;
 using Jellyfin.Database.Implementations.Entities;
-using Jellyfin.Database.Implementations.Enums;
-using Jellyfin.Extensions;
 using MediaBrowser.Model.Activity;
 using MediaBrowser.Model.Querying;
 using Microsoft.EntityFrameworkCore;

-namespace Jellyfin.Server.Implementations.Activity;
-
-/// <summary>
-/// Manages the storage and retrieval of <see cref="ActivityLog"/> instances.
-/// </summary>
-public class ActivityManager : IActivityManager
+namespace Jellyfin.Server.Implementations.Activity
 {
-    private readonly IDbContextFactory<JellyfinDbContext> _provider;
-
    /// <summary>
-    /// Initializes a new instance of the <see cref="ActivityManager"/> class.
+    /// Manages the storage and retrieval of <see cref="ActivityLog"/> instances.
    /// </summary>
-    /// <param name="provider">The Jellyfin database provider.</param>
-    public ActivityManager(IDbContextFactory<JellyfinDbContext> provider)
+    public class ActivityManager : IActivityManager
    {
-        _provider = provider;
-    }
+        private readonly IDbContextFactory<JellyfinDbContext> _provider;

-    /// <inheritdoc/>
-    public event EventHandler<GenericEventArgs<ActivityLogEntry>>? EntryCreated;
-
-    /// <inheritdoc/>
-    public async Task CreateAsync(ActivityLog entry)
-    {
-        var dbContext = await _provider.CreateDbContextAsync().ConfigureAwait(false);
-        await using (dbContext.ConfigureAwait(false))
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ActivityManager"/> class.
+        /// </summary>
+        /// <param name="provider">The Jellyfin database provider.</param>
+        public ActivityManager(IDbContextFactory<JellyfinDbContext> provider)
        {
-            dbContext.ActivityLogs.Add(entry);
-            await dbContext.SaveChangesAsync().ConfigureAwait(false);
+            _provider = provider;
        }

-        EntryCreated?.Invoke(this, new GenericEventArgs<ActivityLogEntry>(ConvertToOldModel(entry)));
-    }
+        /// <inheritdoc/>
+        public event EventHandler<GenericEventArgs<ActivityLogEntry>>? EntryCreated;

-    /// <inheritdoc/>
-    public async Task<QueryResult<ActivityLogEntry>> GetPagedResultAsync(ActivityLogQuery query)
-    {
-        // TODO allow sorting and filtering by item id. Currently not possible because ActivityLog stores the item id as a string.
-
-        var dbContext = await _provider.CreateDbContextAsync().ConfigureAwait(false);
-        await using (dbContext.ConfigureAwait(false))
+        /// <inheritdoc/>
+        public async Task CreateAsync(ActivityLog entry)
        {
-            // TODO switch to LeftJoin in .NET 10.
-            var entries = from a in dbContext.ActivityLogs
-                join u in dbContext.Users on a.UserId equals u.Id into ugj
-                from u in ugj.DefaultIfEmpty()
-                select new ExpandedActivityLog { ActivityLog = a, Username = u.Username };
-
-            if (query.HasUserId is not null)
+            var dbContext = await _provider.CreateDbContextAsync().ConfigureAwait(false);
+            await using (dbContext.ConfigureAwait(false))
            {
-                entries = entries.Where(e => e.ActivityLog.UserId.Equals(default) != query.HasUserId.Value);
+                dbContext.ActivityLogs.Add(entry);
+                await dbContext.SaveChangesAsync().ConfigureAwait(false);
            }

-            if (query.MinDate is not null)
-            {
-                entries = entries.Where(e => e.ActivityLog.DateCreated >= query.MinDate.Value);
-            }
-
-            if (query.MaxDate is not null)
-            {
-                entries = entries.Where(e => e.ActivityLog.DateCreated <= query.MaxDate.Value);
-            }
-
-            if (!string.IsNullOrEmpty(query.Name))
-            {
-                entries = entries.Where(e => EF.Functions.Like(e.ActivityLog.Name, $"%{query.Name}%"));
-            }
-
-            if (!string.IsNullOrEmpty(query.Overview))
-            {
-                entries = entries.Where(e => EF.Functions.Like(e.ActivityLog.Overview, $"%{query.Overview}%"));
-            }
-
-            if (!string.IsNullOrEmpty(query.ShortOverview))
-            {
-                entries = entries.Where(e => EF.Functions.Like(e.ActivityLog.ShortOverview, $"%{query.ShortOverview}%"));
-            }
-
-            if (!string.IsNullOrEmpty(query.Type))
-            {
-                entries = entries.Where(e => EF.Functions.Like(e.ActivityLog.Type, $"%{query.Type}%"));
-            }
-
-            if (!query.ItemId.IsNullOrEmpty())
-            {
-                var itemId = query.ItemId.Value.ToString("N");
-                entries = entries.Where(e => e.ActivityLog.ItemId == itemId);
-            }
-
-            if (!string.IsNullOrEmpty(query.Username))
-            {
-                entries = entries.Where(e => EF.Functions.Like(e.Username, $"%{query.Username}%"));
-            }
-
-            if (query.Severity is not null)
-            {
-                entries = entries.Where(e => e.ActivityLog.LogSeverity == query.Severity);
-            }
-
-            return new QueryResult<ActivityLogEntry>(
-                query.Skip,
-                await entries.CountAsync().ConfigureAwait(false),
-                await ApplyOrdering(entries, query.OrderBy)
-                    .Skip(query.Skip ?? 0)
-                    .Take(query.Limit ?? 100)
-                    .Select(entity => new ActivityLogEntry(entity.ActivityLog.Name, entity.ActivityLog.Type, entity.ActivityLog.UserId)
-                    {
-                        Id = entity.ActivityLog.Id,
-                        Overview = entity.ActivityLog.Overview,
-                        ShortOverview = entity.ActivityLog.ShortOverview,
-                        ItemId = entity.ActivityLog.ItemId,
-                        Date = entity.ActivityLog.DateCreated,
-                        Severity = entity.ActivityLog.LogSeverity
-                    })
-                    .ToListAsync()
-                    .ConfigureAwait(false));
-        }
-    }
-
-    /// <inheritdoc />
-    public async Task CleanAsync(DateTime startDate)
-    {
-        var dbContext = await _provider.CreateDbContextAsync().ConfigureAwait(false);
-        await using (dbContext.ConfigureAwait(false))
-        {
-            await dbContext.ActivityLogs
-                .Where(entry => entry.DateCreated <= startDate)
-                .ExecuteDeleteAsync()
-                .ConfigureAwait(false);
-        }
-    }
-
-    private static ActivityLogEntry ConvertToOldModel(ActivityLog entry)
-    {
-        return new ActivityLogEntry(entry.Name, entry.Type, entry.UserId)
-        {
-            Id = entry.Id,
-            Overview = entry.Overview,
-            ShortOverview = entry.ShortOverview,
-            ItemId = entry.ItemId,
-            Date = entry.DateCreated,
-            Severity = entry.LogSeverity
-        };
-    }
-
-    private IOrderedQueryable<ExpandedActivityLog> ApplyOrdering(IQueryable<ExpandedActivityLog> query, IReadOnlyCollection<(ActivityLogSortBy, SortOrder)>? sorting)
-    {
-        if (sorting is null || sorting.Count == 0)
-        {
-            return query.OrderByDescending(e => e.ActivityLog.DateCreated);
+            EntryCreated?.Invoke(this, new GenericEventArgs<ActivityLogEntry>(ConvertToOldModel(entry)));
        }

-        IOrderedQueryable<ExpandedActivityLog> ordered = null!;
-
-        foreach (var (sortBy, sortOrder) in sorting)
+        /// <inheritdoc/>
+        public async Task<QueryResult<ActivityLogEntry>> GetPagedResultAsync(ActivityLogQuery query)
        {
-            var orderBy = MapOrderBy(sortBy);
+            var dbContext = await _provider.CreateDbContextAsync().ConfigureAwait(false);
+            await using (dbContext.ConfigureAwait(false))
+            {
+                var entries = dbContext.ActivityLogs
+                    .OrderByDescending(entry => entry.DateCreated)
+                    .Where(entry => query.MinDate == null || entry.DateCreated >= query.MinDate)
+                    .Where(entry => !query.HasUserId.HasValue || entry.UserId.Equals(default) != query.HasUserId.Value);

-            if (ordered == null)
-            {
-                ordered = sortOrder == SortOrder.Ascending
-                    ? query.OrderBy(orderBy)
-                    : query.OrderByDescending(orderBy);
-            }
-            else
-            {
-                ordered = sortOrder == SortOrder.Ascending
-                    ? ordered.ThenBy(orderBy)
-                    : ordered.ThenByDescending(orderBy);
+                return new QueryResult<ActivityLogEntry>(
+                    query.Skip,
+                    await entries.CountAsync().ConfigureAwait(false),
+                    await entries
+                        .Skip(query.Skip ?? 0)
+                        .Take(query.Limit ?? 100)
+                        .Select(entity => new ActivityLogEntry(entity.Name, entity.Type, entity.UserId)
+                        {
+                            Id = entity.Id,
+                            Overview = entity.Overview,
+                            ShortOverview = entity.ShortOverview,
+                            ItemId = entity.ItemId,
+                            Date = entity.DateCreated,
+                            Severity = entity.LogSeverity
+                        })
+                        .ToListAsync()
+                        .ConfigureAwait(false));
            }
        }

-        return ordered;
-    }
-
-    private Expression<Func<ExpandedActivityLog, object?>> MapOrderBy(ActivityLogSortBy sortBy)
-    {
-        return sortBy switch
+        /// <inheritdoc />
+        public async Task CleanAsync(DateTime startDate)
        {
-            ActivityLogSortBy.Name => e => e.ActivityLog.Name,
-            ActivityLogSortBy.Overiew => e => e.ActivityLog.Overview,
-            ActivityLogSortBy.ShortOverview => e => e.ActivityLog.ShortOverview,
-            ActivityLogSortBy.Type => e => e.ActivityLog.Type,
-            ActivityLogSortBy.DateCreated => e => e.ActivityLog.DateCreated,
-            ActivityLogSortBy.Username => e => e.Username,
-            ActivityLogSortBy.LogSeverity => e => e.ActivityLog.LogSeverity,
-            _ => throw new ArgumentOutOfRangeException(nameof(sortBy), sortBy, "Unhandled ActivityLogSortBy")
-        };
-    }
+            var dbContext = await _provider.CreateDbContextAsync().ConfigureAwait(false);
+            await using (dbContext.ConfigureAwait(false))
+            {
+                await dbContext.ActivityLogs
+                    .Where(entry => entry.DateCreated <= startDate)
+                    .ExecuteDeleteAsync()
+                    .ConfigureAwait(false);
+            }
+        }

-    private class ExpandedActivityLog
-    {
-        public ActivityLog ActivityLog { get; set; } = null!;
-
-        public string? Username { get; set; }
+        private static ActivityLogEntry ConvertToOldModel(ActivityLog entry)
+        {
+            return new ActivityLogEntry(entry.Name, entry.Type, entry.UserId)
+            {
+                Id = entry.Id,
+                Overview = entry.Overview,
+                ShortOverview = entry.ShortOverview,
+                ItemId = entry.ItemId,
+                Date = entry.DateCreated,
+                Severity = entry.LogSeverity
+            };
+        }
    }
 }
--- a/Jellyfin.Server.Implementations/Devices/DeviceManager.cs
+++ b/Jellyfin.Server.Implementations/Devices/DeviceManager.cs
@@ -158,7 +158,7 @@ namespace Jellyfin.Server.Implementations.Devices
                devices = devices.Skip(query.Skip.Value);
            }

-            if (query.Limit.HasValue && query.Limit.Value > 0)
+            if (query.Limit.HasValue)
            {
                devices = devices.Take(query.Limit.Value);
            }
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
@@ -250,7 +250,7 @@ public sealed class BaseItemRepository
    public QueryResult<BaseItemDto> GetItems(InternalItemsQuery filter)
    {
        ArgumentNullException.ThrowIfNull(filter);
-        if (!filter.EnableTotalRecordCount || ((filter.Limit ?? 0) == 0 && (filter.StartIndex ?? 0) == 0))
+        if (!filter.EnableTotalRecordCount || (!filter.Limit.HasValue && (filter.StartIndex ?? 0) == 0))
        {
            var returnList = GetItemList(filter);
            return new QueryResult<BaseItemDto>(
@@ -277,7 +277,7 @@ public sealed class BaseItemRepository
        dbQuery = ApplyQueryPaging(dbQuery, filter);
        dbQuery = ApplyNavigations(dbQuery, filter);

-        result.Items = dbQuery.AsEnumerable().Where(e => e is not null).Select(w => DeserializeBaseItem(w, filter.SkipDeserialization)).Where(dto => dto is not null).ToArray()!;
+        result.Items = dbQuery.AsEnumerable().Where(e => e is not null).Select(w => DeserializeBaseItem(w, filter.SkipDeserialization)).ToArray();
        result.StartIndex = filter.StartIndex ?? 0;
        return result;
    }
@@ -297,7 +297,7 @@ public sealed class BaseItemRepository
        dbQuery = ApplyQueryPaging(dbQuery, filter);
        dbQuery = ApplyNavigations(dbQuery, filter);

-        return dbQuery.AsEnumerable().Where(e => e is not null).Select(w => DeserializeBaseItem(w, filter.SkipDeserialization)).Where(dto => dto is not null).ToArray()!;
+        return dbQuery.AsEnumerable().Where(e => e is not null).Select(w => DeserializeBaseItem(w, filter.SkipDeserialization)).ToArray();
    }

    /// <inheritdoc/>
@@ -326,7 +326,7 @@ public sealed class BaseItemRepository
            .OrderByDescending(g => g.MaxDateCreated)
            .Select(g => g);

-        if (filter.Limit.HasValue && filter.Limit.Value > 0)
+        if (filter.Limit.HasValue)
        {
            subqueryGrouped = subqueryGrouped.Take(filter.Limit.Value);
        }
@@ -341,7 +341,7 @@ public sealed class BaseItemRepository

        mainquery = ApplyNavigations(mainquery, filter);

-        return mainquery.AsEnumerable().Where(e => e is not null).Select(w => DeserializeBaseItem(w, filter.SkipDeserialization)).Where(dto => dto is not null).ToArray()!;
+        return mainquery.AsEnumerable().Where(e => e is not null).Select(w => DeserializeBaseItem(w, filter.SkipDeserialization)).ToArray();
    }

    /// <inheritdoc />
@@ -367,7 +367,7 @@ public sealed class BaseItemRepository
            .OrderByDescending(g => g.LastPlayedDate)
            .Select(g => g.Key!);

-        if (filter.Limit.HasValue && filter.Limit.Value > 0)
+        if (filter.Limit.HasValue)
        {
            query = query.Take(filter.Limit.Value);
        }
@@ -440,14 +440,19 @@ public sealed class BaseItemRepository

    private IQueryable<BaseItemEntity> ApplyQueryPaging(IQueryable<BaseItemEntity> dbQuery, InternalItemsQuery filter)
    {
-        if (filter.StartIndex.HasValue && filter.StartIndex.Value > 0)
+        if (filter.Limit.HasValue || filter.StartIndex.HasValue)
        {
-            dbQuery = dbQuery.Skip(filter.StartIndex.Value);
-        }
+            var offset = filter.StartIndex ?? 0;

-        if (filter.Limit.HasValue && filter.Limit.Value > 0)
-        {
-            dbQuery = dbQuery.Take(filter.Limit.Value);
+            if (offset > 0)
+            {
+                dbQuery = dbQuery.Skip(offset);
+            }
+
+            if (filter.Limit.HasValue)
+            {
+                dbQuery = dbQuery.Take(filter.Limit.Value);
+            }
        }

        return dbQuery;
@@ -562,34 +567,22 @@ public sealed class BaseItemRepository
    }

    /// <inheritdoc  />
-    public async Task SaveImagesAsync(BaseItemDto item, CancellationToken cancellationToken = default)
+    public void SaveImages(BaseItemDto item)
    {
        ArgumentNullException.ThrowIfNull(item);

-        var images = item.ImageInfos.Select(e => Map(item.Id, e)).ToArray();
+        var images = item.ImageInfos.Select(e => Map(item.Id, e));
+        using var context = _dbProvider.CreateDbContext();

-        var context = await _dbProvider.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
-        await using (context.ConfigureAwait(false))
+        if (!context.BaseItems.Any(bi => bi.Id == item.Id))
        {
-            if (!await context.BaseItems
-                .AnyAsync(bi => bi.Id == item.Id, cancellationToken)
-                .ConfigureAwait(false))
-            {
-                _logger.LogWarning("Unable to save ImageInfo for non existing BaseItem");
-                return;
-            }
-
-            await context.BaseItemImageInfos
-                .Where(e => e.ItemId == item.Id)
-                .ExecuteDeleteAsync(cancellationToken)
-                .ConfigureAwait(false);
-
-            await context.BaseItemImageInfos
-                .AddRangeAsync(images, cancellationToken)
-                .ConfigureAwait(false);
-
-            await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
+            _logger.LogWarning("Unable to save ImageInfo for non existing BaseItem");
+            return;
        }
+
+        context.BaseItemImageInfos.Where(e => e.ItemId == item.Id).ExecuteDelete();
+        context.BaseItemImageInfos.AddRange(images);
+        context.SaveChanges();
    }

    /// <inheritdoc  />
@@ -1159,7 +1152,7 @@ public sealed class BaseItemRepository
        return type.GetCustomAttribute<RequiresSourceSerialisationAttribute>() == null;
    }

-    private BaseItemDto? DeserializeBaseItem(BaseItemEntity baseItemEntity, bool skipDeserialization = false)
+    private BaseItemDto DeserializeBaseItem(BaseItemEntity baseItemEntity, bool skipDeserialization = false)
    {
        ArgumentNullException.ThrowIfNull(baseItemEntity, nameof(baseItemEntity));
        if (_serverConfigurationManager?.Configuration is null)
@@ -1182,19 +1175,11 @@ public sealed class BaseItemRepository
    /// <param name="logger">Logger.</param>
    /// <param name="appHost">The application server Host.</param>
    /// <param name="skipDeserialization">If only mapping should be processed.</param>
-    /// <returns>A mapped BaseItem, or null if the item type is unknown.</returns>
-    public static BaseItemDto? DeserializeBaseItem(BaseItemEntity baseItemEntity, ILogger logger, IServerApplicationHost? appHost, bool skipDeserialization = false)
+    /// <returns>A mapped BaseItem.</returns>
+    /// <exception cref="InvalidOperationException">Will be thrown if an invalid serialisation is requested.</exception>
+    public static BaseItemDto DeserializeBaseItem(BaseItemEntity baseItemEntity, ILogger logger, IServerApplicationHost? appHost, bool skipDeserialization = false)
    {
-        var type = GetType(baseItemEntity.Type);
-        if (type is null)
-        {
-            logger.LogWarning(
-                "Skipping item {ItemId} with unknown type '{ItemType}'. This may indicate a removed plugin or database corruption.",
-                baseItemEntity.Id,
-                baseItemEntity.Type);
-            return null;
-        }
-
+        var type = GetType(baseItemEntity.Type) ?? throw new InvalidOperationException("Cannot deserialize unknown type.");
        BaseItemDto? dto = null;
        if (TypeRequiresDeserialization(type) && baseItemEntity.Data is not null && !skipDeserialization)
        {
@@ -1220,7 +1205,7 @@ public sealed class BaseItemRepository
    {
        ArgumentNullException.ThrowIfNull(filter);

-        if (!(filter.Limit.HasValue && filter.Limit.Value > 0))
+        if (!filter.Limit.HasValue)
        {
            filter.EnableTotalRecordCount = false;
        }
@@ -1299,14 +1284,19 @@ public sealed class BaseItemRepository
            result.TotalRecordCount = query.Count();
        }

-        if (filter.StartIndex.HasValue && filter.StartIndex.Value > 0)
+        if (filter.Limit.HasValue || filter.StartIndex.HasValue)
        {
-            query = query.Skip(filter.StartIndex.Value);
-        }
+            var offset = filter.StartIndex ?? 0;

-        if (filter.Limit.HasValue && filter.Limit.Value > 0)
-        {
-            query = query.Take(filter.Limit.Value);
+            if (offset > 0)
+            {
+                query = query.Skip(offset);
+            }
+
+            if (filter.Limit.HasValue)
+            {
+                query = query.Take(filter.Limit.Value);
+            }
        }

        IQueryable<BaseItemEntity>? itemCountQuery = null;
@@ -1361,9 +1351,10 @@ public sealed class BaseItemRepository
                .. resultQuery
                    .AsEnumerable()
                    .Where(e => e is not null)
-                    .Select(e => (Item: DeserializeBaseItem(e.item, filter.SkipDeserialization), e.itemCount))
-                    .Where(e => e.Item is not null)
-                    .Select(e => (e.Item!, e.itemCount))
+                    .Select(e =>
+                    {
+                        return (DeserializeBaseItem(e.item, filter.SkipDeserialization), e.itemCount);
+                    })
            ];
        }
        else
@@ -1374,9 +1365,10 @@ public sealed class BaseItemRepository
                .. query
                    .AsEnumerable()
                    .Where(e => e is not null)
-                    .Select(e => (Item: DeserializeBaseItem(e, filter.SkipDeserialization), ItemCounts: (ItemCounts?)null))
-                    .Where(e => e.Item is not null)
-                    .Select(e => (e.Item!, e.ItemCounts))
+                    .Select<BaseItemEntity, (BaseItemDto, ItemCounts?)>(e =>
+                    {
+                        return (DeserializeBaseItem(e, filter.SkipDeserialization), null);
+                    })
            ];
        }

@@ -1385,7 +1377,7 @@ public sealed class BaseItemRepository

    private static void PrepareFilterQuery(InternalItemsQuery query)
    {
-        if (query.Limit.HasValue && query.Limit.Value > 0 && query.EnableGroupByMetadataKey)
+        if (query.Limit.HasValue && query.EnableGroupByMetadataKey)
        {
            query.Limit = query.Limit.Value + 4;
        }
@@ -1396,54 +1388,14 @@ public sealed class BaseItemRepository
        }
    }

-    /// <summary>
-    /// Gets the clean value for search and sorting purposes.
-    /// </summary>
-    /// <param name="value">The value to clean.</param>
-    /// <returns>The cleaned value.</returns>
-    public static string GetCleanValue(string value)
+    private string GetCleanValue(string value)
    {
        if (string.IsNullOrWhiteSpace(value))
        {
            return value;
        }

-        var noDiacritics = value.RemoveDiacritics();
-
-        // Build a string where any punctuation or symbol is treated as a separator (space).
-        var sb = new StringBuilder(noDiacritics.Length);
-        var previousWasSpace = false;
-        foreach (var ch in noDiacritics)
-        {
-            char outCh;
-            if (char.IsLetterOrDigit(ch) || char.IsWhiteSpace(ch))
-            {
-                outCh = ch;
-            }
-            else
-            {
-                outCh = ' ';
-            }
-
-            // normalize any whitespace character to a single ASCII space.
-            if (char.IsWhiteSpace(outCh))
-            {
-                if (!previousWasSpace)
-                {
-                    sb.Append(' ');
-                    previousWasSpace = true;
-                }
-            }
-            else
-            {
-                sb.Append(outCh);
-                previousWasSpace = false;
-            }
-        }
-
-        // trim leading/trailing spaces that may have been added.
-        var collapsed = sb.ToString().Trim();
-        return collapsed.ToLowerInvariant();
+        return value.RemoveDiacritics().ToLowerInvariant();
    }

    private List<(ItemValueType MagicNumber, string Value)> GetItemValuesToSave(BaseItemDto item, List<string> inheritedTags)
@@ -2666,6 +2618,6 @@ public sealed class BaseItemRepository
            .Where(e => artistNames.Contains(e.Name))
            .ToArray();

-        return artists.GroupBy(e => e.Name).ToDictionary(e => e.Key!, e => e.Select(f => DeserializeBaseItem(f)).Where(dto => dto is not null).Cast<MusicArtist>().ToArray());
+        return artists.GroupBy(e => e.Name).ToDictionary(e => e.Key!, e => e.Select(f => DeserializeBaseItem(f)).Cast<MusicArtist>().ToArray());
    }
 }
--- a/Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
+++ b/Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
@@ -59,7 +59,7 @@ namespace Jellyfin.Server.Implementations.Users
            }

            // As long as jellyfin supports password-less users, we need this little block here to accommodate
-            if (string.IsNullOrEmpty(resolvedUser.Password) && string.IsNullOrEmpty(password))
+            if (!HasPassword(resolvedUser) && string.IsNullOrEmpty(password))
            {
                return Task.FromResult(new ProviderAuthenticationResult
                {
@@ -93,6 +93,10 @@ namespace Jellyfin.Server.Implementations.Users
            });
        }

+        /// <inheritdoc />
+        public bool HasPassword(User user)
+            => !string.IsNullOrEmpty(user?.Password);
+
        /// <inheritdoc />
        public Task ChangePassword(User user, string newPassword)
        {
--- a/Jellyfin.Server.Implementations/Users/InvalidAuthProvider.cs
+++ b/Jellyfin.Server.Implementations/Users/InvalidAuthProvider.cs
@@ -21,6 +21,12 @@ namespace Jellyfin.Server.Implementations.Users
            throw new AuthenticationException("User Account cannot login with this provider. The Normal provider for this user cannot be found");
        }

+        /// <inheritdoc />
+        public bool HasPassword(User user)
+        {
+            return true;
+        }
+
        /// <inheritdoc />
        public Task ChangePassword(User user, string newPassword)
        {
--- a/Jellyfin.Server.Implementations/Users/UserManager.cs
+++ b/Jellyfin.Server.Implementations/Users/UserManager.cs
@@ -306,12 +306,15 @@ namespace Jellyfin.Server.Implementations.Users
        /// <inheritdoc/>
        public UserDto GetUserDto(User user, string? remoteEndPoint = null)
        {
+            var hasPassword = GetAuthenticationProvider(user).HasPassword(user);
            var castReceiverApplications = _serverConfigurationManager.Configuration.CastReceiverApplications;
            return new UserDto
            {
                Name = user.Username,
                Id = user.Id,
                ServerId = _appHost.SystemId,
+                HasPassword = hasPassword,
+                HasConfiguredPassword = hasPassword,
                EnableAutoLogin = user.EnableAutoLogin,
                LastLoginDate = user.LastLoginDate,
                LastActivityDate = user.LastActivityDate,
--- a/Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs
+++ b/Jellyfin.Server/Extensions/ApiApplicationBuilderExtensions.cs
@@ -117,5 +117,18 @@ namespace Jellyfin.Server.Extensions
        {
            return appBuilder.UseMiddleware<RobotsRedirectionMiddleware>();
        }
+
+        /// <summary>
+        /// Adds /emby and /mediabrowser route trimming to the application pipeline.
+        /// </summary>
+        /// <remarks>
+        /// This must be injected before any path related middleware.
+        /// </remarks>
+        /// <param name="appBuilder">The application builder.</param>
+        /// <returns>The updated application builder.</returns>
+        public static IApplicationBuilder UsePathTrim(this IApplicationBuilder appBuilder)
+        {
+            return appBuilder.UseMiddleware<LegacyEmbyRouteRewriteMiddleware>();
+        }
    }
 }
--- a/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
+++ b/Jellyfin.Server/Extensions/ApiServiceCollectionExtensions.cs
@@ -255,7 +255,6 @@ namespace Jellyfin.Server.Extensions
                c.AddSwaggerTypeMappings();

                c.SchemaFilter<IgnoreEnumSchemaFilter>();
-                c.SchemaFilter<FlagsEnumSchemaFilter>();
                c.OperationFilter<RetryOnTemporarilyUnavailableFilter>();
                c.OperationFilter<SecurityRequirementsOperationFilter>();
                c.OperationFilter<FileResponseFilter>();
@@ -343,6 +342,25 @@ namespace Jellyfin.Server.Extensions
                    }
                });

+            /*
+             * Support BlurHash dictionary
+             */
+            options.MapType<Dictionary<ImageType, Dictionary<string, string>>>(() =>
+                new OpenApiSchema
+                {
+                    Type = "object",
+                    Properties = typeof(ImageType).GetEnumNames().ToDictionary(
+                        name => name,
+                        _ => new OpenApiSchema
+                        {
+                            Type = "object",
+                            AdditionalProperties = new OpenApiSchema
+                            {
+                                Type = "string"
+                            }
+                        })
+                });
+
            // Support dictionary with nullable string value.
            options.MapType<Dictionary<string, string?>>(() =>
                new OpenApiSchema
@@ -355,6 +373,21 @@ namespace Jellyfin.Server.Extensions
                    }
                });

+            // Manually describe Flags enum.
+            options.MapType<TranscodeReason>(() =>
+                new OpenApiSchema
+                {
+                    Type = "array",
+                    Items = new OpenApiSchema
+                    {
+                        Reference = new OpenApiReference
+                        {
+                            Id = nameof(TranscodeReason),
+                            Type = ReferenceType.Schema,
+                        }
+                    }
+                });
+
            // Swashbuckle doesn't use JsonOptions to describe responses, so we need to manually describe it.
            options.MapType<Version>(() => new OpenApiSchema
            {
--- a/Jellyfin.Server/Filters/AdditionalModelFilter.cs
+++ b/Jellyfin.Server/Filters/AdditionalModelFilter.cs
@@ -225,6 +225,15 @@ namespace Jellyfin.Server.Filters

                context.SchemaGenerator.GenerateSchema(configuration.ConfigurationType, context.SchemaRepository);
            }
+
+            context.SchemaRepository.AddDefinition(nameof(TranscodeReason), new OpenApiSchema
+            {
+                Type = "string",
+                Enum = Enum.GetNames<TranscodeReason>()
+                    .Select(e => new OpenApiString(e))
+                    .Cast<IOpenApiAny>()
+                    .ToArray()
+            });
        }
    }
 }
--- a/Jellyfin.Server/Filters/CachingOpenApiProvider.cs
+++ b/Jellyfin.Server/Filters/CachingOpenApiProvider.cs
@@ -1,8 +1,7 @@
 using System;
-using AsyncKeyedLock;
+using System.Threading;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.Swagger;
@@ -18,13 +17,12 @@ internal sealed class CachingOpenApiProvider : ISwaggerProvider
    private const string CacheKey = "openapi.json";

    private static readonly MemoryCacheEntryOptions _cacheOptions = new() { SlidingExpiration = TimeSpan.FromMinutes(5) };
-    private static readonly AsyncNonKeyedLocker _lock = new(1);
+    private static readonly SemaphoreSlim _lock = new(1, 1);
    private static readonly TimeSpan _lockTimeout = TimeSpan.FromSeconds(1);

    private readonly IMemoryCache _memoryCache;
    private readonly SwaggerGenerator _swaggerGenerator;
    private readonly SwaggerGeneratorOptions _swaggerGeneratorOptions;
-    private readonly ILogger<CachingOpenApiProvider> _logger;

    /// <summary>
    /// Initializes a new instance of the <see cref="CachingOpenApiProvider"/> class.
@@ -33,18 +31,15 @@ internal sealed class CachingOpenApiProvider : ISwaggerProvider
    /// <param name="apiDescriptionsProvider">The api descriptions provider.</param>
    /// <param name="schemaGenerator">The schema generator.</param>
    /// <param name="memoryCache">The memory cache.</param>
-    /// <param name="logger">The logger.</param>
    public CachingOpenApiProvider(
        IOptions<SwaggerGeneratorOptions> optionsAccessor,
        IApiDescriptionGroupCollectionProvider apiDescriptionsProvider,
        ISchemaGenerator schemaGenerator,
-        IMemoryCache memoryCache,
-        ILogger<CachingOpenApiProvider> logger)
+        IMemoryCache memoryCache)
    {
        _swaggerGeneratorOptions = optionsAccessor.Value;
        _swaggerGenerator = new SwaggerGenerator(_swaggerGeneratorOptions, apiDescriptionsProvider, schemaGenerator);
        _memoryCache = memoryCache;
-        _logger = logger;
    }

    /// <inheritdoc />
@@ -55,29 +50,30 @@ internal sealed class CachingOpenApiProvider : ISwaggerProvider
            return AdjustDocument(openApiDocument, host, basePath);
        }

-        using var acquired = _lock.LockOrNull(_lockTimeout);
-        if (_memoryCache.TryGetValue(CacheKey, out openApiDocument) && openApiDocument is not null)
-        {
-            return AdjustDocument(openApiDocument, host, basePath);
-        }
-
-        if (acquired is null)
-        {
-            throw new InvalidOperationException("OpenApi document is generating");
-        }
-
+        var acquired = _lock.Wait(_lockTimeout);
        try
        {
-        openApiDocument = _swaggerGenerator.GetSwagger(documentName);
-        }
-        catch (Exception ex)
-        {
-            _logger.LogError(ex, "OpenAPI generation error");
-            throw;
-        }
+            if (_memoryCache.TryGetValue(CacheKey, out openApiDocument) && openApiDocument is not null)
+            {
+                return AdjustDocument(openApiDocument, host, basePath);
+            }

-        _memoryCache.Set(CacheKey, openApiDocument, _cacheOptions);
-        return AdjustDocument(openApiDocument, host, basePath);
+            if (!acquired)
+            {
+                throw new InvalidOperationException("OpenApi document is generating");
+            }
+
+            openApiDocument = _swaggerGenerator.GetSwagger(documentName);
+            _memoryCache.Set(CacheKey, openApiDocument, _cacheOptions);
+            return AdjustDocument(openApiDocument, host, basePath);
+        }
+        finally
+        {
+            if (acquired)
+            {
+                _lock.Release();
+            }
+        }
    }

    private OpenApiDocument AdjustDocument(OpenApiDocument document, string? host, string? basePath)
--- a/Jellyfin.Server/Filters/FlagsEnumSchemaFilter.cs
+++ b/Jellyfin.Server/Filters/FlagsEnumSchemaFilter.cs
@@ -1,53 +0,0 @@
-using System;
-using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.SwaggerGen;
-
-namespace Jellyfin.Server.Filters;
-
-/// <summary>
-/// Schema filter to ensure flags enums are represented correctly in OpenAPI.
-/// </summary>
-/// <remarks>
-/// For flags enums:
-/// - The enum schema definition is set to type "string" (not integer).
-/// - Properties using flags enums are transformed to arrays referencing the enum schema.
-/// </remarks>
-public class FlagsEnumSchemaFilter : ISchemaFilter
-{
-    /// <inheritdoc />
-    public void Apply(OpenApiSchema schema, SchemaFilterContext context)
-    {
-        var type = context.Type.IsEnum ? context.Type : Nullable.GetUnderlyingType(context.Type);
-        if (type is null || !type.IsEnum)
-        {
-            return;
-        }
-
-        // Check if enum has [Flags] attribute
-        if (!type.IsDefined(typeof(FlagsAttribute), false))
-        {
-            return;
-        }
-
-        if (context.MemberInfo is null)
-        {
-            // Processing the enum definition itself - ensure it's type "string" not "integer"
-            schema.Type = "string";
-            schema.Format = null;
-        }
-        else
-        {
-            // Processing a property that uses the flags enum - transform to array
-            // Generate the enum schema to ensure it exists in the repository
-            var enumSchema = context.SchemaGenerator.GenerateSchema(type, context.SchemaRepository);
-
-            // Flags enums should be represented as arrays referencing the enum schema
-            // since multiple values can be combined
-            schema.Type = "array";
-            schema.Format = null;
-            schema.Enum = null;
-            schema.AllOf = null;
-            schema.Items = enumSchema;
-        }
-    }
-}
--- a/Jellyfin.Server/Migrations/Routines/DisableLegacyAuthorization.cs
+++ b/Jellyfin.Server/Migrations/Routines/DisableLegacyAuthorization.cs
@@ -1,32 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using MediaBrowser.Controller.Configuration;
-
-namespace Jellyfin.Server.Migrations.Routines;
-
-/// <summary>
-/// Migration to disable legacy authorization in the system config.
-/// </summary>
-[JellyfinMigration("2025-11-18T16:00:00", nameof(DisableLegacyAuthorization))]
-public class DisableLegacyAuthorization : IAsyncMigrationRoutine
-{
-    private readonly IServerConfigurationManager _serverConfigurationManager;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="DisableLegacyAuthorization"/> class.
-    /// </summary>
-    /// <param name="serverConfigurationManager">Instance of the <see cref="IServerConfigurationManager"/> interface.</param>
-    public DisableLegacyAuthorization(IServerConfigurationManager serverConfigurationManager)
-    {
-        _serverConfigurationManager = serverConfigurationManager;
-    }
-
-    /// <inheritdoc />
-    public Task PerformAsync(CancellationToken cancellationToken)
-    {
-        _serverConfigurationManager.Configuration.EnableLegacyAuthorization = false;
-        _serverConfigurationManager.SaveConfiguration();
-
-        return Task.CompletedTask;
-    }
-}
--- a/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs
+++ b/Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs
@@ -1247,11 +1247,8 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
        }

        var baseItem = BaseItemRepository.DeserializeBaseItem(entity, _logger, null, false);
-        if (baseItem is not null)
-        {
-            var dataKeys = baseItem.GetUserDataKeys();
-            userDataKeys.AddRange(dataKeys);
-        }
+        var dataKeys = baseItem.GetUserDataKeys();
+        userDataKeys.AddRange(dataKeys);

        return (entity, userDataKeys.ToArray());
    }
--- a/Jellyfin.Server/Migrations/Routines/RefreshCleanNames.cs
+++ b/Jellyfin.Server/Migrations/Routines/RefreshCleanNames.cs
@@ -1,105 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using Jellyfin.Database.Implementations;
-using Jellyfin.Database.Implementations.Entities;
-using Jellyfin.Extensions;
-using Jellyfin.Server.Implementations.Item;
-using Jellyfin.Server.ServerSetupApp;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Logging;
-
-namespace Jellyfin.Server.Migrations.Routines;
-
-/// <summary>
-/// Migration to refresh CleanName values for all library items.
-/// </summary>
-[JellyfinMigration("2025-10-08T12:00:00", nameof(RefreshCleanNames))]
-[JellyfinMigrationBackup(JellyfinDb = true)]
-public class RefreshCleanNames : IAsyncMigrationRoutine
-{
-    private readonly IStartupLogger<RefreshCleanNames> _logger;
-    private readonly IDbContextFactory<JellyfinDbContext> _dbProvider;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="RefreshCleanNames"/> class.
-    /// </summary>
-    /// <param name="logger">The logger.</param>
-    /// <param name="dbProvider">Instance of the <see cref="IDbContextFactory{JellyfinDbContext}"/> interface.</param>
-    public RefreshCleanNames(
-        IStartupLogger<RefreshCleanNames> logger,
-        IDbContextFactory<JellyfinDbContext> dbProvider)
-    {
-        _logger = logger;
-        _dbProvider = dbProvider;
-    }
-
-    /// <inheritdoc />
-    public async Task PerformAsync(CancellationToken cancellationToken)
-    {
-        const int Limit = 1000;
-        int itemCount = 0;
-
-        var sw = Stopwatch.StartNew();
-
-        using var context = _dbProvider.CreateDbContext();
-        var records = context.BaseItems.Count(b => !string.IsNullOrEmpty(b.Name));
-        _logger.LogInformation("Refreshing CleanName for {Count} library items", records);
-
-        var processedInPartition = 0;
-
-        await foreach (var item in context.BaseItems
-                          .Where(b => !string.IsNullOrEmpty(b.Name))
-                          .OrderBy(e => e.Id)
-                          .WithPartitionProgress((partition) => _logger.LogInformation("Processed: {Offset}/{Total} - Updated: {UpdatedCount} - Time: {Elapsed}", partition * Limit, records, itemCount, sw.Elapsed))
-                          .PartitionEagerAsync(Limit, cancellationToken)
-                          .WithCancellation(cancellationToken)
-                          .ConfigureAwait(false))
-        {
-            try
-            {
-                var newCleanName = string.IsNullOrWhiteSpace(item.Name) ? string.Empty : BaseItemRepository.GetCleanValue(item.Name);
-                if (!string.Equals(newCleanName, item.CleanName, StringComparison.Ordinal))
-                {
-                    _logger.LogDebug(
-                        "Updating CleanName for item {Id}: '{OldValue}' -> '{NewValue}'",
-                        item.Id,
-                        item.CleanName,
-                        newCleanName);
-                    item.CleanName = newCleanName;
-                    itemCount++;
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogWarning(ex, "Failed to update CleanName for item {Id} ({Name})", item.Id, item.Name);
-            }
-
-            processedInPartition++;
-
-            if (processedInPartition >= Limit)
-            {
-                await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-                // Clear tracked entities to avoid memory growth across partitions
-                context.ChangeTracker.Clear();
-                processedInPartition = 0;
-            }
-        }
-
-        // Save any remaining changes after the loop
-        if (processedInPartition > 0)
-        {
-            await context.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
-            context.ChangeTracker.Clear();
-        }
-
-        _logger.LogInformation(
-            "Refreshed CleanName for {UpdatedCount} out of {TotalCount} items in {Time}",
-            itemCount,
-            records,
-            sw.Elapsed);
-    }
-}
--- a/Jellyfin.Server/Resources/Configuration/logging.json
+++ b/Jellyfin.Server/Resources/Configuration/logging.json
@@ -11,7 +11,7 @@
            {
                "Name": "Console",
                "Args": {
-                    "outputTemplate": "[{Timestamp:HH:mm:ss.fff}] [{Level:u3}] [{ThreadId}] {SourceContext}: {Message:lj}{NewLine}{Exception}"
+                    "outputTemplate": "[{Timestamp:HH:mm:ss}] [{Level:u3}] [{ThreadId}] {SourceContext}: {Message:lj}{NewLine}{Exception}"
                }
            },
            {
--- a/Jellyfin.Server/ServerSetupApp/SetupServer.cs
+++ b/Jellyfin.Server/ServerSetupApp/SetupServer.cs
@@ -249,7 +249,6 @@ public sealed class SetupServer : IDisposable
                                            {
                                                { "isInReportingMode", _isUnhealthy },
                                                { "retryValue", retryAfterValue },
-                                                { "version", typeof(Emby.Server.Implementations.ApplicationHost).Assembly.GetName().Version! },
                                                { "logs", startupLogEntries },
                                                { "networkManagerReady", networkManager is not null },
                                                { "localNetworkRequest", networkManager is not null && context.Connection.RemoteIpAddress is not null && networkManager.IsInLocalNetwork(context.Connection.RemoteIpAddress) }
--- a/Jellyfin.Server/ServerSetupApp/index.mstemplate.html
+++ b/Jellyfin.Server/ServerSetupApp/index.mstemplate.html
@@ -173,7 +173,7 @@
        <header class="flex-row">

            {{^IF isInReportingMode}}
-            <p>Jellyfin Server {{version}} still starting. Please wait.</p>
+            <p>Jellyfin Server still starting. Please wait.</p>
            {{#ELSE}}
            <p>Jellyfin Server has encountered an error and was not able to start.</p>
            {{/ELSE}}
--- a/Jellyfin.Server/Startup.cs
+++ b/Jellyfin.Server/Startup.cs
@@ -173,6 +173,9 @@ namespace Jellyfin.Server
                    mainApp.UseHttpsRedirection();
                }

+                // This must be injected before any path related middleware.
+                mainApp.UsePathTrim();
+
                if (appConfig.HostWebClient())
                {
                    var extensionProvider = new FileExtensionContentTypeProvider();
--- a/Jellyfin.sln
+++ b/Jellyfin.sln
@@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 18
-VisualStudioVersion = 18.0.11222.15 d18.0
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30503.244
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Jellyfin.Server", "Jellyfin.Server\Jellyfin.Server.csproj", "{07E39F42-A2C6-4B32-AF8C-725F957A73FF}"
 EndProject
@@ -30,7 +30,6 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{41093F42-C7CC-4D07-956B-6182CBEDE2EC}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
-		Directory.Packages.props = Directory.Packages.props
 		SharedVersion.cs = SharedVersion.cs
 	EndProjectSection
 EndProject
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <!-- ProjectGuid is only included as a requirement for SonarQube analysis -->
  <PropertyGroup>
@@ -8,7 +8,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Common</PackageId>
-    <VersionPrefix>10.12.0</VersionPrefix>
+    <VersionPrefix>10.11.5</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/MediaBrowser.Controller/Authentication/IAuthenticationProvider.cs
+++ b/MediaBrowser.Controller/Authentication/IAuthenticationProvider.cs
@@ -14,6 +14,8 @@ namespace MediaBrowser.Controller.Authentication

        Task<ProviderAuthenticationResult> Authenticate(string username, string password);

+        bool HasPassword(User user);
+
        Task ChangePassword(User user, string newPassword);
    }

--- a/MediaBrowser.Controller/Entities/UserViewBuilder.cs
+++ b/MediaBrowser.Controller/Entities/UserViewBuilder.cs
@@ -455,7 +455,7 @@ namespace MediaBrowser.Controller.Entities
            var itemsArray = totalRecordLimit.HasValue ? items.Take(totalRecordLimit.Value).ToArray() : items.ToArray();
            var totalCount = itemsArray.Length;

-            if (query.Limit.HasValue && query.Limit.Value > 0)
+            if (query.Limit.HasValue)
            {
                itemsArray = itemsArray.Skip(query.StartIndex ?? 0).Take(query.Limit.Value).ToArray();
            }
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -8,7 +8,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Controller</PackageId>
-    <VersionPrefix>10.12.0</VersionPrefix>
+    <VersionPrefix>10.11.5</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/MediaBrowser.Controller/Persistence/IItemRepository.cs
+++ b/MediaBrowser.Controller/Persistence/IItemRepository.cs
@@ -33,7 +33,7 @@ public interface IItemRepository
    /// <param name="cancellationToken">The cancellation token.</param>
    void SaveItems(IReadOnlyList<BaseItem> items, CancellationToken cancellationToken);

-    Task SaveImagesAsync(BaseItem item, CancellationToken cancellationToken = default);
+    void SaveImages(BaseItem item);

    /// <summary>
    /// Retrieves the item.
--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
@@ -154,12 +154,11 @@ namespace MediaBrowser.MediaEncoding.Probing

            info.Name = tags.GetFirstNotNullNorWhiteSpaceValue("title", "title-eng");
            info.ForcedSortName = tags.GetFirstNotNullNorWhiteSpaceValue("sort_name", "title-sort", "titlesort");
-            info.Overview = tags.GetFirstNotNullNorWhiteSpaceValue("synopsis", "description", "desc", "comment");
+            info.Overview = tags.GetFirstNotNullNorWhiteSpaceValue("synopsis", "description", "desc");

+            info.IndexNumber = FFProbeHelpers.GetDictionaryNumericValue(tags, "episode_sort");
            info.ParentIndexNumber = FFProbeHelpers.GetDictionaryNumericValue(tags, "season_number");
-            info.IndexNumber = FFProbeHelpers.GetDictionaryNumericValue(tags, "episode_sort") ??
-                               FFProbeHelpers.GetDictionaryNumericValue(tags, "episode_id");
-            info.ShowName = tags.GetValueOrDefault("show_name", "show");
+            info.ShowName = tags.GetValueOrDefault("show_name");
            info.ProductionYear = FFProbeHelpers.GetDictionaryNumericValue(tags, "date");

            // Several different forms of retail/premiere date
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -13,10 +13,8 @@ using System.Threading;
 using System.Threading.Tasks;
 using AsyncKeyedLock;
 using MediaBrowser.Common;
-using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
@@ -39,7 +37,6 @@ namespace MediaBrowser.MediaEncoding.Subtitles
        private readonly IMediaSourceManager _mediaSourceManager;
        private readonly ISubtitleParser _subtitleParser;
        private readonly IPathManager _pathManager;
-        private readonly IServerConfigurationManager _serverConfigurationManager;

        /// <summary>
        /// The _semaphoreLocks.
@@ -57,8 +54,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
            IHttpClientFactory httpClientFactory,
            IMediaSourceManager mediaSourceManager,
            ISubtitleParser subtitleParser,
-            IPathManager pathManager,
-            IServerConfigurationManager serverConfigurationManager)
+            IPathManager pathManager)
        {
            _logger = logger;
            _fileSystem = fileSystem;
@@ -67,7 +63,6 @@ namespace MediaBrowser.MediaEncoding.Subtitles
            _mediaSourceManager = mediaSourceManager;
            _subtitleParser = subtitleParser;
            _pathManager = pathManager;
-            _serverConfigurationManager = serverConfigurationManager;
        }

        private MemoryStream ConvertSubtitles(
@@ -399,8 +394,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles

                try
                {
-                    var timeoutMinutes = _serverConfigurationManager.GetEncodingOptions().SubtitleExtractionTimeoutMinutes;
-                    await process.WaitForExitAsync(TimeSpan.FromMinutes(timeoutMinutes)).ConfigureAwait(false);
+                    await process.WaitForExitAsync(TimeSpan.FromMinutes(30)).ConfigureAwait(false);
                    exitCode = process.ExitCode;
                }
                catch (OperationCanceledException)
@@ -683,8 +677,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles

                try
                {
-                    var timeoutMinutes = _serverConfigurationManager.GetEncodingOptions().SubtitleExtractionTimeoutMinutes;
-                    await process.WaitForExitAsync(TimeSpan.FromMinutes(timeoutMinutes)).ConfigureAwait(false);
+                    await process.WaitForExitAsync(TimeSpan.FromMinutes(30)).ConfigureAwait(false);
                    exitCode = process.ExitCode;
                }
                catch (OperationCanceledException)
@@ -835,8 +828,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles

                try
                {
-                    var timeoutMinutes = _serverConfigurationManager.GetEncodingOptions().SubtitleExtractionTimeoutMinutes;
-                    await process.WaitForExitAsync(TimeSpan.FromMinutes(timeoutMinutes)).ConfigureAwait(false);
+                    await process.WaitForExitAsync(TimeSpan.FromMinutes(30)).ConfigureAwait(false);
                    exitCode = process.ExitCode;
                }
                catch (OperationCanceledException)
--- a/MediaBrowser.Model/Activity/IActivityManager.cs
+++ b/MediaBrowser.Model/Activity/IActivityManager.cs
@@ -1,3 +1,5 @@
+#pragma warning disable CS1591
+
 using System;
 using System.Threading.Tasks;
 using Jellyfin.Data.Events;
@@ -5,36 +7,21 @@ using Jellyfin.Data.Queries;
 using Jellyfin.Database.Implementations.Entities;
 using MediaBrowser.Model.Querying;

-namespace MediaBrowser.Model.Activity;
-
-/// <summary>
-/// Interface for the activity manager.
-/// </summary>
-public interface IActivityManager
+namespace MediaBrowser.Model.Activity
 {
-    /// <summary>
-    /// The event that is triggered when an entity is created.
-    /// </summary>
-    event EventHandler<GenericEventArgs<ActivityLogEntry>> EntryCreated;
+    public interface IActivityManager
+    {
+        event EventHandler<GenericEventArgs<ActivityLogEntry>> EntryCreated;

-    /// <summary>
-    /// Create a new activity log entry.
-    /// </summary>
-    /// <param name="entry">The entry to create.</param>
-    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-    Task CreateAsync(ActivityLog entry);
+        Task CreateAsync(ActivityLog entry);

-    /// <summary>
-    /// Get a paged list of activity log entries.
-    /// </summary>
-    /// <param name="query">The activity log query.</param>
-    /// <returns>The page of entries.</returns>
-    Task<QueryResult<ActivityLogEntry>> GetPagedResultAsync(ActivityLogQuery query);
+        Task<QueryResult<ActivityLogEntry>> GetPagedResultAsync(ActivityLogQuery query);

-    /// <summary>
-    /// Remove all activity logs before the specified date.
-    /// </summary>
-    /// <param name="startDate">Activity log start date.</param>
-    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-    Task CleanAsync(DateTime startDate);
+        /// <summary>
+        /// Remove all activity logs before the specified date.
+        /// </summary>
+        /// <param name="startDate">Activity log start date.</param>
+        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+        Task CleanAsync(DateTime startDate);
+    }
 }
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -57,7 +57,6 @@ public class EncodingOptions
        AllowHevcEncoding = false;
        AllowAv1Encoding = false;
        EnableSubtitleExtraction = true;
-        SubtitleExtractionTimeoutMinutes = 30;
        AllowOnDemandMetadataBasedKeyframeExtractionForExtensions = ["mkv"];
        HardwareDecodingCodecs = ["h264", "vc1"];
    }
@@ -287,11 +286,6 @@ public class EncodingOptions
    /// </summary>
    public bool EnableSubtitleExtraction { get; set; }

-    /// <summary>
-    /// Gets or sets the timeout for subtitle extraction in minutes.
-    /// </summary>
-    public int SubtitleExtractionTimeoutMinutes { get; set; }
-
    /// <summary>
    /// Gets or sets the codecs hardware encoding is used for.
    /// </summary>
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -287,5 +287,5 @@ public class ServerConfiguration : BaseApplicationConfiguration
    /// <summary>
    /// Gets or sets a value indicating whether old authorization methods are allowed.
    /// </summary>
-    public bool EnableLegacyAuthorization { get; set; }
+    public bool EnableLegacyAuthorization { get; set; } = true;
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Bond-009	32d2414de0	Merge pull request #15950 from theguymadmax/revert-sort-index-number Revert "always sort season by index number"	2026-01-09 18:38:23 +01:00
Bond-009	317a3a47c3	Merge pull request #15961 from theguymadmax/fix-bad-plugin-url Fix crash when plugin repository has an invalid URL	2026-01-09 18:24:48 +01:00
theguymadmax	845b8cdc8f	Fix crash when plugin repository has an invalid URL	2026-01-06 11:57:25 -05:00
theguymadmax	c86f6439c5	Revert "always sort season by index number" This reverts commit `e16ea7b236`.	2026-01-05 11:06:25 -05:00
theguymadmax	559e0088e5	Fix tag inheritance for Continue Watching queries (#15931 )	2026-01-04 11:20:34 -07:00
Collin T Swisher	78e3702cb0	Fix playlist item de-duplication (#15858 )	2025-12-24 07:50:15 -07:00
Bond-009	01b20d3b75	Merge pull request #15833 from nyanmisaka/fix-h264-av1-sdr-hls-fallback Fix missing H.264 and AV1 SDR fallbacks in HLS playlist	2025-12-24 10:28:33 +01:00
Tim Eisele	156761405e	Prefer US rating on fallback (#15793 )	2025-12-19 20:41:09 -07:00
Claus Vium	1805f2259f	add CultureDto cache (#15826 )	2025-12-19 20:38:54 -07:00
Nyanmisaka	4c587776d6	Fix the use of HWA in unsupported H.264 Hi422P/Hi444PP (#15819 )	2025-12-19 19:58:56 -07:00
gnattu	8379b4634a	Enforce more strict webm check (#15807 )	2025-12-19 19:57:08 -07:00
Nyanmisaka	9470439cfa	Fix video lacking SAR and DAR are marked as anamorphic (#15834 )	2025-12-19 19:54:48 -07:00
gnattu	18096e48e0	Use hvc1 codectag for Dolby Vision 8.4 (#15835 )	2025-12-19 19:53:28 -07:00
nyanmisaka	f2d0ac7b28	Fix missing H.264 and AV1 SDR fallbacks in HLS playlist Previously, if HEVC encoding was disabled on the server, SDR fallbacks would not be provided. Signed-off-by: nyanmisaka <nst799610810@gmail.com>	2025-12-19 20:33:24 +08:00
Jellyfin Release Bot	1e27f460fe	Bump version to 10.11.5	2025-12-14 21:44:14 -05:00
Andrew Rabert	4cdd8c8233	Fix unnecessary database JOINs in ApplyNavigations (#15666 )	2025-12-13 10:58:08 -07:00
Tim Eisele	6e60634c9f	Skip invalid ignore rules (#15746 )	2025-12-13 08:39:49 -07:00
theguymadmax	12c5d6b636	Fix backdrop images being deleted when stored with media (#15766 )	2025-12-13 08:29:17 -07:00
theguymadmax	b617c62f8e	Fix NullReferenceException in ApplyOrder method (#15768 )	2025-12-13 08:28:31 -07:00
Nyanmisaka	035b5895b0	Fix AV1 decoding hang regression on RK3588 (#15776 )	2025-12-13 08:27:29 -07:00
theguymadmax	22da5187c8	Fix collection display order (#15767 )	2025-12-13 08:27:01 -07:00
theguymadmax	5804d6840c	Fix parental rating comparison with sub-scores (#15786 )	2025-12-13 08:25:48 -07:00
Bond-009	b50ce1ad6b	Merge pull request #15752 from Collin-Swish/fix-name-case-insensitivity Fix case sensitivity edge case	2025-12-12 21:39:22 +01:00
Bond-009	481ee03f35	Merge pull request #15757 from theguymadmax/fix-trickplays-for-alt-versions Fix trickplay images using wrong item on alternate versions	2025-12-12 21:31:52 +01:00
Bond-009	d91adb5d54	Merge pull request #15662 from SapientGuardian/issue15661 Fix blocking in async context in LimitedConcurrencyLibraryScheduler	2025-12-10 20:37:57 +01:00
theguymadmax	ef7f138a4e	Fix trickplay images using wrong item on alternate versions	2025-12-09 14:21:09 -05:00
Collin Swisher	2e8d9a311b	Fix case sensitivity edge case	2025-12-08 17:41:48 -06:00
gnattu	4c5a3fbff3	Use original name for MusicAritist matching (#15689 )	2025-12-05 19:30:02 -07:00
liszto	636908fc4d	Fix thumbnails not being deleted from temp folder	2025-12-05 19:29:54 -07:00
Tim Eisele	997362fc97	Backport dependency updates (#15723 )	2025-12-05 19:27:30 -07:00
Noah Potash	c5147341e3	Fixes 15661. Replace BlockingCollection with Channel in LimitedConcurrencyLibraryScheduler to prevent blocking in an asynchronous context.	2025-12-03 21:50:08 -05:00
Noah Potash	ca33bcebf0	Add SapientGuardian to CONTRIBUTORS.md	2025-12-03 21:27:26 -05:00
Ivan Kara	d32f487e8e	Fix symlinked file size (#15681 )	2025-12-03 19:04:59 -07:00
theguymadmax	fb65f8f853	Fix ItemAdded event triggering when updating metadata (#15680 )	2025-12-03 19:02:55 -07:00
martenumberto	2a0b90e385	Fix: Add .ts fallback for video streams to prevent crash (#15690 )	2025-12-03 19:02:39 -07:00
myzhysz	dde70fd8a2	Fix stack overflow while scanning (#15698 )	2025-12-03 19:02:04 -07:00
Niels van Velzen	98d1d0cb35	Merge pull request #15670 from nyanmisaka/fix-mjpeg-rk3576 Fix the empty output of trickplay on RK3576	2025-12-02 13:48:51 +01:00
Jellyfin Release Bot	ba76a8f3ad	Bump version to 10.11.4	2025-11-30 21:33:32 -05:00
Anthony Lavado	8cd5652157	Merge pull request #15672 from jellyfin/openapi-cache-z Cache OpenApi document generation	2025-11-30 21:22:29 -05:00
crobibero	8aff4227d9	Implement caching for OpenAPI document	2025-11-30 09:19:19 -07:00
nyanmisaka	026f7472cb	Fix the empty output of trickplay on RK3576 Signed-off-by: nyanmisaka <nst799610810@gmail.com>	2025-11-30 21:38:47 +08:00
MBR-0001	daca285568	Revert "Localization/iso6392.txt: change pob and pop" (#15555 )	2025-11-23 19:20:29 +01:00
theguymadmax	fbb9a0b2c7	Fix ResolveLinkTarget crashing on exFAT drives (#15568 )	2025-11-21 21:14:39 -07:00
Ziyuan Qu	29b3aa8543	Add hidden file check in bdInfo (#15582 )	2025-11-21 21:14:30 -07:00
theguymadmax	94f3725208	Fix isMovie filter logic (#15594 )	2025-11-21 21:14:03 -07:00
theguymadmax	0ee81e87be	Fix locked fields on not saving (#15564 )	2025-11-19 17:02:53 +01:00
theguymadmax	c491a918c2	Save item to database before providers run to prevent FK constraint errors (#15563 )	2025-11-19 17:01:13 +01:00
gnattu	1e7e46cb82	Prevent copying HDR streams when only SDR is supported (#15556 )	2025-11-18 18:37:35 -07:00
theguymadmax	5ae444d96d	Fix NullReferenceException in filesystem path comparison (#15548 )	2025-11-18 18:37:09 -07:00
gnattu	ee7ad83427	Restrict first video frame probing to file protocol (#15557 )	2025-11-18 18:36:59 -07:00
Jellyfin Release Bot	921d7d3364	Bump version to 10.11.3	2025-11-16 17:40:07 -05:00
theguymadmax	f8e012582a	Fix movie titles using folder name when NFOs saver is enabled (#15529 )	2025-11-16 13:59:58 -07:00
theguymadmax	def5956cd1	Fix tmdbid not detected in single movie folder (#14955 )	2025-11-16 13:36:35 -07:00
theguymadmax	abfbaca336	Fix series DateLastMediaAdded not updating when new episodes are added (#15472 )	2025-11-16 13:35:43 -07:00
theguymadmax	6566188e45	Add 1 minute tolerance for NFO change detection (#15514 )	2025-11-15 08:39:25 -07:00
theguymadmax	078f9584ed	Fix playlist DateCreated and DateLastMediaAdded not being set (#15508 )	2025-11-14 15:19:40 -07:00
Iksas	ee34c75386	fix missing font extraction for certain transcoding settings (#15502 )	2025-11-13 18:30:18 -07:00
theguymadmax	e8150428b6	Fix .ignore handling for directories (#15501 )	2025-11-13 18:23:18 -07:00
theguymadmax	4b38e35bbb	Remove InheritedTags and update tag filtering logic (#15493 )	2025-11-13 18:23:03 -07:00
Huo Jiacheng	435bb14bb2	Fix gitignore-style not working properly on windows. (#15487 )	2025-11-12 19:43:13 -07:00
theguymadmax	2e5ced5098	Improve season folder parsing (#15404 )	2025-11-12 17:36:57 -07:00
Bond-009	f4a846aa4d	Don't error out when searching for marker files fails (#15466 ) Fixes #15445	2025-11-11 15:45:47 -07:00
Joshua M. Boniface	7c1063177f	Merge pull request #15462 from theguymadmax/fix-exception-for-empty-strm-files Fix NullReferenceException in GetPathProtocol when path is null	2025-11-10 19:30:38 -05:00
Joshua M. Boniface	5878b1ffc5	Merge pull request #15468 from Bond-009/carefulWithLastMinChanges Check if target exists before trying to follow it	2025-11-10 19:12:24 -05:00
Bond_009	3c3c2aee0d	Check if target exists before trying to follow it Exception got caught in ManagedFileSystem and wrong file info got returned	2025-11-10 23:19:17 +01:00
theguymadmax	511223aac4	Fix NullReferenceException in GetPathProtocol when path is null	2025-11-10 02:30:49 -05:00
Mikal S.	3b2d64995a	Resolve symlinks for static media source infos (#15263 )	2025-11-09 09:45:02 -07:00
theguymadmax	13c4517a66	Fix collection grouping in mixed libraries (#15373 )	2025-11-09 09:35:50 -07:00
theguymadmax	177b6464ca	Don't clear baseitemids (#15446 )	2025-11-09 09:22:09 -07:00
Bond-009	5a9a8363f4	Merge pull request #15441 from IceStormNG/fix-nullreference-role-null-10.11 Fix System.NullReferenceException when people's role is null (10.11.z)	2025-11-08 18:25:03 +01:00
theguymadmax	49efd68fc7	Invalidate parent folder's cache on deletion/creation (#15423 )	2025-11-08 08:30:04 -07:00
Carsten Braun	90a8a26c6e	Copy-Pasting is sometimes hard....	2025-11-08 15:00:11 +01:00
Carsten Braun	002c83e6f5	Fix NullReferenceExceltop when role is null.	2025-11-08 14:32:14 +01:00
theguymadmax	7222910b05	Fix filters to use SortName (#15381 )	2025-11-07 18:21:41 -07:00
Bond-009	097cb87f6f	Don't enforce a minimum amount of free space for the tmp and log dirs (#15390 )	2025-11-07 18:21:10 -07:00
JPVenson	91c3b1617e	Fixed missing sort argument (#15413 )	2025-11-07 18:20:42 -07:00
theguymadmax	8f71922734	Fix item count display for collapsed items (#15380 )	2025-11-07 18:20:10 -07:00
Niels van Velzen	d140630208	Update branding in Swagger page (#15422 )	2025-11-07 18:19:30 -07:00
theguymadmax	63a3e55297	Fix search terms using diacritics (#15435 )	2025-11-07 18:18:24 -07:00
evanreichard	c2e5081d64	feat(sqlite): add timeout config (#15369 )	2025-11-07 18:17:43 -07:00
Jellyfin Release Bot	4187c6f620	Bump version to 10.11.2	2025-11-02 21:28:56 -05:00
Tim Eisele	e7dbb3afec	Skip too large extracted season numbers (#15326 )	2025-11-02 09:11:48 -07:00
vinnyspb	f994dd6211	Update file size when refreshing metadata (#15325 )	2025-11-01 14:18:19 -06:00
Cody Robibero	da254ee968	return instead of break, add check to more migrations (#15322 )	2025-11-01 14:17:22 -06:00
Bill Thornton	4ad3141875	Update password reset to always return the same response structure (#15254 )	2025-11-01 14:17:09 -06:00
evanreichard	b5f0199a25	fix: in optimistic locking, key off table is locked (#15328 )	2025-11-01 14:15:26 -06:00
Nyanmisaka	6bf88c049e	Ignore initial delay in audio-only containers (#15247 )	2025-10-29 20:40:28 -06:00
Jellyfin Release Bot	40a33da2a5	Bump version to 10.11.1	2025-10-26 22:02:09 -04:00
Joshua M. Boniface	3596fc0693	Fix bump_version to handle spaced filename	2025-10-26 21:50:38 -04:00
Jellyfin Release Bot	93824dad97	Bump version to 10.11.1	2025-10-26 21:41:27 -04:00
Tim Eisele	e5656af1f2	Improve symlink handling (#15209 )	2025-10-26 15:10:13 -06:00
Niels van Velzen	c127c10458	Merge pull request #15225 from Bond-009/z440ATL Update dependency z440.atl.core to 7.6.0	2025-10-26 18:50:04 +01:00
Tim Eisele	7d1824ea27	Fix pagination and sorting for folders (#15187 )	2025-10-26 11:34:11 -06:00
Cody Robibero	2966d27c97	Skip invalid database migration (#15212 )	2025-10-26 11:34:04 -06:00
Ivan Kara	618ec4543e	Add season number fallback for OMDB and TMDB plugins (#15113 )	2025-10-26 11:33:55 -06:00
Cody Robibero	0e4031ae52	Skip extracting directory entry when restoring (#15196 )	2025-10-26 11:33:47 -06:00
CeruleanRed	442af96ed9	Only save chapters that are within the runtime of the video file (#15176 )	2025-10-26 10:37:16 -06:00
JJBlue	a305204cfa	Skip extracted files in migration if bad timestamp or no access (#15220 ) Fixes #15024	2025-10-26 10:30:43 -06:00
theguymadmax	75f472e6a7	Normalize paths in database queries (#15217 )	2025-10-26 10:30:12 -06:00
Bond_009	cc32e8f7cb	Update dependency z440.atl.core to 7.6.0	2025-10-26 15:16:08 +01:00
MBR-0001	14b3085ff1	Fix Has(Imdb/Tmdb/Tvdb)Id checks (#15126 )	2025-10-25 16:00:55 -06:00
Cody Robibero	5691eee4f1	Prefer filting by package id instead of name (#15197 )	2025-10-25 09:37:09 -06:00
theguymadmax	1520a697ad	Play selected song first with instant mix (#15133 )	2025-10-25 09:33:11 -06:00
Cody Robibero	81b8b0ca4a	Add the transcode marker during startup instead of first transcode (#15194 )	2025-10-25 09:32:15 -06:00
Cody Robibero	ac3fa3c376	Clean up backup service (#15170 )	2025-10-24 17:57:34 -06:00
Tim Eisele	7a1c1cd342	Skip extracted files in migration if bad timestamp or no access (#15112 )	2025-10-24 17:57:19 -06:00
gnattu	70c32a26fa	Make priority class setting more robust (#15177 )	2025-10-24 17:57:02 -06:00
Cody Robibero	2b94bb54aa	Fix xml formatter (#15164 )	2025-10-24 17:56:38 -06:00
Bond-009	0a6e8146be	Lower required tmp dir size to 512MiB (#15098 )	2025-10-23 16:38:27 -06:00
theguymadmax	305b0fdca3	Make season paths case-insensitive (#15102 )	2025-10-23 16:38:06 -06:00
theguymadmax	d738386fe2	Fix LiveTV images not saving to database (#15083 )	2025-10-23 16:37:55 -06:00
Tim Eisele	ca830d5be7	Speed-up trickplay migration (#15054 )	2025-10-23 16:37:47 -06:00
theguymadmax	a5bc4524d8	Optimize artist query (#15087 )	2025-10-23 16:37:29 -06:00
Nyanmisaka	175ee12bbc	Fix videos with cropping metadata are probed as anamorphic (#15144 )	2025-10-23 16:31:11 -06:00
Nyanmisaka	a725220c21	Reject stream copy of HDR10+ video if the client does not support HDR10 (#15072 )	2025-10-21 17:20:56 -06:00
gnattu	a245605152	Log the message more clear when network manager is not ready (#15055 )	2025-10-21 17:18:26 -06:00
Tim Eisele	f4a53209f4	Skip invalid keyframe cache data (#15032 )	2025-10-21 17:17:56 -06:00
Jellyfin Release Bot	877251bcae	Bump version to 10.11.0	2025-10-19 20:45:12 -04:00