Bump version to 10.11.0

Merge pull request #15016 from jellyfin/renovate/ci-deps
Update github/codeql-action action to v4.30.9
2025-10-19 20:45:12 -04:00 · 2025-10-19 11:14:52 +02:00 · 2025-10-19 05:33:11 +00:00 · 2025-10-18 11:54:27 +00:00 · 2025-10-17 15:56:06 +00:00 · 2025-10-15 17:39:47 +02:00
67 changed files with 2600 additions and 325 deletions
@@ -3,7 +3,7 @@
  "isRoot": true,
  "tools": {
    "dotnet-ef": {
-      "version": "9.0.9",
+      "version": "9.0.10",
      "commands": [
        "dotnet-ef"
      ]
@@ -27,11 +27,11 @@ jobs:
        dotnet-version: '9.0.x'

    - name: Initialize CodeQL
-      uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
+      uses: github/codeql-action/init@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
      with:
        languages: ${{ matrix.language }}
        queries: +security-extended
    - name: Autobuild
-      uses: github/codeql-action/autobuild@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
+      uses: github/codeql-action/autobuild@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
+      uses: github/codeql-action/analyze@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
@@ -115,7 +115,7 @@ jobs:
          } >> $GITHUB_OUTPUT

      - name: Find difference comment
-        uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3.1.0
+        uses: peter-evans/find-comment@b30e6a3c0ed37e7c023ccd3f1db5c6c0b0c23aad # v4.0.0
        id: find-comment
        with:
          issue-number: ${{ github.event.pull_request.number }}
@@ -123,7 +123,7 @@ jobs:
          body-includes: abi-diff-workflow-comment

      - name: Reply or edit difference comment (changed)
-        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
+        uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
        if: ${{ steps.diff.outputs.body != '' }}
        with:
          issue-number: ${{ github.event.pull_request.number }}
@@ -142,7 +142,7 @@ jobs:
            </details>

      - name: Reply or edit difference comment (unchanged)
-        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
+        uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
        if: ${{ steps.diff.outputs.body == '' && steps.find-comment.outputs.comment-id != '' }}
        with:
          issue-number: ${{ github.event.pull_request.number }}
@@ -120,14 +120,14 @@ jobs:
          echo "" >> openapi-changes-reply.md
          echo "</details>" >> openapi-changes-reply.md
      - name: Find difference comment
-        uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3.1.0
+        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@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
+        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 }}
@@ -135,7 +135,7 @@ jobs:
          edit-mode: replace
          body-path: openapi-changes-reply.md
      - name: Edit difference comment (unchanged)
-        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
+        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 }}
@@ -35,7 +35,7 @@ jobs:
          --verbosity minimal

      - name: Merge code coverage results
-        uses: danielpalme/ReportGenerator-GitHub-Action@18e0cd4c1bebd0c8b3978b380a6a4ea61c51178e # v5.4.15
+        uses: danielpalme/ReportGenerator-GitHub-Action@9870ed167742d546b99962ff815fcc1098355ed8 # v5.4.17
        with:
          reports: "**/coverage.cobertura.xml"
          targetdir: "merged/"
@@ -17,7 +17,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Notify as seen
-        uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
+        uses: peter-evans/create-or-update-comment@e8674b075228eee787fea43ef493e45ece1004c9 # v5.0.0
        with:
          token: ${{ secrets.JF_BOT_TOKEN }}
          comment-id: ${{ github.event.comment.id }}
@@ -46,7 +46,7 @@ jobs:
      - name: install python
        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
-          python-version: '3.13'
+          python-version: '3.14'
          cache: 'pip'
      - name: install python packages
        run: pip install -r rename/requirements.txt
@@ -16,7 +16,7 @@ jobs:
    runs-on: ubuntu-latest
    if: ${{ contains(github.repository, 'jellyfin/') }}
    steps:
-      - uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
+      - uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
        with:
          repo-token: ${{ secrets.JF_BOT_TOKEN }}
          ascending: true
@@ -16,7 +16,7 @@ jobs:
      - name: install python
        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
        with:
-          python-version: '3.13'
+          python-version: '3.14'
          cache: 'pip'
      - name: install python packages
        run: pip install -r main-repo-triage/requirements.txt
@@ -15,7 +15,7 @@ jobs:
    runs-on: ubuntu-latest
    if: ${{ contains(github.repository, 'jellyfin/') }}
    steps:
-      - uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
+      - uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
        with:
          repo-token: ${{ secrets.JF_BOT_TOKEN }}
          ascending: true
@@ -20,7 +20,7 @@
  </ItemGroup>

  <!-- Custom Analyzers -->
-  <ItemGroup Condition=" '$(MSBuildProjectName)' != 'Jellyfin.CodeAnalysis' ">
+  <ItemGroup Condition=" '$(MSBuildProjectName)' != 'Jellyfin.CodeAnalysis' AND '$(Configuration)' == 'Debug' ">
    <ProjectReference Include="$(MSBuildThisFileDirectory)src/Jellyfin.CodeAnalysis/Jellyfin.CodeAnalysis.csproj" OutputItemType="Analyzer" />
  </ItemGroup>

@@ -4,7 +4,7 @@
  </PropertyGroup>
  <!-- Run "dotnet list package (dash,dash)outdated" to see the latest versions of each package.-->
  <ItemGroup Label="Package Dependencies">
-    <PackageVersion Include="AsyncKeyedLock" Version="7.1.6" />
+    <PackageVersion Include="AsyncKeyedLock" Version="7.1.7" />
    <PackageVersion Include="AutoFixture.AutoMoq" Version="4.18.1" />
    <PackageVersion Include="AutoFixture.Xunit2" Version="4.18.1" />
    <PackageVersion Include="AutoFixture" Version="4.18.1" />
@@ -18,7 +18,7 @@
    <PackageVersion Include="DiscUtils.Udf" Version="0.16.13" />
    <PackageVersion Include="DotNet.Glob" Version="3.1.3" />
    <PackageVersion Include="FsCheck.Xunit" Version="3.3.1" />
-    <PackageVersion Include="HarfBuzzSharp.NativeAssets.Linux" Version="8.3.1.2" />
+    <PackageVersion Include="HarfBuzzSharp.NativeAssets.Linux" Version="8.3.1.1" />
    <PackageVersion Include="ICU4N.Transliterator" Version="60.1.0-alpha.356" />
    <PackageVersion Include="IDisposableAnalyzers" Version="4.0.8" />
    <PackageVersion Include="Ignore" Version="0.2.1" />
@@ -26,33 +26,33 @@
    <PackageVersion Include="libse" Version="4.0.12" />
    <PackageVersion Include="LrcParser" Version="2025.623.0" />
    <PackageVersion Include="MetaBrainz.MusicBrainz" Version="6.1.0" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.10" />
    <PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="4.14.0" />
    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.14.0" />
    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.10" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
    <PackageVersion Include="MimeTypes" Version="2.5.2" />
    <PackageVersion Include="Morestachio" Version="5.0.1.631" />
    <PackageVersion Include="Moq" Version="4.18.4" />
@@ -62,7 +62,7 @@
    <PackageVersion Include="prometheus-net.AspNetCore" Version="8.2.1" />
    <PackageVersion Include="prometheus-net.DotNetRuntime" Version="4.4.1" />
    <PackageVersion Include="prometheus-net" Version="8.2.1" />
-    <PackageVersion Include="Polly" Version="8.6.3" />
+    <PackageVersion Include="Polly" Version="8.6.4" />
    <PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />
    <PackageVersion Include="Serilog.Enrichers.Thread" Version="4.0.0" />
    <PackageVersion Include="Serilog.Expressions" Version="5.0.0" />
@@ -74,9 +74,9 @@
    <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.119.1" />
-    <PackageVersion Include="SkiaSharp.HarfBuzz" Version="3.119.1" />
-    <PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="3.119.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" />
@@ -84,9 +84,9 @@
    <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.9" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.9" />
-    <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="9.0.9" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="9.0.10" />
+    <PackageVersion Include="System.Text.Json" Version="9.0.10" />
+    <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="9.0.10" />
    <PackageVersion Include="TagLibSharp" Version="2.3.0" />
    <PackageVersion Include="z440.atl.core" Version="7.5.0" />
    <PackageVersion Include="TMDbLib" Version="2.3.0" />
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -251,23 +250,9 @@ public class ChapterManager : IChapterManager
    }

    /// <inheritdoc />
-    public void DeleteChapterImages(Video video)
+    public async Task DeleteChapterDataAsync(Guid itemId, CancellationToken cancellationToken)
    {
-        var path = _pathManager.GetChapterImageFolderPath(video);
-        try
-        {
-            if (Directory.Exists(path))
-            {
-                _logger.LogInformation("Removing chapter images for {Name} [{Id}]", video.Name, video.Id);
-                Directory.Delete(path, true);
-            }
-        }
-        catch (Exception ex)
-        {
-            _logger.LogWarning("Failed to remove chapter image folder for {Item}: {Exception}", video.Id, ex);
-        }
-
-        _chapterRepository.DeleteChapters(video.Id);
+        await _chapterRepository.DeleteChaptersAsync(itemId, cancellationToken).ConfigureAwait(false);
    }

    private IReadOnlyList<string> GetSavedChapterImages(Video video, IDirectoryService directoryService)
@@ -104,6 +104,8 @@ namespace Emby.Server.Implementations.Collections

            await _libraryManager.AddVirtualFolder(name, CollectionTypeOptions.boxsets, libraryOptions, true).ConfigureAwait(false);

+            _libraryManager.RootFolder.Children = null;
+
            return FindFolders(path).First();
        }

@@ -3,6 +3,7 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using MediaBrowser.Controller.Chapters;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.MediaSegments;
@@ -20,6 +21,7 @@ public class ExternalDataManager : IExternalDataManager
    private readonly IMediaSegmentManager _mediaSegmentManager;
    private readonly IPathManager _pathManager;
    private readonly ITrickplayManager _trickplayManager;
+    private readonly IChapterManager _chapterManager;
    private readonly ILogger<ExternalDataManager> _logger;

    /// <summary>
@@ -29,18 +31,21 @@ public class ExternalDataManager : IExternalDataManager
    /// <param name="mediaSegmentManager">The media segment manager.</param>
    /// <param name="pathManager">The path manager.</param>
    /// <param name="trickplayManager">The trickplay manager.</param>
+    /// <param name="chapterManager">The chapter manager.</param>
    /// <param name="logger">The logger.</param>
    public ExternalDataManager(
        IKeyframeManager keyframeManager,
        IMediaSegmentManager mediaSegmentManager,
        IPathManager pathManager,
        ITrickplayManager trickplayManager,
+        IChapterManager chapterManager,
        ILogger<ExternalDataManager> logger)
    {
        _keyframeManager = keyframeManager;
        _mediaSegmentManager = mediaSegmentManager;
        _pathManager = pathManager;
        _trickplayManager = trickplayManager;
+        _chapterManager = chapterManager;
        _logger = logger;
    }

@@ -67,5 +72,6 @@ public class ExternalDataManager : IExternalDataManager
        await _keyframeManager.DeleteKeyframeDataAsync(itemId, cancellationToken).ConfigureAwait(false);
        await _mediaSegmentManager.DeleteSegmentsAsync(itemId, cancellationToken).ConfigureAwait(false);
        await _trickplayManager.DeleteTrickplayDataAsync(itemId, cancellationToken).ConfigureAwait(false);
+        await _chapterManager.DeleteChapterDataAsync(itemId, cancellationToken).ConfigureAwait(false);
    }
 }
@@ -528,7 +528,7 @@ namespace Emby.Server.Implementations.Library
            {
                Genre => _configurationManager.ApplicationPaths.GenrePath,
                MusicArtist => _configurationManager.ApplicationPaths.ArtistsPath,
-                MusicGenre => _configurationManager.ApplicationPaths.GenrePath,
+                MusicGenre => _configurationManager.ApplicationPaths.MusicGenrePath,
                Person => _configurationManager.ApplicationPaths.PeoplePath,
                Studio => _configurationManager.ApplicationPaths.StudioPath,
                Year => _configurationManager.ApplicationPaths.YearPath,
@@ -2129,6 +2129,8 @@ namespace Emby.Server.Implementations.Library
                }
            }

+            item.ValidateImages();
+
            _itemRepository.SaveImages(item);

            RegisterItem(item);
@@ -3051,10 +3053,10 @@ namespace Emby.Server.Implementations.Library
            }
            finally
            {
+                await ValidateTopLibraryFolders(CancellationToken.None).ConfigureAwait(false);
+
                if (refreshLibrary)
                {
-                    await ValidateTopLibraryFolders(CancellationToken.None).ConfigureAwait(false);
-
                    StartScanInBackground();
                }
                else
@@ -1,14 +1,14 @@
 {
    "TaskCleanActivityLogDescription": "Kustutab määratud ajast vanemad tegevuslogi kirjed.",
-    "UserDownloadingItemWithValues": "{0} laeb alla {1}",
+    "UserDownloadingItemWithValues": "{0} laadib alla {1}",
    "HeaderRecordingGroups": "Salvestusrühmad",
    "TaskOptimizeDatabaseDescription": "Tihendab ja puhastab andmebaasi. Selle toimingu tegemine pärast meediakogu andmebaasiga seotud muudatuste skannimist võib jõudlust parandada.",
    "TaskOptimizeDatabase": "Optimeeri andmebaasi",
    "TaskDownloadMissingSubtitlesDescription": "Otsib veebist puuduvaid subtiitreid vastavalt määratud metaandmete seadetele.",
-    "TaskDownloadMissingSubtitles": "Laadi alla puuduvad subtiitrid",
+    "TaskDownloadMissingSubtitles": "Hangi puuduvad subtiitrid",
    "TaskRefreshChannelsDescription": "Värskendab veebikanalite teavet.",
    "TaskRefreshChannels": "Värskenda kanaleid",
-    "TaskCleanTranscodeDescription": "Kustutab üle ühe päeva vanused transkodeerimisfailid.",
+    "TaskCleanTranscodeDescription": "Kustutab üle ühe päeva vanused transkoodimisfailid.",
    "TaskCleanTranscode": "Puhasta transkoodimise kataloog",
    "TaskUpdatePluginsDescription": "Laadib alla ja paigaldab nende pluginate uuendused, mis on seadistatud automaatselt uuenduma.",
    "TaskUpdatePlugins": "Uuenda pluginaid",
@@ -41,10 +41,10 @@
    "StartupEmbyServerIsLoading": "Jellyfin server laadib. Proovi varsti uuesti.",
    "User": "Kasutaja",
    "Undefined": "Määratlemata",
-    "TvShows": "Seriaalid",
+    "TvShows": "Sarjad",
    "System": "Süsteem",
    "Sync": "Sünkrooni",
-    "Songs": "Laulud",
+    "Songs": "Lood",
    "Shows": "Sarjad",
    "ServerNameNeedsToBeRestarted": "{0} tuleb taaskäivitada",
    "ScheduledTaskFailedWithName": "{0} nurjus",
@@ -92,7 +92,7 @@
    "HeaderNextUp": "Järgmisena",
    "HeaderLiveTV": "Otse TV",
    "HeaderFavoriteSongs": "Lemmiklood",
-    "HeaderFavoriteShows": "Lemmikseriaalid",
+    "HeaderFavoriteShows": "Lemmiksarjad",
    "HeaderFavoriteEpisodes": "Lemmikepisoodid",
    "HeaderFavoriteArtists": "Lemmikesitajad",
    "HeaderFavoriteAlbums": "Lemmikalbumid",
@@ -122,18 +122,20 @@
    "UserOnlineFromDevice": "{0} on ühendatud seadmest {1}",
    "External": "Väline",
    "HearingImpaired": "Kuulmispuudega",
-    "TaskKeyframeExtractorDescription": "Eraldab videofailidest võtmekaadreid, et luua täpsemaid HLS-i esitusloendeid. See ülesanne võib kesta pikka aega.",
-    "TaskKeyframeExtractor": "Võtmekaadri ekstraktor",
-    "TaskRefreshTrickplayImages": "Loo eelvaate pildid",
-    "TaskRefreshTrickplayImagesDescription": "Loob eelvaated videotele, kus lubatud.",
-    "TaskAudioNormalization": "Heli Normaliseerimine",
-    "TaskAudioNormalizationDescription": "Skaneerib faile heli normaliseerimise andmete jaoks.",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Eemaldab kogumikest ja esitusloenditest asjad, mida enam ei eksisteeri.",
+    "TaskKeyframeExtractorDescription": "Eraldab videofailidest võtmekaadrid, et luua täpsemaid HLS-i esitusloendeid. See võib kesta pikka aega.",
+    "TaskKeyframeExtractor": "Eralda võtmekaadrid",
+    "TaskRefreshTrickplayImages": "Loo trickplay pildid",
+    "TaskRefreshTrickplayImagesDescription": "Loob trickplay eelvaated videotele lubatud meediakogudes.",
+    "TaskAudioNormalization": "Normaliseeri helitugevus",
+    "TaskAudioNormalizationDescription": "Otsib failidest helitugevuse normaliseerimise teavet.",
+    "TaskCleanCollectionsAndPlaylistsDescription": "Eemaldab kogumikest ja esitusloenditest üksused, mida enam ei eksisteeri.",
    "TaskCleanCollectionsAndPlaylists": "Puhasta kogumikud ja esitusloendid",
-    "TaskDownloadMissingLyrics": "Lae alla puuduolev lüürika",
-    "TaskDownloadMissingLyricsDescription": "Lae lauludele alla lüürika",
+    "TaskDownloadMissingLyrics": "Hangi puuduvad laulusõnad",
+    "TaskDownloadMissingLyricsDescription": "Laulusõnade allalaadimine",
    "TaskMoveTrickplayImagesDescription": "Liigutab trickplay pildid meediakogu sätete kohaselt.",
-    "TaskExtractMediaSegments": "Meediasegmentide skaneerimine",
+    "TaskExtractMediaSegments": "Skaneeri meediasegmente",
    "TaskExtractMediaSegmentsDescription": "Eraldab või võtab meediasegmendid MediaSegment'i lubavatest pluginatest.",
-    "TaskMoveTrickplayImages": "Migreeri trickplay piltide asukoht"
+    "TaskMoveTrickplayImages": "Muuda trickplay piltide asukoht",
+    "CleanupUserDataTask": "Puhasta kasutajaandmed",
+    "CleanupUserDataTaskDescription": "Puhastab kõik kasutajaandmed (vaatamise olek, lemmikute olek jne) meediast, mis pole enam vähemalt 90 päeva saadaval olnud."
 }
@@ -1,74 +1,74 @@
 {
-    "Albums": "Álbumes",
+    "Albums": "Álbums",
    "Collections": "Coleccións",
    "ChapterNameValue": "Capítulo {0}",
    "Channels": "Canles",
-    "CameraImageUploadedFrom": "Cargouse unha nova imaxe da cámara desde {0}",
+    "CameraImageUploadedFrom": "Cargouse unha nova imaxe de cámara dende {0}",
    "Books": "Libros",
    "AuthenticationSucceededWithUserName": "{0} autenticouse correctamente",
    "Artists": "Artistas",
-    "Application": "Aplicativo",
-    "NotificationOptionServerRestartRequired": "Necesario un reinicio do servidor",
-    "NotificationOptionPluginUpdateInstalled": "Actualización do Plugin instalada",
+    "Application": "Aplicación",
+    "NotificationOptionServerRestartRequired": "Necesario o reinicio do servidor",
+    "NotificationOptionPluginUpdateInstalled": "Actualización do plugin instalada",
    "NotificationOptionPluginUninstalled": "Plugin desinstalado",
    "NotificationOptionPluginInstalled": "Plugin instalado",
-    "NotificationOptionPluginError": "Fallo do Plugin",
+    "NotificationOptionPluginError": "Fallo do plugin",
    "NotificationOptionNewLibraryContent": "Novo contido engadido",
    "NotificationOptionInstallationFailed": "Fallo na instalación",
-    "NotificationOptionCameraImageUploaded": "Imaxe da cámara subida",
-    "NotificationOptionAudioPlaybackStopped": "Reproducción de audio parada",
+    "NotificationOptionCameraImageUploaded": "Imaxe da cámara cargada",
+    "NotificationOptionAudioPlaybackStopped": "Reproducción de audio detida",
    "NotificationOptionAudioPlayback": "Reproducción de audio comezada",
    "NotificationOptionApplicationUpdateInstalled": "Actualización da aplicación instalada",
    "NotificationOptionApplicationUpdateAvailable": "Actualización da aplicación dispoñible",
-    "NewVersionIsAvailable": "Unha nova versión do Servidor Jellyfin está dispoñible para descarga.",
+    "NewVersionIsAvailable": "Nova versión do Servidor Jellyfin dispoñible para descargar.",
    "NameSeasonUnknown": "Tempada descoñecida",
    "NameSeasonNumber": "Tempada {0}",
    "NameInstallFailed": "{0} instalación fallida",
-    "MusicVideos": "Vídeos Musicais",
+    "MusicVideos": "Vídeos musicais",
    "Music": "Música",
    "Movies": "Películas",
-    "MixedContent": "Contido Mixto",
-    "MessageServerConfigurationUpdated": "A configuración do servidor foi actualizada",
-    "MessageNamedServerConfigurationUpdatedWithValue": "A sección de configuración {0} do servidor foi actualizada",
-    "MessageApplicationUpdatedTo": "O servidor Jellyfin foi actualizado a {0}",
-    "MessageApplicationUpdated": "O servidor Jellyfin foi actualizado",
+    "MixedContent": "Contido mixto",
+    "MessageServerConfigurationUpdated": "Actualizouse a configuración do servidor",
+    "MessageNamedServerConfigurationUpdatedWithValue": "Actualizouse a sección de configuración {0} do servidor",
+    "MessageApplicationUpdatedTo": "O servidor Jellyfin actualizouse a {0}",
+    "MessageApplicationUpdated": "O servidor Jellyfin actualizouse",
    "Latest": "Último",
-    "LabelRunningTimeValue": "Tempo de execución: {0}",
+    "LabelRunningTimeValue": "Tempo en execución: {0}",
    "LabelIpAddressValue": "Enderezo IP: {0}",
-    "ItemRemovedWithName": "{0} foi eliminado da biblioteca",
-    "ItemAddedWithName": "{0} foi engadido a biblioteca",
+    "ItemRemovedWithName": "{0} eliminouse da biblioteca",
+    "ItemAddedWithName": "{0} engadiuse á biblioteca",
    "Inherit": "Herdar",
    "HomeVideos": "Videos caseiros",
-    "HeaderRecordingGroups": "Grupos de Grabación",
+    "HeaderRecordingGroups": "Grupos de grabación",
    "HeaderNextUp": "De seguido",
    "HeaderLiveTV": "TV en directo",
-    "HeaderFavoriteSongs": "Cancións Favoritas",
-    "HeaderFavoriteShows": "Series de TV Favoritas",
-    "HeaderFavoriteEpisodes": "Episodios Favoritos",
-    "HeaderFavoriteArtists": "Artistas Favoritos",
-    "HeaderFavoriteAlbums": "Álbunes Favoritos",
+    "HeaderFavoriteSongs": "Cancións favoritas",
+    "HeaderFavoriteShows": "Series de TV favoritas",
+    "HeaderFavoriteEpisodes": "Episodios favoritos",
+    "HeaderFavoriteArtists": "Artistas favoritos",
+    "HeaderFavoriteAlbums": "Álbums favoritos",
    "HeaderContinueWatching": "Seguir vendo",
-    "HeaderAlbumArtists": "Artistas do Album",
+    "HeaderAlbumArtists": "Artistas do álbum",
    "Genres": "Xéneros",
    "Forced": "Forzado",
    "Folders": "Cartafoles",
    "Favorites": "Favoritos",
-    "FailedLoginAttemptWithUserName": "Intento de incio de sesión fallido {0}",
+    "FailedLoginAttemptWithUserName": "Fallo de intento de inicio de sesión dende {0}",
    "DeviceOnlineWithName": "{0} conectouse",
    "DeviceOfflineWithName": "{0} desconectouse",
    "Default": "Por defecto",
    "AppDeviceValues": "Aplicación: {0}, Dispositivo: {1}",
-    "TaskCleanLogs": "Limpar Carpeta de Rexistros",
-    "TaskCleanActivityLog": "Limpar Rexistro de Actividade",
-    "TasksChannelsCategory": "Canáis de Internet",
-    "TaskUpdatePlugins": "Actualizar Plugins",
+    "TaskCleanLogs": "Limpar directorio de rexistros",
+    "TaskCleanActivityLog": "Limpar rexistro de actividade",
+    "TasksChannelsCategory": "Canles da Internet",
+    "TaskUpdatePlugins": "Actualizar plugins",
    "User": "Usuario",
    "Undefined": "Sen definir",
    "TvShows": "Programas de TV",
    "System": "Sistema",
    "Sync": "Sincronizar",
    "SubtitleDownloadFailureFromForItem": "Fallou a descarga de subtítulos para {1} dende {0}",
-    "StartupEmbyServerIsLoading": "O Servidor Jellyfin está cargando. Por favor, reinténteo en breve.",
+    "StartupEmbyServerIsLoading": "O servidor Jellyfin está cargando. Por favor, ténteo axiña outra vez.",
    "Songs": "Cancións",
    "Shows": "Programas",
    "ServerNameNeedsToBeRestarted": "{0} precisa ser reiniciado",
@@ -85,57 +85,57 @@
    "UserDeletedWithName": "O usuario {0} foi borrado",
    "UserCreatedWithName": "O usuario {0} foi creado",
    "Plugin": "Plugin",
-    "NotificationOptionVideoPlaybackStopped": "Reproducción de vídeo parada",
+    "NotificationOptionVideoPlaybackStopped": "Reproducción de vídeo detida",
    "NotificationOptionVideoPlayback": "Reproducción de vídeo iniciada",
    "NotificationOptionUserLockedOut": "Usuario bloqueado",
    "NotificationOptionTaskFailed": "Falla na tarefa axendada",
-    "TaskCleanTranscodeDescription": "Borra os arquivos de transcode anteriores a un día.",
-    "TaskCleanTranscode": "Limpar Directorio de Transcode",
+    "TaskCleanTranscodeDescription": "Borra os ficheiros de transcodificación de hai más dun día.",
+    "TaskCleanTranscode": "Limpar o directorio de transcodificación",
    "UserStoppedPlayingItemWithValues": "{0} rematou de reproducir {1} en {2}",
-    "UserStartedPlayingItemWithValues": "{0} está reproducindo {1} en {2}",
-    "TaskDownloadMissingSubtitlesDescription": "Busca en internet por subtítulos que faltan baseado na configuración de metadatos.",
+    "UserStartedPlayingItemWithValues": "{0} está a reproducir {1} en {2}",
+    "TaskDownloadMissingSubtitlesDescription": "Procura na internet os subtítulos que faltan segundo a configuración de metadatos.",
    "TaskDownloadMissingSubtitles": "Descargar subtítulos que faltan",
-    "TaskRefreshChannelsDescription": "Refresca a información do canle de internet.",
-    "TaskRefreshChannels": "Refrescar Canles",
-    "TaskUpdatePluginsDescription": "Descarga e instala actualizacións para plugins que están configurados para actualizarse automáticamente.",
-    "TaskRefreshPeopleDescription": "Actualiza os metadatos dos actores e directores na túa libraría multimedia.",
-    "TaskRefreshPeople": "Refrescar Persoas",
-    "TaskCleanLogsDescription": "Borra arquivos de rexistro que son mais antigos que {0} días.",
-    "TaskRefreshLibraryDescription": "Escanea a tua libraría multimedia buscando novos arquivos e refrescando os metadatos.",
-    "TaskRefreshLibrary": "Escanear Libraría Multimedia",
-    "TaskRefreshChapterImagesDescription": "Crea previsualizacións para videos que teñen capítulos.",
-    "TaskRefreshChapterImages": "Extraer Imaxes dos Capítulos",
+    "TaskRefreshChannelsDescription": "Refresca a información da canle de internet.",
+    "TaskRefreshChannels": "Refrescar canles",
+    "TaskUpdatePluginsDescription": "Descarga e instala actualizacións dos plugins configurados para actualizarse automáticamente.",
+    "TaskRefreshPeopleDescription": "Actualiza os metadatos dos actores e directores na túa biblioteca de medios.",
+    "TaskRefreshPeople": "Refrescar persoas",
+    "TaskCleanLogsDescription": "Borra ficheiros de rexistro con máis de {0} días de antigüidade.",
+    "TaskRefreshLibraryDescription": "Escanea a túa biblioteca de medios á procura de novos ficheiros e refresca os metadatos.",
+    "TaskRefreshLibrary": "Escanear a biblioteca de medios",
+    "TaskRefreshChapterImagesDescription": "Crea miniaturas dos vídeos que teñen capítulos.",
+    "TaskRefreshChapterImages": "Extraer imaxes dos capítulos",
    "TaskCleanCacheDescription": "Borra ficheiros da caché que xa non son necesarios para o sistema.",
-    "TaskCleanCache": "Limpa Directorio de Caché",
-    "TaskCleanActivityLogDescription": "Borra as entradas no rexistro de actividade anteriores á data configurada.",
+    "TaskCleanCache": "Limpar directorio de caché",
+    "TaskCleanActivityLogDescription": "Borra do rexistro de actividade as entradas anteriores á data configurada.",
    "TasksApplicationCategory": "Aplicación",
    "ValueSpecialEpisodeName": "Especial - {0}",
-    "ValueHasBeenAddedToLibrary": "{0} foi engadido a túa libraría multimedia",
-    "TasksLibraryCategory": "Libraría",
+    "ValueHasBeenAddedToLibrary": "{0} engadiuse á túa biblioteca de medios",
+    "TasksLibraryCategory": "Biblioteca",
    "TasksMaintenanceCategory": "Mantemento",
    "VersionNumber": "Versión {0}",
    "UserPolicyUpdatedWithName": "A política de usuario foi actualizada para {0}",
    "UserPasswordChangedWithName": "Cambiouse o contrasinal para o usuario {0}",
    "UserOnlineFromDevice": "{0} está en liña desde {1}",
-    "UserOfflineFromDevice": "{0} desconectouse desde {1}",
-    "TaskOptimizeDatabaseDescription": "Compacta e libera o espazo libre da base de datos. Executar esta tarefa logo de realizar mudanzas que impliquen modificacións da base de datos ou despois de escanear a biblioteca pode traer mellorías de desempeño.",
+    "UserOfflineFromDevice": "{0} desconectouse dende {1}",
+    "TaskOptimizeDatabaseDescription": "Compacta e libera espazo na base de datos. Executar esta tarefa logo de facer cambios que muden a base de datos ou despois de escanear a biblioteca pode mellorar o rendemento.",
    "TaskOptimizeDatabase": "Optimizar base de datos",
-    "TaskKeyframeExtractorDescription": "Extrae fragmentos do vídeo para crear listas de reprodución HLS máis precisas. Podería levarlle bastante tempo.",
+    "TaskKeyframeExtractorDescription": "Extrae fotogramas clave dos vídeos para crear listas de reprodución HLS máis precisas. Podería levar moito tempo.",
    "External": "Externo",
    "HearingImpaired": "Problemas de audición",
-    "TaskKeyframeExtractor": "Extractor de fragmentos",
-    "TaskAudioNormalization": "Normalización do audio",
-    "TaskRefreshTrickplayImagesDescription": "Crea vistas previas de reprodución con truco para vídeos en bibliotecas activadas.",
+    "TaskKeyframeExtractor": "Extractor de fotogramas clave",
+    "TaskAudioNormalization": "Normalización de volume",
+    "TaskRefreshTrickplayImagesDescription": "Crea miniaturas de previsualización para os vídeos nas bibliotecas habilitadas.",
    "TaskDownloadMissingLyrics": "Descargar letras que faltan",
-    "TaskDownloadMissingLyricsDescription": "Descargas de letras das cancións",
+    "TaskDownloadMissingLyricsDescription": "Descarga as letras das cancións",
    "TaskCleanCollectionsAndPlaylists": "Limpar coleccións e listas de reprodución",
-    "TaskCleanCollectionsAndPlaylistsDescription": "Elimina elementos de coleccións e listas de reprodución que xa non existen.",
-    "TaskExtractMediaSegmentsDescription": "Extrae ou obtén segmentos multimedia de complementos habilitados para o Segmento de medios.",
-    "TaskExtractMediaSegments": "Escaneo de segmentos multimedia",
-    "TaskMoveTrickplayImages": "Migrar a localización da imaxe de Trickplay",
-    "TaskMoveTrickplayImagesDescription": "Move os ficheiros de reprodución con trickplay existentes segundo a configuración da biblioteca.",
-    "TaskRefreshTrickplayImages": "Xerar imaxes de Trickplay",
-    "TaskAudioNormalizationDescription": "Analiza ficheiros para obter datos de normalización de audio.",
-    "CleanupUserDataTask": "Tarefa de limpeza de datos do usuario",
-    "CleanupUserDataTaskDescription": "Limpa todos os datos do usuario (Estado de visualización, estado de favorito, etc) da multimedia que leve non presente polo menos durante 90 días."
+    "TaskCleanCollectionsAndPlaylistsDescription": "Quita ítems que xa non existen das coleccións e listas de reprodución.",
+    "TaskExtractMediaSegmentsDescription": "Procura segmentos de medios cos plugins habilitados.",
+    "TaskExtractMediaSegments": "Escaneo de segmentos de medios",
+    "TaskMoveTrickplayImages": "Migrar as miniaturas de previsualización a outra ubicación",
+    "TaskMoveTrickplayImagesDescription": "Move as miniaturas de previsualización segundo a configuración da biblioteca.",
+    "TaskRefreshTrickplayImages": "Xerar miniaturas de previsualización",
+    "TaskAudioNormalizationDescription": "Escanea ficheiros á procura de datos de normalización de volume.",
+    "CleanupUserDataTask": "Tarefa de limpeza de datos dos usuarios",
+    "CleanupUserDataTaskDescription": "Limpa todos os datos do usuario (estado de visualización, de favorito etc.) dos medios ausentes polo menos 90 días."
 }
@@ -125,8 +125,8 @@
    "TaskKeyframeExtractor": "Izvoditelj ključnog okvira",
    "TaskOptimizeDatabaseDescription": "Sažima bazu podataka i uklanja prazan prostor. Pokretanje ovog zadatka, može poboljšati performanse nakon provođenja indeksiranja biblioteke ili provođenja drugih promjena koje utječu na bazu podataka.",
    "HearingImpaired": "Oštećen sluh",
-    "TaskRefreshTrickplayImages": "Generiraj Trickplay Slike",
-    "TaskRefreshTrickplayImagesDescription": "Kreira trickplay pretpreglede za videe u omogućenim knjižnicama.",
+    "TaskRefreshTrickplayImages": "Generiraj slike brzog pregledavanja",
+    "TaskRefreshTrickplayImagesDescription": "Stvara preglede brzog pregledavanja za videa u aktiviranim bibliotekama.",
    "TaskAudioNormalization": "Normalizacija zvuka",
    "TaskAudioNormalizationDescription": "Skenira datoteke u potrazi za podacima o normalizaciji zvuka.",
    "TaskCleanCollectionsAndPlaylistsDescription": "Uklanja stavke iz zbirki i popisa za reprodukciju koje više ne postoje.",
@@ -135,8 +135,8 @@
    "TaskDownloadMissingLyrics": "Preuzmi tekstove koji nedostaju",
    "TaskDownloadMissingLyricsDescription": "Preuzmi tekstove pjesama",
    "TaskExtractMediaSegmentsDescription": "Izvlači ili pribavlja dijelove medija iz omogućenih media pluginova.",
-    "TaskMoveTrickplayImages": "Preseli lokaciju Trickplay slika",
-    "TaskMoveTrickplayImagesDescription": "Preseli lokaciju Trickplay slika prema postavkama zbirke.",
+    "TaskMoveTrickplayImages": "Premjesti mjesto slika brzog pregledavanja",
+    "TaskMoveTrickplayImagesDescription": "Premješta postojeće datoteke brzog pregledavanja prema postavkama biblioteke.",
    "CleanupUserDataTask": "Zadatak čišćenja korisničkih podataka",
    "CleanupUserDataTaskDescription": "Briše sve korisničke podatke (stanje gledanja, status favorita itd.) s medija koji više nisu prisutni najmanje 90 dana."
 }
@@ -1,3 +1,62 @@
 {
-    "Books": "liv"
+    "Books": "Liv",
+    "TasksLibraryCategory": "Libreri",
+    "Albums": "Albòm yo",
+    "Artists": "Atis yo",
+    "Application": "Aplikasyon",
+    "Channels": "Kanal yo",
+    "ChapterNameValue": "Chapit {0}",
+    "Default": "Defo",
+    "DeviceOnlineWithName": "{0} konekte",
+    "DeviceOfflineWithName": "{0} dekonekte",
+    "External": "Extèn",
+    "Collections": "Koleksyon yo",
+    "Favorites": "Pi Renmen",
+    "Folders": "Dosye",
+    "Genres": "Jan yo",
+    "Forced": "Fòse",
+    "HeaderAlbumArtists": "Albòm Atis",
+    "HeaderContinueWatching": "Kontinye Kade",
+    "HeaderFavoriteAlbums": "Albòm Pi Renmen",
+    "HeaderFavoriteArtists": "Atis Pi Renmen",
+    "HeaderFavoriteEpisodes": "Epizòd Pi Renmen",
+    "HeaderFavoriteShows": "Emisyon Pi Renmen",
+    "HeaderFavoriteSongs": "Mizik Pi Renmen",
+    "HeaderLiveTV": "Televizyon an Direk",
+    "HeaderNextUp": "Pwochen an",
+    "HomeVideos": "Videyo Lakay",
+    "Latest": "Pi Resan",
+    "MessageApplicationUpdated": "Sèvè Jellyfin met a jou",
+    "MessageApplicationUpdatedTo": "Sèvè Jellyfin met a jou sou {0}",
+    "Movies": "Fim",
+    "MixedContent": "Kontni Melanje",
+    "Music": "Mizik",
+    "MusicVideos": "Videyo Mizik",
+    "NameInstallFailed": "{0} enstalasyon fe fayit",
+    "NameSeasonNumber": "Sezon {0}",
+    "NameSeasonUnknown": "Sezon Enkoni",
+    "NotificationOptionCameraImageUploaded": "Imaj Kamera telechaje",
+    "NotificationOptionInstallationFailed": "Enstalasyon echwe",
+    "Photos": "Foto",
+    "PluginInstalledWithName": "{0} te enstale",
+    "PluginUninstalledWithName": "{0} te dezenstale",
+    "PluginUpdatedWithName": "{0} te mi a jou",
+    "ScheduledTaskFailedWithName": "{0} echwe",
+    "ScheduledTaskStartedWithName": "{0} komanse",
+    "Songs": "Mizik yo",
+    "Shows": "Emisyon yo",
+    "System": "Sistèm",
+    "TvShows": "Emisyon Tele",
+    "User": "Itilizatè",
+    "UserCreatedWithName": "Itilizatè {0} kreye",
+    "UserDeletedWithName": "Itilizatè {0} a efase",
+    "UserDownloadingItemWithValues": "{0} ap telechaje {1}",
+    "UserOfflineFromDevice": "{0} dekonekte de {1}",
+    "UserStartedPlayingItemWithValues": "{0} ap jwe {1} sou {2}",
+    "UserStoppedPlayingItemWithValues": "{0} fin jwe {1} sou {2}",
+    "UserPasswordChangedWithName": "Modpas la chanje pou Itilizatè {0}",
+    "ValueSpecialEpisodeName": "Spesyal - {0}",
+    "VersionNumber": "Vesyon {0}",
+    "TasksApplicationCategory": "Aplikasyon",
+    "TasksMaintenanceCategory": "Antretyen"
 }
@@ -1,16 +1,16 @@
 {
-    "Books": "Номууд",
+    "Books": "Номнууд",
    "HeaderNextUp": "Дараа нь",
    "HeaderContinueWatching": "Үргэлжлүүлэн үзэх",
    "Songs": "Дуунууд",
-    "Playlists": "Тоглуулах жагсаалт",
-    "Movies": "Кино",
+    "Playlists": "Playlist-ууд",
+    "Movies": "Кинонууд",
    "Latest": "Сүүлийн үеийн",
    "Genres": "Төрлүүд",
    "Favorites": "Дуртай",
-    "Collections": "Багц",
+    "Collections": "Цуглуулгууд",
    "Artists": "Уран бүтээлчид",
-    "Albums": "Цомгууд",
+    "Albums": "Дуут цомгууд",
    "TaskExtractMediaSegments": "Медиа сегмент шалга",
    "TaskExtractMediaSegmentsDescription": "MediaSegment идэвхжүүлсэн залгаасуудаас медиа сегментүүдийг задлах эсвэл олж авах.",
    "TaskMoveTrickplayImages": "Трикплэй зургуудын байршлыг шилжүүлэх",
@@ -63,11 +63,11 @@
    "CameraImageUploadedFrom": "{0}-с шинэ зураг байршуулагдлаа",
    "Channels": "Сувгууд",
    "ChapterNameValue": "{0}-р бүлэг",
-    "Default": "Өгөгдмөл",
+    "Default": "Анхдагч",
    "DeviceOfflineWithName": "{0}-н холболт саллаа",
    "DeviceOnlineWithName": "{0} холбогдлоо",
    "FailedLoginAttemptWithUserName": "{0}-н нэвтрэх оролдлого амжилтгүй",
-    "Folders": "Хавтаснууд",
+    "Folders": "Хавтасууд",
    "Forced": "Хүчээр",
    "HeaderAlbumArtists": "Цомгийн уран бүтээлчид",
    "HeaderFavoriteAlbums": "Дуртай цомгууд",
@@ -84,8 +84,8 @@
    "MessageApplicationUpdatedTo": "Jellyfin Server {0} болж шинэчлэгдлээ",
    "MessageServerConfigurationUpdated": "Server-н тохиргоо шинэчлэгдлээ",
    "MixedContent": "Холимог агуулга",
-    "Music": "Дуу",
-    "MusicVideos": "Дууны клип",
+    "Music": "Хөгжим",
+    "MusicVideos": "Дууны клипүүд",
    "NameInstallFailed": "{0} суулгахад алдаа гарлаа",
    "NameSeasonNumber": "{0}-р улирал",
    "NameSeasonUnknown": "Улирал олдсонгүй",
@@ -101,14 +101,14 @@
    "NotificationOptionUserLockedOut": "Хэрэглэгчийг түгжив",
    "NotificationOptionVideoPlayback": "Бичлэгийг тоглуулж эхлэв",
    "Photos": "Зургууд",
-    "Plugin": "Plugin",
+    "Plugin": "Плагин",
    "PluginInstalledWithName": "{0}-г суулгалаа",
    "PluginUninstalledWithName": "{0}-г устгалаа",
    "PluginUpdatedWithName": "{0}-г шинэчиллээ",
    "ProviderValue": "Нийлүүлэгч: {0}",
    "ScheduledTaskStartedWithName": "{0}-г эхлүүлэв",
    "ServerNameNeedsToBeRestarted": "{0}-г дахин асаана уу",
-    "Shows": "Нэвтрүүлгүүд",
+    "Shows": "Шоу",
    "Sync": "Дахин",
    "System": "Систем",
    "TvShows": "ТВ нэвтрүүлгүүд",
@@ -122,7 +122,7 @@
    "UserPolicyUpdatedWithName": "Хэрэглэгчийн журмыг {0}-д зориулан шинэчиллээ",
    "UserStartedPlayingItemWithValues": "{0}-г {2} дээр {1}-г тоглуулж байна",
    "UserStoppedPlayingItemWithValues": "{0}-г {2} дээр {1}-г тоглуулж дуусгалаа",
-    "ValueSpecialEpisodeName": "Тусгай - {0}",
+    "ValueSpecialEpisodeName": "Онцгой - {0}",
    "VersionNumber": "Хувилбар {0}",
    "TasksMaintenanceCategory": "Засвар",
    "TasksLibraryCategory": "Сан",
@@ -43,5 +43,75 @@
    "NameInstallFailed": "Ye couldn't bring {0} aboard yer ship",
    "MessageApplicationUpdatedTo": "Yer Map of the Seas has been scribbled with {0}",
    "MessageNamedServerConfigurationUpdatedWithValue": "Yer Map Drawer has been rescribbled to {0}",
-    "MessageServerConfigurationUpdated": "Yer Map drawer has been rescribbled"
+    "MessageServerConfigurationUpdated": "Yer Map drawer has been rescribbled",
+    "Inherit": "Carry on what be passed along",
+    "Latest": "Newfangled",
+    "Movies": "Moving pictures",
+    "NewVersionIsAvailable": "A fresh build o’ Jellyfin Server be waitin’ fer ye to fetch.",
+    "NotificationOptionPluginInstalled": "Plugin nailed down",
+    "NotificationOptionVideoPlayback": "Video playback be underway",
+    "ScheduledTaskFailedWithName": "{0} ran aground",
+    "StartupEmbyServerIsLoading": "Jellyfin Server be preparin’ the ship. Try yer luck again soon.",
+    "UserOfflineFromDevice": "{0} severed ties with {1}",
+    "UserDownloadingItemWithValues": "{0} be haulin’ in {1}",
+    "UserStartedPlayingItemWithValues": "{0} be playin’ {1} aboard {2}",
+    "ValueHasBeenAddedToLibrary": "{0} be stashed in yer treasure trove",
+    "TaskCleanCacheDescription": "Wipes away cache cargo no longer called fer.",
+    "TaskCleanLogsDescription": "Clears the logbook o’ entries older than {0} days.",
+    "TaskRefreshPeopleDescription": "Refreshes the charts fer actors an’ directors in yer Treasure Trove.",
+    "UserLockedOutWithName": "Matey {0} be denied boarding",
+    "TaskAudioNormalization": "Steadyin’ the shanties",
+    "TaskAudioNormalizationDescription": "Scans files fer shanty steadiyin’ data.",
+    "HeaderRecordingGroups": "Loggin' Groups",
+    "MusicVideos": "Shanty films",
+    "Playlists": "Lists o’ plunder",
+    "Plugin": "Extra sail",
+    "NotificationOptionVideoPlaybackStopped": "Video playback dropped anchor",
+    "NameSeasonNumber": "Saga {0}",
+    "NameSeasonUnknown": "Saga be Lost",
+    "NotificationOptionApplicationUpdateAvailable": "A fresh build awaits",
+    "NotificationOptionApplicationUpdateInstalled": "App upgrade be aboard",
+    "NotificationOptionAudioPlayback": "Audio playback be rollin",
+    "NotificationOptionAudioPlaybackStopped": "Audio playback dropped anchor",
+    "NotificationOptionCameraImageUploaded": "Spyglass shot be hoisted",
+    "NotificationOptionInstallationFailed": "Install be wrecked",
+    "NotificationOptionNewLibraryContent": "Fresh plunder ready to claim",
+    "NotificationOptionPluginError": "Plugin ran aground",
+    "NotificationOptionPluginUninstalled": "Plugin cast overboard",
+    "NotificationOptionPluginUpdateInstalled": "Plugin patched ‘n ready",
+    "NotificationOptionServerRestartRequired": "Server be due fer a restart",
+    "NotificationOptionTaskFailed": "Set chore went overboard",
+    "TaskRefreshLibraryDescription": "Searches the Treasure Trove fer new plunder ‘n updates the charts.",
+    "PluginInstalledWithName": "{0} nailed down",
+    "TaskCleanLogs": "Swab the Log Hold",
+    "TaskRefreshPeople": "Freshen the Mateys",
+    "PluginUninstalledWithName": "{0} sent t’ Davy Jones",
+    "PluginUpdatedWithName": "{0} patched ‘n ready",
+    "ProviderValue": "Supplier o’ goods: {0}",
+    "ScheduledTaskStartedWithName": "{0} set sail",
+    "ServerNameNeedsToBeRestarted": "{0} be cravin’ a restart",
+    "Shows": "Sagas",
+    "SubtitleDownloadFailureFromForItem": "Subtitles be sunk fetchin’ from {0} fer {1}",
+    "Sync": "Match the tides",
+    "System": "The ship’s works",
+    "TvShows": "TV Sagas",
+    "Undefined": "Uncharted",
+    "User": "Matey",
+    "UserCreatedWithName": "Matey {0} joined the crew",
+    "UserDeletedWithName": "Matey {0} cast overboard",
+    "UserOnlineFromDevice": "{0} be aboard ship from {1}",
+    "UserPasswordChangedWithName": "New passphrase set fer Matey {0}",
+    "UserPolicyUpdatedWithName": "Ship rules be changed fer {0}",
+    "UserStoppedPlayingItemWithValues": "{0} be done playin’ {1} on {2",
+    "ValueSpecialEpisodeName": "Special Tale – {0}",
+    "VersionNumber": "Edition {0}",
+    "TasksMaintenanceCategory": "Hull patchin’",
+    "TasksLibraryCategory": "Treasure Trove",
+    "TasksApplicationCategory": "Ship",
+    "TaskCleanActivityLog": "Clear the Ship’s Log",
+    "TaskCleanActivityLogDescription": "Purges ship’s logs older than the chosen time.",
+    "TaskCleanCache": "Sweep the Cache Chest",
+    "TaskRefreshChapterImages": "Claim chapter portraits",
+    "TaskRefreshChapterImagesDescription": "Paints wee portraits fer videos that own chapters.",
+    "TaskRefreshLibrary": "Scan the Treasure Trove"
 }
@@ -1,3 +1,16 @@
 {
-    "Books": "کتابیں"
+    "Books": "کتابیں",
+    "AppDeviceValues": "ایپ: {0}، ڈیوائس: {1}",
+    "Albums": "البمز",
+    "Application": "ایپلی کیشن",
+    "Artists": "فنکار",
+    "AuthenticationSucceededWithUserName": "{0} کی کامیابی سے تصدیق ہو چکی ہے",
+    "CameraImageUploadedFrom": "ایک نئی کیمرے کی تصویر {0} سے اپ لوڈ کی گئی ہے",
+    "Channels": "چینلز",
+    "ChapterNameValue": "باب {0}",
+    "Collections": "مجموعے",
+    "Default": "ڈیفالٹ",
+    "DeviceOfflineWithName": "{0} نے رابطہ منقطع کر دیا ہے",
+    "DeviceOnlineWithName": "{0} منسلک ہے",
+    "External": "بیرونی"
 }
@@ -123,5 +123,9 @@
    "TaskCleanActivityLogDescription": "تشکیل شدہ عمر سے زیادہ پرانی سرگرمی لاگ اندراجات کو حذف کرتا ہے۔",
    "External": "بیرونی",
    "HearingImpaired": "قوت سماعت سے محروم",
-    "TaskCleanActivityLog": "سرگرمی لاگ کو صاف کریں"
+    "TaskCleanActivityLog": "سرگرمی لاگ کو صاف کریں",
+    "TaskDownloadMissingLyrics": "غائب بول ڈاؤن لوڈ کریں",
+    "TaskDownloadMissingLyricsDescription": "گانے کے غائب بول ڈاؤن لوڈ کریں",
+    "TaskAudioNormalization": "آڈیو نارملائزیشن",
+    "TaskAudioNormalizationDescription": "آڈیو نارملائزیشن ڈیٹا کے لیے فائلوں کو سکین کرتا ہے۔"
 }
@@ -261,14 +261,22 @@ public partial class AudioNormalizationTask : IScheduledTask

            using var reader = process.StandardError;
            float? lufs = null;
+            var foundLufs = false;
            await foreach (var line in reader.ReadAllLinesAsync(cancellationToken).ConfigureAwait(false))
            {
-                Match match = LUFSRegex().Match(line);
-                if (match.Success)
+                if (foundLufs)
                {
-                    lufs = float.Parse(match.Groups[1].ValueSpan, CultureInfo.InvariantCulture.NumberFormat);
-                    break;
+                    continue;
                }
+
+                Match match = LUFSRegex().Match(line);
+                if (!match.Success)
+                {
+                    continue;
+                }
+
+                lufs = float.Parse(match.Groups[1].ValueSpan, CultureInfo.InvariantCulture.NumberFormat);
+                foundLufs = true;
            }

            if (lufs is null)
@@ -779,12 +779,14 @@ public class LibraryController : BaseJellyfinApiController
        var query = new InternalItemsQuery(user)
        {
            Genres = item.Genres,
+            Tags = item.Tags,
            Limit = limit,
            IncludeItemTypes = includeItemTypes.ToArray(),
            DtoOptions = dtoOptions,
            EnableTotalRecordCount = !isMovie ?? true,
            EnableGroupByMetadataKey = isMovie ?? false,
-            ExcludeItemIds = [itemId]
+            ExcludeItemIds = [itemId],
+            OrderBy = [(ItemSortBy.Random, SortOrder.Ascending)]
        };

        // ExcludeArtistIds
@@ -75,6 +75,7 @@ public sealed class BaseItemRepository
    private static readonly IReadOnlyList<ItemValueType> _getAlbumArtistValueTypes = [ItemValueType.AlbumArtist];
    private static readonly IReadOnlyList<ItemValueType> _getStudiosValueTypes = [ItemValueType.Studios];
    private static readonly IReadOnlyList<ItemValueType> _getGenreValueTypes = [ItemValueType.Genre];
+    private static readonly IReadOnlyList<char> SearchWildcardTerms = ['%', '_', '[', ']', '^'];

    /// <summary>
    /// Initializes a new instance of the <see cref="BaseItemRepository"/> class.
@@ -266,12 +267,13 @@ public sealed class BaseItemRepository
        IQueryable<BaseItemEntity> dbQuery = PrepareItemQuery(context, filter);

        dbQuery = TranslateQuery(dbQuery, context, filter);
+        dbQuery = ApplyGroupingFilter(context, dbQuery, filter);
+
        if (filter.EnableTotalRecordCount)
        {
            result.TotalRecordCount = dbQuery.Count();
        }

-        dbQuery = ApplyGroupingFilter(context, dbQuery, filter);
        dbQuery = ApplyQueryPaging(dbQuery, filter);

        result.Items = dbQuery.AsEnumerable().Where(e => e is not null).Select(w => DeserializeBaseItem(w, filter.SkipDeserialization)).ToArray();
@@ -1230,8 +1232,20 @@ public sealed class BaseItemRepository
            ExcludeItemIds = filter.ExcludeItemIds
        };

-        var query = TranslateQuery(innerQuery, context, outerQueryFilter)
-            .GroupBy(e => e.PresentationUniqueKey);
+        var masterQuery = TranslateQuery(innerQuery, context, outerQueryFilter)
+            .GroupBy(e => e.PresentationUniqueKey)
+            .Select(e => e.FirstOrDefault())
+            .Select(e => e!.Id);
+
+        var query = context.BaseItems
+            .Include(e => e.TrailerTypes)
+            .Include(e => e.Provider)
+            .Include(e => e.LockedFields)
+            .Include(e => e.Images)
+            .AsSingleQuery()
+            .Where(e => masterQuery.Contains(e.Id));
+
+        query = ApplyOrder(query, filter);

        var result = new QueryResult<(BaseItemDto, ItemCounts?)>();
        if (filter.EnableTotalRecordCount)
@@ -1286,12 +1300,7 @@ public sealed class BaseItemRepository

            var resultQuery = query.Select(e => new
            {
-                item = e.AsQueryable()
-                        .Include(e => e.TrailerTypes)
-                        .Include(e => e.Provider)
-                        .Include(e => e.LockedFields)
-                        .Include(e => e.Images)
-                        .AsSingleQuery().First(),
+                item = e,
                // TODO: This is bad refactor!
                itemCount = new ItemCounts()
                {
@@ -1323,13 +1332,6 @@ public sealed class BaseItemRepository
            result.Items =
            [
                .. query
-                    .Select(e => e.AsQueryable()
-                        .Include(e => e.TrailerTypes)
-                        .Include(e => e.Provider)
-                        .Include(e => e.LockedFields)
-                        .Include(e => e.Images)
-                        .AsSingleQuery()
-                        .First())
                    .AsEnumerable()
                    .Where(e => e is not null)
                    .Select<BaseItemEntity, (BaseItemDto, ItemCounts?)>(e =>
@@ -1693,7 +1695,15 @@ public sealed class BaseItemRepository
        if (!string.IsNullOrEmpty(filter.SearchTerm))
        {
            var searchTerm = filter.SearchTerm.ToLower();
-            baseQuery = baseQuery.Where(e => e.CleanName!.ToLower().Contains(searchTerm) || (e.OriginalTitle != null && e.OriginalTitle.ToLower().Contains(searchTerm)));
+            if (SearchWildcardTerms.Any(f => searchTerm.Contains(f)))
+            {
+                searchTerm = $"%{searchTerm.Trim('%')}%";
+                baseQuery = baseQuery.Where(e => EF.Functions.Like(e.CleanName!.ToLower(), searchTerm) || (e.OriginalTitle != null && EF.Functions.Like(e.OriginalTitle.ToLower(), searchTerm)));
+            }
+            else
+            {
+                baseQuery = baseQuery.Where(e => e.CleanName!.ToLower().Contains(searchTerm) || (e.OriginalTitle != null && e.OriginalTitle.ToLower().Contains(searchTerm)));
+            }
        }

        if (filter.IsFolder.HasValue)
@@ -1865,10 +1875,17 @@ public sealed class BaseItemRepository

        if (filter.PersonIds.Length > 0)
        {
+            var peopleEntityIds = context.BaseItems
+                .WhereOneOrMany(filter.PersonIds, b => b.Id)
+                .Join(
+                    context.Peoples,
+                    b => b.Name,
+                    p => p.Name,
+                    (b, p) => p.Id);
+
            baseQuery = baseQuery
-                .Where(e =>
-                    context.PeopleBaseItemMap.Where(w => context.BaseItems.Where(r => filter.PersonIds.Contains(r.Id)).Any(f => f.Name == w.People.Name))
-                        .Any(f => f.ItemId == e.Id));
+                .Where(e => context.PeopleBaseItemMap
+                    .Any(m => m.ItemId == e.Id && peopleEntityIds.Contains(m.PeopleId)));
        }

        if (!string.IsNullOrWhiteSpace(filter.Person))
@@ -1904,9 +1921,17 @@ public sealed class BaseItemRepository
        var nameContains = filter.NameContains;
        if (!string.IsNullOrWhiteSpace(nameContains))
        {
-            baseQuery = baseQuery.Where(e =>
-                e.CleanName!.Contains(nameContains)
-                || e.OriginalTitle!.ToLower().Contains(nameContains!));
+            if (SearchWildcardTerms.Any(f => nameContains.Contains(f)))
+            {
+                nameContains = $"%{nameContains.Trim('%')}%";
+                baseQuery = baseQuery.Where(e => EF.Functions.Like(e.CleanName, nameContains) || EF.Functions.Like(e.OriginalTitle, nameContains));
+            }
+            else
+            {
+                baseQuery = baseQuery.Where(e =>
+                                    e.CleanName!.Contains(nameContains)
+                                    || e.OriginalTitle!.ToLower().Contains(nameContains!));
+            }
        }

        if (!string.IsNullOrWhiteSpace(filter.NameStartsWith))
@@ -1989,7 +2014,7 @@ public sealed class BaseItemRepository

        if (filter.ArtistIds.Length > 0)
        {
-            baseQuery = baseQuery.WhereReferencedItem(context, ItemValueType.Artist, filter.ArtistIds);
+            baseQuery = baseQuery.WhereReferencedItemMultipleTypes(context, [ItemValueType.Artist, ItemValueType.AlbumArtist], filter.ArtistIds);
        }

        if (filter.AlbumArtistIds.Length > 0)
@@ -1999,7 +2024,18 @@ public sealed class BaseItemRepository

        if (filter.ContributingArtistIds.Length > 0)
        {
-            baseQuery = baseQuery.WhereReferencedItem(context, ItemValueType.Artist, filter.ContributingArtistIds);
+            var contributingNames = context.BaseItems
+                .Where(b => filter.ContributingArtistIds.Contains(b.Id))
+                .Select(b => b.CleanName);
+
+            baseQuery = baseQuery.Where(e =>
+                e.ItemValues!.Any(ivm =>
+                    ivm.ItemValue.Type == ItemValueType.Artist &&
+                    contributingNames.Contains(ivm.ItemValue.CleanValue))
+                &&
+                !e.ItemValues!.Any(ivm =>
+                    ivm.ItemValue.Type == ItemValueType.AlbumArtist &&
+                    contributingNames.Contains(ivm.ItemValue.CleanValue)));
        }

        if (filter.AlbumIds.Length > 0)
@@ -2054,22 +2090,26 @@ public sealed class BaseItemRepository
        if (filter.MinParentalRating != null)
        {
            var min = filter.MinParentalRating;
-            minParentalRatingFilter = e => e.InheritedParentalRatingValue >= min.Score || e.InheritedParentalRatingValue == null;
-            if (min.SubScore != null)
-            {
-                minParentalRatingFilter = minParentalRatingFilter.And(e => e.InheritedParentalRatingValue >= min.SubScore || e.InheritedParentalRatingValue == null);
-            }
+            var minScore = min.Score;
+            var minSubScore = min.SubScore ?? 0;
+
+            minParentalRatingFilter = e =>
+                e.InheritedParentalRatingValue == null ||
+                e.InheritedParentalRatingValue > minScore ||
+                (e.InheritedParentalRatingValue == minScore && (e.InheritedParentalRatingSubValue ?? 0) >= minSubScore);
        }

        Expression<Func<BaseItemEntity, bool>>? maxParentalRatingFilter = null;
        if (filter.MaxParentalRating != null)
        {
            var max = filter.MaxParentalRating;
-            maxParentalRatingFilter = e => e.InheritedParentalRatingValue <= max.Score || e.InheritedParentalRatingValue == null;
-            if (max.SubScore != null)
-            {
-                maxParentalRatingFilter = maxParentalRatingFilter.And(e => e.InheritedParentalRatingValue <= max.SubScore || e.InheritedParentalRatingValue == null);
-            }
+            var maxScore = max.Score;
+            var maxSubScore = max.SubScore ?? 0;
+
+            maxParentalRatingFilter = e =>
+                e.InheritedParentalRatingValue == null ||
+                e.InheritedParentalRatingValue < maxScore ||
+                (e.InheritedParentalRatingValue == maxScore && (e.InheritedParentalRatingSubValue ?? 0) <= maxSubScore);
        }

        if (filter.HasParentalRating ?? false)
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using Jellyfin.Database.Implementations;
 using Jellyfin.Database.Implementations.Entities;
 using MediaBrowser.Controller.Drawing;
@@ -82,11 +84,14 @@ public class ChapterRepository : IChapterRepository
    }

    /// <inheritdoc />
-    public void DeleteChapters(Guid itemId)
+    public async Task DeleteChaptersAsync(Guid itemId, CancellationToken cancellationToken)
    {
-        using var context = _dbProvider.CreateDbContext();
-        context.Chapters.Where(c => c.ItemId.Equals(itemId)).ExecuteDelete();
-        context.SaveChanges();
+        var dbContext = await _dbProvider.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
+        await using (dbContext.ConfigureAwait(false))
+        {
+            await dbContext.Chapters.Where(c => c.ItemId.Equals(itemId)).ExecuteDeleteAsync(cancellationToken).ConfigureAwait(false);
+            await dbContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
+        }
    }

    private Chapter Map(ChapterInfo chapterInfo, int index, Guid itemId)
@@ -74,6 +74,11 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I
    /// <inheritdoc />
    public void UpdatePeople(Guid itemId, IReadOnlyList<PersonInfo> people)
    {
+        foreach (var item in people.Where(e => e.Role is null))
+        {
+            item.Role = string.Empty;
+        }
+
        // multiple metadata providers can provide the _same_ person
        people = people.DistinctBy(e => e.Name + "-" + e.Type).ToArray();
        var personKeys = people.Select(e => e.Name + "-" + e.Type).ToArray();
@@ -90,6 +95,7 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I
            .ToArray();

        var toAdd = people
+            .Where(e => e.Type is not PersonKind.Artist && e.Type is not PersonKind.AlbumArtist)
            .Where(e => !existingPersons.Any(f => f.Name == e.Name && f.PersonType == e.Type.ToString()))
            .Select(Map);
        context.Peoples.AddRange(toAdd);
@@ -99,33 +105,40 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I

        var existingMaps = context.PeopleBaseItemMap.Include(e => e.People).Where(e => e.ItemId == itemId).ToList();

-        var maxSortOrder = Math.Max(
-            context.PeopleBaseItemMap.Include(e => e.People).Where(e => e.ItemId == itemId && e.People.PersonType == PersonKind.Actor.ToString()).Max(e => (int?)e.SortOrder) ?? 0,
-            people.Where(p => p.Type == PersonKind.Actor && p.SortOrder.HasValue).Max(p => (int?)p.SortOrder) ?? 0);
+        var listOrder = 0;

        foreach (var person in people)
        {
+            if (person.Type == PersonKind.Artist || person.Type == PersonKind.AlbumArtist)
+            {
+                continue;
+            }
+
            var entityPerson = personsEntities.First(e => e.Name == person.Name && e.PersonType == person.Type.ToString());
-            var existingMap = existingMaps.FirstOrDefault(e => e.People.Name == person.Name && e.Role == person.Role);
+            var existingMap = existingMaps.FirstOrDefault(e => e.People.Name == person.Name && e.People.PersonType == person.Type.ToString() && e.Role == person.Role);
            if (existingMap is null)
            {
-                var sortOrder = person.Type == PersonKind.Actor ? (person.SortOrder ?? ++maxSortOrder) : person.SortOrder;
                context.PeopleBaseItemMap.Add(new PeopleBaseItemMap()
                {
                    Item = null!,
                    ItemId = itemId,
                    People = null!,
                    PeopleId = entityPerson.Id,
-                    ListOrder = sortOrder,
-                    SortOrder = sortOrder,
+                    ListOrder = listOrder,
+                    SortOrder = person.SortOrder,
                    Role = person.Role
                });
            }
            else
            {
+                // Update the order for existing mappings
+                existingMap.ListOrder = listOrder;
+                existingMap.SortOrder = person.SortOrder;
                // person mapping already exists so remove from list
                existingMaps.Remove(existingMap);
            }
+
+            listOrder++;
        }

        context.PeopleBaseItemMap.RemoveRange(existingMaps);
@@ -108,7 +108,7 @@ namespace Jellyfin.Server.Implementations.Users
                UserName = user.Username
            };

-            FileStream fileStream = AsyncFile.OpenWrite(filePath);
+            FileStream fileStream = AsyncFile.Create(filePath);
            await using (fileStream.ConfigureAwait(false))
            {
                await JsonSerializer.SerializeAsync(fileStream, spr).ConfigureAwait(false);
@@ -8,7 +8,7 @@ internal class RetryOnTemporarilyUnavailableFilter : IOperationFilter
 {
    public void Apply(OpenApiOperation operation, OperationFilterContext context)
    {
-        operation.Responses.Add(
+        operation.Responses.TryAdd(
            "503",
            new OpenApiResponse
            {
@@ -66,15 +66,8 @@ public class SecurityRequirementsOperationFilter : IOperationFilter
            return;
        }

-        if (!operation.Responses.ContainsKey("401"))
-        {
-            operation.Responses.Add("401", new OpenApiResponse { Description = "Unauthorized" });
-        }
-
-        if (!operation.Responses.ContainsKey("403"))
-        {
-            operation.Responses.Add("403", new OpenApiResponse { Description = "Forbidden" });
-        }
+        operation.Responses.TryAdd("401", new OpenApiResponse { Description = "Unauthorized" });
+        operation.Responses.TryAdd("403", new OpenApiResponse { Description = "Forbidden" });

        var scheme = new OpenApiSecurityScheme
        {
@@ -0,0 +1,47 @@
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Jellyfin.Data.Enums;
+using Jellyfin.Database.Implementations;
+using Jellyfin.Server.ServerSetupApp;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+
+namespace Jellyfin.Server.Migrations.Routines;
+
+/// <summary>
+/// Cleans up all Music artists that have been migrated in the 10.11 RC migrations.
+/// </summary>
+[JellyfinMigration("2025-10-09T20:00:00", nameof(CleanMusicArtist))]
+[JellyfinMigrationBackup(JellyfinDb = true)]
+public class CleanMusicArtist : IAsyncMigrationRoutine
+{
+    private readonly IStartupLogger<CleanMusicArtist> _startupLogger;
+    private readonly IDbContextFactory<JellyfinDbContext> _dbContextFactory;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CleanMusicArtist"/> class.
+    /// </summary>
+    /// <param name="startupLogger">The startup logger.</param>
+    /// <param name="dbContextFactory">The Db context factory.</param>
+    public CleanMusicArtist(IStartupLogger<CleanMusicArtist> startupLogger, IDbContextFactory<JellyfinDbContext> dbContextFactory)
+    {
+        _startupLogger = startupLogger;
+        _dbContextFactory = dbContextFactory;
+    }
+
+    /// <inheritdoc/>
+    public async Task PerformAsync(CancellationToken cancellationToken)
+    {
+        var context = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
+        await using (context.ConfigureAwait(false))
+        {
+            var peoples = context.Peoples.Where(e => e.PersonType == nameof(PersonKind.Artist) || e.PersonType == nameof(PersonKind.AlbumArtist));
+            _startupLogger.LogInformation("Delete {Number} Artist and Album Artist person types from db", await peoples.CountAsync(cancellationToken).ConfigureAwait(false));
+
+            await peoples
+                .ExecuteDeleteAsync(cancellationToken)
+                .ConfigureAwait(false);
+        }
+    }
+}
@@ -186,6 +186,11 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
                foreach (SqliteDataReader dto in connection.Query(itemValueQuery))
                {
                    var itemId = dto.GetGuid(0);
+                    if (!baseItemIds.Contains(itemId))
+                    {
+                        continue;
+                    }
+
                    var entity = GetItemValue(dto);
                    var key = ((int)entity.Type, entity.Value);
                    if (!localItems.TryGetValue(key, out var existing))
@@ -252,6 +257,11 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
                        continue;
                    }

+                    if (!baseItemIds.Contains(refItem.Id))
+                    {
+                        continue;
+                    }
+
                    userData.ItemId = refItem.Id;
                    operation.JellyfinDbContext.UserData.Add(userData);
                }
@@ -282,7 +292,13 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
            {
                foreach (SqliteDataReader dto in connection.Query(mediaStreamQuery))
                {
-                    operation.JellyfinDbContext.MediaStreamInfos.Add(GetMediaStream(dto));
+                    var entity = GetMediaStream(dto);
+                    if (!baseItemIds.Contains(entity.ItemId))
+                    {
+                        continue;
+                    }
+
+                    operation.JellyfinDbContext.MediaStreamInfos.Add(entity);
                }
            }

@@ -305,7 +321,13 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
            {
                foreach (SqliteDataReader dto in connection.Query(mediaAttachmentQuery))
                {
-                    operation.JellyfinDbContext.AttachmentStreamInfos.Add(GetMediaAttachment(dto));
+                    var entity = GetMediaAttachment(dto);
+                    if (!baseItemIds.Contains(entity.ItemId))
+                    {
+                        continue;
+                    }
+
+                    operation.JellyfinDbContext.AttachmentStreamInfos.Add(entity);
                }
            }

@@ -391,6 +413,11 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
                foreach (SqliteDataReader dto in connection.Query(chapterQuery))
                {
                    var chapter = GetChapter(dto);
+                    if (!baseItemIds.Contains(chapter.ItemId))
+                    {
+                        continue;
+                    }
+
                    operation.JellyfinDbContext.Chapters.Add(chapter);
                }
            }
@@ -417,6 +444,11 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
                foreach (SqliteDataReader dto in connection.Query(ancestorIdsQuery))
                {
                    var ancestorId = GetAncestorId(dto);
+                    if (!baseItemIds.Contains(ancestorId.ItemId) || !baseItemIds.Contains(ancestorId.ParentItemId))
+                    {
+                        continue;
+                    }
+
                    operation.JellyfinDbContext.AncestorIds.Add(ancestorId);
                }
            }
@@ -48,8 +48,10 @@ public interface IChapterManager
    Task<bool> RefreshChapterImages(Video video, IDirectoryService directoryService, IReadOnlyList<ChapterInfo> chapters, bool extractImages, bool saveChapters, CancellationToken cancellationToken);

    /// <summary>
-    /// Deletes the chapter images.
+    /// Deletes the chapter data.
    /// </summary>
-    /// <param name="video">Video to use.</param>
-    void DeleteChapterImages(Video video);
+    /// <param name="itemId">The item id.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns>Task.</returns>
+    Task DeleteChapterDataAsync(Guid itemId, CancellationToken cancellationToken);
 }
@@ -337,6 +337,11 @@ namespace MediaBrowser.Controller.Entities

            try
            {
+                if (GetParents().Any(f => f.Id.Equals(Id)))
+                {
+                    throw new InvalidOperationException("Recursive datastructure detected abort processing this item.");
+                }
+
                await ValidateChildrenInternal2(progress, recursive, refreshChildMetadata, allowRemoveRoot, refreshOptions, directoryService, cancellationToken).ConfigureAwait(false);
            }
            finally
@@ -452,6 +457,12 @@ namespace MediaBrowser.Controller.Entities
                {
                    foreach (var item in itemsRemoved)
                    {
+                        if (!item.CanDelete())
+                        {
+                            Logger.LogDebug("Item marked as non-removable, skipping: {Path}", item.Path ?? item.Name);
+                            continue;
+                        }
+
                        if (item.IsFileProtocol)
                        {
                            Logger.LogDebug("Removed item: {Path}", item.Path);
@@ -1346,6 +1357,14 @@ namespace MediaBrowser.Controller.Entities
            var realChildren = visibleChildren
                .Where(e => query is null || UserViewBuilder.FilterItem(e, query))
                .ToArray();
+
+            if (this is BoxSet && (query.OrderBy is null || query.OrderBy.Count == 0))
+            {
+                realChildren = realChildren
+                    .OrderBy(e => e.ProductionYear ?? int.MaxValue)
+                    .ToArray();
+            }
+
            var childCount = realChildren.Length;
            if (result.Count < limit)
            {
@@ -6552,7 +6552,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                if (isD3d11Supported && isCodecAvailable)
                {
                    return " -hwaccel d3d11va" + (outputHwSurface ? " -hwaccel_output_format d3d11 -noautorotate" + stripRotationDataArgs : string.Empty)
-                        + (profileMismatch ? " -hwaccel_flags +allow_profile_mismatch" : string.Empty) + (isAv1 ? " -c:v av1" : string.Empty);
+                        + (profileMismatch ? " -hwaccel_flags +allow_profile_mismatch" : string.Empty) + " -threads 2" + (isAv1 ? " -c:v av1" : string.Empty);
                }
            }

@@ -53,5 +53,13 @@ namespace MediaBrowser.Controller.MediaEncoding
        /// <param name="cancellationToken">The cancellation token.</param>
        /// <returns>System.String.</returns>
        Task<string> GetSubtitleFilePath(MediaStream subtitleStream, MediaSourceInfo mediaSource, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Extracts all extractable subtitles (text and pgs).
+        /// </summary>
+        /// <param name="mediaSource">The mediaSource.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        Task ExtractAllExtractableSubtitles(MediaSourceInfo mediaSource, CancellationToken cancellationToken);
    }
 }
@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
 using MediaBrowser.Model.Entities;

 namespace MediaBrowser.Controller.Persistence;
@@ -13,7 +15,9 @@ public interface IChapterRepository
    /// Deletes the chapters.
    /// </summary>
    /// <param name="itemId">The item.</param>
-    void DeleteChapters(Guid itemId);
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns>Task.</returns>
+    Task DeleteChaptersAsync(Guid itemId, CancellationToken cancellationToken);

    /// <summary>
    /// Saves the chapters.
@@ -18,10 +18,16 @@ namespace MediaBrowser.MediaEncoding.Configuration

        public void Validate(object oldConfig, object newConfig)
        {
-            var newPath = ((EncodingOptions)newConfig).TranscodingTempPath;
+            var oldEncodingOptions = (EncodingOptions)oldConfig;
+            var newEncodingOptions = (EncodingOptions)newConfig;
+
+            ArgumentNullException.ThrowIfNull(oldEncodingOptions, nameof(oldConfig));
+            ArgumentNullException.ThrowIfNull(newEncodingOptions, nameof(newConfig));
+
+            var newPath = newEncodingOptions.TranscodingTempPath;

            if (!string.IsNullOrWhiteSpace(newPath)
-                && !string.Equals(((EncodingOptions)oldConfig).TranscodingTempPath, newPath, StringComparison.Ordinal))
+                && !string.Equals(oldEncodingOptions.TranscodingTempPath, newPath, StringComparison.Ordinal))
            {
                // Validate
                if (!Directory.Exists(newPath))
@@ -33,6 +39,12 @@ namespace MediaBrowser.MediaEncoding.Configuration
                            newPath));
                }
            }
+
+            if (!string.IsNullOrWhiteSpace(newEncodingOptions.EncoderAppPath)
+                && !string.Equals(oldEncodingOptions.EncoderAppPath, newEncodingOptions.EncoderAppPath, StringComparison.Ordinal))
+            {
+                throw new InvalidOperationException("Unable to update encoder app path.");
+            }
        }
    }
 }
@@ -477,13 +477,8 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                || string.Equals(codec, "pgssub", StringComparison.OrdinalIgnoreCase);
        }

-        /// <summary>
-        /// Extracts all extractable subtitles (text and pgs).
-        /// </summary>
-        /// <param name="mediaSource">The mediaSource.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        private async Task ExtractAllExtractableSubtitles(MediaSourceInfo mediaSource, CancellationToken cancellationToken)
+        /// <inheritdoc />
+        public async Task ExtractAllExtractableSubtitles(MediaSourceInfo mediaSource, CancellationToken cancellationToken)
        {
            var locks = new List<IDisposable>();
            var extractableStreams = new List<MediaStream>();
@@ -437,12 +437,12 @@ namespace MediaBrowser.Providers.MediaInfo
                {
                    audio.TrySetProviderId(MetadataProvider.MusicBrainzRecording, recordingMbId);
                }
-                else if (TryGetSanitizedAdditionalFields(track, "UFID", out var ufIdValue) && !string.IsNullOrEmpty(ufIdValue))
+                else if (TryGetSanitizedUFIDFields(track, out var owner, out var identifier) && !string.IsNullOrEmpty(owner) && !string.IsNullOrEmpty(identifier))
                {
                    // If tagged with MB Picard, the format is 'http://musicbrainz.org\0<recording MBID>'
-                    if (ufIdValue.Contains("musicbrainz.org", StringComparison.OrdinalIgnoreCase))
+                    if (owner.Contains("musicbrainz.org", StringComparison.OrdinalIgnoreCase))
                    {
-                        audio.TrySetProviderId(MetadataProvider.MusicBrainzRecording, ufIdValue.AsSpan().RightPart('\0').ToString());
+                        audio.TrySetProviderId(MetadataProvider.MusicBrainzRecording, identifier);
                    }
                }
            }
@@ -533,9 +533,60 @@ namespace MediaBrowser.Providers.MediaInfo

        private bool TryGetSanitizedAdditionalFields(Track track, string field, out string? value)
        {
-            var hasField = track.AdditionalFields.TryGetValue(field, out value);
+            var hasField = TryGetAdditionalFieldWithFallback(track, field, out value);
            value = GetSanitizedStringTag(value, track.Path);
            return hasField;
        }
+
+        private bool TryGetSanitizedUFIDFields(Track track, out string? owner, out string? identifier)
+        {
+            var hasField = TryGetAdditionalFieldWithFallback(track, "UFID", out string? value);
+            if (hasField && !string.IsNullOrEmpty(value))
+            {
+                string[] parts = value.Split('\0');
+                if (parts.Length == 2)
+                {
+                    owner = GetSanitizedStringTag(parts[0], track.Path);
+                    identifier = GetSanitizedStringTag(parts[1], track.Path);
+                    return true;
+                }
+            }
+
+            owner = null;
+            identifier = null;
+            return false;
+        }
+
+        // Build the explicit mka-style fallback key (e.g., ARTISTS -> track.artists, "MusicBrainz Artist Id" -> track.musicbrainz_artist_id)
+        private static string GetMkaFallbackKey(string key)
+        {
+            if (string.IsNullOrWhiteSpace(key))
+            {
+                return key;
+            }
+
+            var normalized = key.Trim().Replace(' ', '_').ToLowerInvariant();
+            return "track." + normalized;
+        }
+
+        // First try the normal key exactly; if missing, try the mka-style fallback key.
+        private bool TryGetAdditionalFieldWithFallback(Track track, string key, out string? value)
+        {
+            // Prefer the normal key (as-is, case-sensitive)
+            if (track.AdditionalFields.TryGetValue(key, out value))
+            {
+                return true;
+            }
+
+            // Fallback to mka-style: "track." + lower-case(original key)
+            var fallbackKey = GetMkaFallbackKey(key);
+            if (track.AdditionalFields.TryGetValue(fallbackKey, out value))
+            {
+                return true;
+            }
+
+            value = null;
+            return false;
+        }
    }
 }
@@ -22,7 +22,7 @@ public class AudioDbArtistExternalUrlProvider : IExternalUrlProvider
            var baseUrl = "https://www.theaudiodb.com/";
            switch (item)
            {
-                case MusicAlbum:
+                case MusicArtist:
                case Person:
                    yield return baseUrl + $"artist/{externalId}";
                    break;
@@ -21,7 +21,7 @@ public class MusicBrainzArtistExternalUrlProvider : IExternalUrlProvider
        {
            switch (item)
            {
-                case MusicAlbum:
+                case MusicArtist:
                case Person:
                    yield return Plugin.Instance!.Configuration.Server + $"/artist/{externalId}";

@@ -66,7 +66,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.BoxSets
            var language = item.GetPreferredMetadataLanguage();

            // TODO use image languages if All Languages isn't toggled, but there's currently no way to get that value in here
-            var collection = await _tmdbClientManager.GetCollectionAsync(tmdbId, null, null, cancellationToken).ConfigureAwait(false);
+            var collection = await _tmdbClientManager.GetCollectionAsync(tmdbId, null, null, null, cancellationToken).ConfigureAwait(false);

            if (collection?.Images is null)
            {
@@ -47,7 +47,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.BoxSets

            if (tmdbId > 0)
            {
-                var collection = await _tmdbClientManager.GetCollectionAsync(tmdbId, language, TmdbUtils.GetImageLanguagesParam(language), cancellationToken).ConfigureAwait(false);
+                var collection = await _tmdbClientManager.GetCollectionAsync(tmdbId, language, TmdbUtils.GetImageLanguagesParam(language, searchInfo.MetadataCountryCode), searchInfo.MetadataCountryCode, cancellationToken).ConfigureAwait(false);

                if (collection is null)
                {
@@ -70,7 +70,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.BoxSets
                return new[] { result };
            }

-            var collectionSearchResults = await _tmdbClientManager.SearchCollectionAsync(searchInfo.Name, language, cancellationToken).ConfigureAwait(false);
+            var collectionSearchResults = await _tmdbClientManager.SearchCollectionAsync(searchInfo.Name, language, searchInfo.MetadataCountryCode, cancellationToken).ConfigureAwait(false);

            var collections = new RemoteSearchResult[collectionSearchResults.Count];
            for (var i = 0; i < collectionSearchResults.Count; i++)
@@ -95,6 +95,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.BoxSets
        {
            var tmdbId = Convert.ToInt32(info.GetProviderId(MetadataProvider.Tmdb), CultureInfo.InvariantCulture);
            var language = info.MetadataLanguage;
+
            // We don't already have an Id, need to fetch it
            if (tmdbId <= 0)
            {
@@ -102,7 +103,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.BoxSets
                // Caller provides the filename with extension stripped and NOT the parsed filename
                var parsedName = _libraryManager.ParseName(info.Name);
                var cleanedName = TmdbUtils.CleanName(parsedName.Name);
-                var searchResults = await _tmdbClientManager.SearchCollectionAsync(cleanedName, language, cancellationToken).ConfigureAwait(false);
+                var searchResults = await _tmdbClientManager.SearchCollectionAsync(cleanedName, language, info.MetadataCountryCode, cancellationToken).ConfigureAwait(false);

                if (searchResults is not null && searchResults.Count > 0)
                {
@@ -114,7 +115,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.BoxSets

            if (tmdbId > 0)
            {
-                var collection = await _tmdbClientManager.GetCollectionAsync(tmdbId, language, TmdbUtils.GetImageLanguagesParam(language), cancellationToken).ConfigureAwait(false);
+                var collection = await _tmdbClientManager.GetCollectionAsync(tmdbId, language, TmdbUtils.GetImageLanguagesParam(language, info.MetadataCountryCode), info.MetadataCountryCode, cancellationToken).ConfigureAwait(false);

                if (collection is not null)
                {
@@ -59,6 +59,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
        public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, CancellationToken cancellationToken)
        {
            var language = item.GetPreferredMetadataLanguage();
+            var countryCode = item.GetPreferredMetadataCountryCode();

            var movieTmdbId = Convert.ToInt32(item.GetProviderId(MetadataProvider.Tmdb), CultureInfo.InvariantCulture);
            if (movieTmdbId <= 0)
@@ -69,7 +70,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
                    return Enumerable.Empty<RemoteImageInfo>();
                }

-                var movieResult = await _tmdbClientManager.FindByExternalIdAsync(movieImdbId, FindExternalSource.Imdb, language, cancellationToken).ConfigureAwait(false);
+                var movieResult = await _tmdbClientManager.FindByExternalIdAsync(movieImdbId, FindExternalSource.Imdb, language, countryCode, cancellationToken).ConfigureAwait(false);
                if (movieResult?.MovieResults is not null && movieResult.MovieResults.Count > 0)
                {
                    movieTmdbId = movieResult.MovieResults[0].Id;
@@ -83,7 +84,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies

            // TODO use image languages if All Languages isn't toggled, but there's currently no way to get that value in here
            var movie = await _tmdbClientManager
-                .GetMovieAsync(movieTmdbId, null, null, cancellationToken)
+                .GetMovieAsync(movieTmdbId, null, null, null, cancellationToken)
                .ConfigureAwait(false);

            if (movie?.Images is null)
@@ -59,7 +59,8 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
                    .GetMovieAsync(
                        int.Parse(id, CultureInfo.InvariantCulture),
                        searchInfo.MetadataLanguage,
-                        TmdbUtils.GetImageLanguagesParam(searchInfo.MetadataLanguage),
+                        TmdbUtils.GetImageLanguagesParam(searchInfo.MetadataLanguage, searchInfo.MetadataCountryCode),
+                        searchInfo.MetadataCountryCode,
                        cancellationToken)
                    .ConfigureAwait(false);

@@ -93,7 +94,8 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
                var result = await _tmdbClientManager.FindByExternalIdAsync(
                    id,
                    FindExternalSource.Imdb,
-                    TmdbUtils.GetImageLanguagesParam(searchInfo.MetadataLanguage),
+                    TmdbUtils.GetImageLanguagesParam(searchInfo.MetadataLanguage, searchInfo.MetadataCountryCode),
+                    searchInfo.MetadataCountryCode,
                    cancellationToken).ConfigureAwait(false);
                movieResults = result?.MovieResults;
            }
@@ -103,7 +105,8 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
                var result = await _tmdbClientManager.FindByExternalIdAsync(
                    id,
                    FindExternalSource.TvDb,
-                    TmdbUtils.GetImageLanguagesParam(searchInfo.MetadataLanguage),
+                    TmdbUtils.GetImageLanguagesParam(searchInfo.MetadataLanguage, searchInfo.MetadataCountryCode),
+                    searchInfo.MetadataCountryCode,
                    cancellationToken).ConfigureAwait(false);
                movieResults = result?.MovieResults;
            }
@@ -111,7 +114,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
            if (movieResults is null)
            {
                movieResults = await _tmdbClientManager
-                    .SearchMovieAsync(searchInfo.Name, searchInfo.Year ?? 0, searchInfo.MetadataLanguage, cancellationToken)
+                    .SearchMovieAsync(searchInfo.Name, searchInfo.Year ?? 0, searchInfo.MetadataLanguage, searchInfo.MetadataCountryCode, cancellationToken)
                    .ConfigureAwait(false);
            }

@@ -152,7 +155,8 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
                // Caller provides the filename with extension stripped and NOT the parsed filename
                var parsedName = _libraryManager.ParseName(info.Name);
                var cleanedName = TmdbUtils.CleanName(parsedName.Name);
-                var searchResults = await _tmdbClientManager.SearchMovieAsync(cleanedName, info.Year ?? parsedName.Year ?? 0, info.MetadataLanguage, cancellationToken).ConfigureAwait(false);
+
+                var searchResults = await _tmdbClientManager.SearchMovieAsync(cleanedName, info.Year ?? parsedName.Year ?? 0, info.MetadataLanguage, info.MetadataCountryCode, cancellationToken).ConfigureAwait(false);

                if (searchResults.Count > 0)
                {
@@ -162,7 +166,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies

            if (string.IsNullOrEmpty(tmdbId) && !string.IsNullOrEmpty(imdbId))
            {
-                var movieResultFromImdbId = await _tmdbClientManager.FindByExternalIdAsync(imdbId, FindExternalSource.Imdb, info.MetadataLanguage, cancellationToken).ConfigureAwait(false);
+                var movieResultFromImdbId = await _tmdbClientManager.FindByExternalIdAsync(imdbId, FindExternalSource.Imdb, info.MetadataLanguage, info.MetadataCountryCode, cancellationToken).ConfigureAwait(false);
                if (movieResultFromImdbId?.MovieResults.Count > 0)
                {
                    tmdbId = movieResultFromImdbId.MovieResults[0].Id.ToString(CultureInfo.InvariantCulture);
@@ -175,7 +179,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
            }

            var movieResult = await _tmdbClientManager
-                .GetMovieAsync(Convert.ToInt32(tmdbId, CultureInfo.InvariantCulture), info.MetadataLanguage, TmdbUtils.GetImageLanguagesParam(info.MetadataLanguage), cancellationToken)
+                .GetMovieAsync(Convert.ToInt32(tmdbId, CultureInfo.InvariantCulture), info.MetadataLanguage, TmdbUtils.GetImageLanguagesParam(info.MetadataLanguage, info.MetadataCountryCode), info.MetadataCountryCode, cancellationToken)
                .ConfigureAwait(false);

            if (movieResult is null)
@@ -60,7 +60,8 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.People
            }

            var language = item.GetPreferredMetadataLanguage();
-            var personResult = await _tmdbClientManager.GetPersonAsync(int.Parse(personTmdbId, CultureInfo.InvariantCulture), language, cancellationToken).ConfigureAwait(false);
+            var countryCode = item.GetPreferredMetadataCountryCode();
+            var personResult = await _tmdbClientManager.GetPersonAsync(int.Parse(personTmdbId, CultureInfo.InvariantCulture), language, countryCode, cancellationToken).ConfigureAwait(false);
            if (personResult?.Images?.Profiles is null)
            {
                return Enumerable.Empty<RemoteImageInfo>();
@@ -39,7 +39,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.People
        {
            if (searchInfo.TryGetProviderId(MetadataProvider.Tmdb, out var personTmdbId))
            {
-                var personResult = await _tmdbClientManager.GetPersonAsync(int.Parse(personTmdbId, CultureInfo.InvariantCulture), searchInfo.MetadataLanguage, cancellationToken).ConfigureAwait(false);
+                var personResult = await _tmdbClientManager.GetPersonAsync(int.Parse(personTmdbId, CultureInfo.InvariantCulture), searchInfo.MetadataLanguage, searchInfo.MetadataCountryCode, cancellationToken).ConfigureAwait(false);

                if (personResult is not null)
                {
@@ -101,7 +101,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.People

            if (personTmdbId > 0)
            {
-                var person = await _tmdbClientManager.GetPersonAsync(personTmdbId, info.MetadataLanguage, cancellationToken).ConfigureAwait(false);
+                var person = await _tmdbClientManager.GetPersonAsync(personTmdbId, info.MetadataLanguage, info.MetadataCountryCode, cancellationToken).ConfigureAwait(false);
                if (person is null)
                {
                    return result;
@@ -75,7 +75,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV

            // TODO use image languages if All Languages isn't toggled, but there's currently no way to get that value in here
            var episodeResult = await _tmdbClientManager
-                .GetEpisodeAsync(seriesTmdbId, seasonNumber, episodeNumber.Value, series.DisplayOrder, null, null, cancellationToken)
+                .GetEpisodeAsync(seriesTmdbId, seasonNumber, episodeNumber.Value, series.DisplayOrder, null, null, null, cancellationToken)
                .ConfigureAwait(false);

            var stills = episodeResult?.Images?.Stills;
@@ -113,7 +113,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                List<TvEpisode>? result = null;
                for (int? episode = startindex; episode <= endindex; episode++)
                {
-                    var episodeInfo = await _tmdbClientManager.GetEpisodeAsync(seriesTmdbId, seasonNumber, episode.Value, info.SeriesDisplayOrder, info.MetadataLanguage, TmdbUtils.GetImageLanguagesParam(info.MetadataLanguage), cancellationToken).ConfigureAwait(false);
+                    var episodeInfo = await _tmdbClientManager.GetEpisodeAsync(seriesTmdbId, seasonNumber, episode.Value, info.SeriesDisplayOrder, info.MetadataLanguage, TmdbUtils.GetImageLanguagesParam(info.MetadataLanguage, info.MetadataCountryCode), info.MetadataCountryCode, cancellationToken).ConfigureAwait(false);
                    if (episodeInfo is not null)
                    {
                        (result ??= new List<TvEpisode>()).Add(episodeInfo);
@@ -157,7 +157,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
            else
            {
                episodeResult = await _tmdbClientManager
-                    .GetEpisodeAsync(seriesTmdbId, seasonNumber, episodeNumber.Value, info.SeriesDisplayOrder, info.MetadataLanguage, TmdbUtils.GetImageLanguagesParam(info.MetadataLanguage), cancellationToken)
+                    .GetEpisodeAsync(seriesTmdbId, seasonNumber, episodeNumber.Value, info.SeriesDisplayOrder, info.MetadataLanguage, TmdbUtils.GetImageLanguagesParam(info.MetadataLanguage, info.MetadataCountryCode), info.MetadataCountryCode, cancellationToken)
                    .ConfigureAwait(false);
            }

@@ -68,7 +68,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV

            // TODO use image languages if All Languages isn't toggled, but there's currently no way to get that value in here
            var seasonResult = await _tmdbClientManager
-                .GetSeasonAsync(seriesTmdbId, season.IndexNumber.Value, null, null, cancellationToken)
+                .GetSeasonAsync(seriesTmdbId, season.IndexNumber.Value, null, null, null, cancellationToken)
                .ConfigureAwait(false);

            var posters = seasonResult?.Images?.Posters;
@@ -54,7 +54,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
            }

            var seasonResult = await _tmdbClientManager
-                .GetSeasonAsync(Convert.ToInt32(seriesTmdbId, CultureInfo.InvariantCulture), seasonNumber.Value, info.MetadataLanguage, TmdbUtils.GetImageLanguagesParam(info.MetadataLanguage), cancellationToken)
+                .GetSeasonAsync(Convert.ToInt32(seriesTmdbId, CultureInfo.InvariantCulture), seasonNumber.Value, info.MetadataLanguage, TmdbUtils.GetImageLanguagesParam(info.MetadataLanguage, info.MetadataCountryCode), info.MetadataCountryCode, cancellationToken)
                .ConfigureAwait(false);

            if (seasonResult is null)
@@ -68,7 +68,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV

            // TODO use image languages if All Languages isn't toggled, but there's currently no way to get that value in here
            var series = await _tmdbClientManager
-                .GetSeriesAsync(Convert.ToInt32(tmdbId, CultureInfo.InvariantCulture), null, null, cancellationToken)
+                .GetSeriesAsync(Convert.ToInt32(tmdbId, CultureInfo.InvariantCulture), null, null, null, cancellationToken)
                .ConfigureAwait(false);

            if (series?.Images is null)
@@ -57,7 +57,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
            if (searchInfo.TryGetProviderId(MetadataProvider.Tmdb, out var tmdbId))
            {
                var series = await _tmdbClientManager
-                    .GetSeriesAsync(Convert.ToInt32(tmdbId, CultureInfo.InvariantCulture), searchInfo.MetadataLanguage, searchInfo.MetadataLanguage, cancellationToken)
+                    .GetSeriesAsync(Convert.ToInt32(tmdbId, CultureInfo.InvariantCulture), searchInfo.MetadataLanguage, searchInfo.MetadataLanguage, searchInfo.MetadataCountryCode, cancellationToken)
                    .ConfigureAwait(false);

                if (series is not null)
@@ -71,7 +71,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
            if (searchInfo.TryGetProviderId(MetadataProvider.Imdb, out var imdbId))
            {
                var findResult = await _tmdbClientManager
-                    .FindByExternalIdAsync(imdbId, FindExternalSource.Imdb, searchInfo.MetadataLanguage, cancellationToken)
+                    .FindByExternalIdAsync(imdbId, FindExternalSource.Imdb, searchInfo.MetadataLanguage, searchInfo.MetadataCountryCode, cancellationToken)
                    .ConfigureAwait(false);

                var tvResults = findResult?.TvResults;
@@ -92,7 +92,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
            if (searchInfo.TryGetProviderId(MetadataProvider.Tvdb, out var tvdbId))
            {
                var findResult = await _tmdbClientManager
-                    .FindByExternalIdAsync(tvdbId, FindExternalSource.TvDb, searchInfo.MetadataLanguage, cancellationToken)
+                    .FindByExternalIdAsync(tvdbId, FindExternalSource.TvDb, searchInfo.MetadataLanguage, searchInfo.MetadataCountryCode, cancellationToken)
                    .ConfigureAwait(false);

                var tvResults = findResult?.TvResults;
@@ -110,7 +110,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                }
            }

-            var tvSearchResults = await _tmdbClientManager.SearchSeriesAsync(searchInfo.Name, searchInfo.MetadataLanguage, cancellationToken: cancellationToken)
+            var tvSearchResults = await _tmdbClientManager.SearchSeriesAsync(searchInfo.Name, searchInfo.MetadataLanguage, searchInfo.MetadataCountryCode, cancellationToken: cancellationToken)
                .ConfigureAwait(false);

            var remoteResults = new RemoteSearchResult[tvSearchResults.Count];
@@ -173,7 +173,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV

            if (string.IsNullOrEmpty(tmdbId) && info.TryGetProviderId(MetadataProvider.Imdb, out var imdbId))
            {
-                var searchResult = await _tmdbClientManager.FindByExternalIdAsync(imdbId, FindExternalSource.Imdb, info.MetadataLanguage, cancellationToken).ConfigureAwait(false);
+                var searchResult = await _tmdbClientManager.FindByExternalIdAsync(imdbId, FindExternalSource.Imdb, info.MetadataLanguage, info.MetadataCountryCode, cancellationToken).ConfigureAwait(false);
                if (searchResult?.TvResults.Count > 0)
                {
                    tmdbId = searchResult.TvResults[0].Id.ToString(CultureInfo.InvariantCulture);
@@ -182,7 +182,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV

            if (string.IsNullOrEmpty(tmdbId) && info.TryGetProviderId(MetadataProvider.Tvdb, out var tvdbId))
            {
-                var searchResult = await _tmdbClientManager.FindByExternalIdAsync(tvdbId, FindExternalSource.TvDb, info.MetadataLanguage, cancellationToken).ConfigureAwait(false);
+                var searchResult = await _tmdbClientManager.FindByExternalIdAsync(tvdbId, FindExternalSource.TvDb, info.MetadataLanguage, info.MetadataCountryCode, cancellationToken).ConfigureAwait(false);
                if (searchResult?.TvResults.Count > 0)
                {
                    tmdbId = searchResult.TvResults[0].Id.ToString(CultureInfo.InvariantCulture);
@@ -196,7 +196,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
                // Caller provides the filename with extension stripped and NOT the parsed filename
                var parsedName = _libraryManager.ParseName(info.Name);
                var cleanedName = TmdbUtils.CleanName(parsedName.Name);
-                var searchResults = await _tmdbClientManager.SearchSeriesAsync(cleanedName, info.MetadataLanguage, info.Year ?? parsedName.Year ?? 0, cancellationToken).ConfigureAwait(false);
+                var searchResults = await _tmdbClientManager.SearchSeriesAsync(cleanedName, info.MetadataLanguage, info.MetadataCountryCode, info.Year ?? parsedName.Year ?? 0, cancellationToken).ConfigureAwait(false);

                if (searchResults.Count > 0)
                {
@@ -212,7 +212,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
            cancellationToken.ThrowIfCancellationRequested();

            var tvShow = await _tmdbClientManager
-                .GetSeriesAsync(tmdbIdInt, info.MetadataLanguage, TmdbUtils.GetImageLanguagesParam(info.MetadataLanguage), cancellationToken)
+                .GetSeriesAsync(tmdbIdInt, info.MetadataLanguage, TmdbUtils.GetImageLanguagesParam(info.MetadataLanguage, info.MetadataCountryCode), info.MetadataCountryCode, cancellationToken)
                .ConfigureAwait(false);

            if (tvShow is null)
@@ -51,9 +51,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
        /// <param name="tmdbId">The movie's TMDb id.</param>
        /// <param name="language">The movie's language.</param>
        /// <param name="imageLanguages">A comma-separated list of image languages.</param>
+        /// <param name="countryCode">The country code, ISO 3166-1.</param>
        /// <param name="cancellationToken">The cancellation token.</param>
        /// <returns>The TMDb movie or null if not found.</returns>
-        public async Task<Movie?> GetMovieAsync(int tmdbId, string? language, string? imageLanguages, CancellationToken cancellationToken)
+        public async Task<Movie?> GetMovieAsync(int tmdbId, string? language, string? imageLanguages, string? countryCode, CancellationToken cancellationToken)
        {
            var key = $"movie-{tmdbId.ToString(CultureInfo.InvariantCulture)}-{language}";
            if (_memoryCache.TryGetValue(key, out Movie? movie))
@@ -71,7 +72,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb

            movie = await _tmDbClient.GetMovieAsync(
                tmdbId,
-                TmdbUtils.NormalizeLanguage(language),
+                TmdbUtils.NormalizeLanguage(language, countryCode),
                imageLanguages,
                extraMethods,
                cancellationToken).ConfigureAwait(false);
@@ -90,9 +91,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
        /// <param name="tmdbId">The collection's TMDb id.</param>
        /// <param name="language">The collection's language.</param>
        /// <param name="imageLanguages">A comma-separated list of image languages.</param>
+        /// <param name="countryCode">The country code, ISO 3166-1.</param>
        /// <param name="cancellationToken">The cancellation token.</param>
        /// <returns>The TMDb collection or null if not found.</returns>
-        public async Task<Collection?> GetCollectionAsync(int tmdbId, string? language, string? imageLanguages, CancellationToken cancellationToken)
+        public async Task<Collection?> GetCollectionAsync(int tmdbId, string? language, string? imageLanguages, string? countryCode, CancellationToken cancellationToken)
        {
            var key = $"collection-{tmdbId.ToString(CultureInfo.InvariantCulture)}-{language}";
            if (_memoryCache.TryGetValue(key, out Collection? collection))
@@ -104,7 +106,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb

            collection = await _tmDbClient.GetCollectionAsync(
                tmdbId,
-                TmdbUtils.NormalizeLanguage(language),
+                TmdbUtils.NormalizeLanguage(language, countryCode),
                imageLanguages,
                CollectionMethods.Images,
                cancellationToken).ConfigureAwait(false);
@@ -123,9 +125,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
        /// <param name="tmdbId">The tv show's TMDb id.</param>
        /// <param name="language">The tv show's language.</param>
        /// <param name="imageLanguages">A comma-separated list of image languages.</param>
+        /// <param name="countryCode">The country code, ISO 3166-1.</param>
        /// <param name="cancellationToken">The cancellation token.</param>
        /// <returns>The TMDb tv show information or null if not found.</returns>
-        public async Task<TvShow?> GetSeriesAsync(int tmdbId, string? language, string? imageLanguages, CancellationToken cancellationToken)
+        public async Task<TvShow?> GetSeriesAsync(int tmdbId, string? language, string? imageLanguages, string? countryCode, CancellationToken cancellationToken)
        {
            var key = $"series-{tmdbId.ToString(CultureInfo.InvariantCulture)}-{language}";
            if (_memoryCache.TryGetValue(key, out TvShow? series))
@@ -143,7 +146,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb

            series = await _tmDbClient.GetTvShowAsync(
                tmdbId,
-                language: TmdbUtils.NormalizeLanguage(language),
+                language: TmdbUtils.NormalizeLanguage(language, countryCode),
                includeImageLanguage: imageLanguages,
                extraMethods: extraMethods,
                cancellationToken: cancellationToken).ConfigureAwait(false);
@@ -163,9 +166,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
        /// <param name="displayOrder">The display order.</param>
        /// <param name="language">The tv show's language.</param>
        /// <param name="imageLanguages">A comma-separated list of image languages.</param>
+        /// <param name="countryCode">The country code, ISO 3166-1.</param>
        /// <param name="cancellationToken">The cancellation token.</param>
        /// <returns>The TMDb tv show episode group information or null if not found.</returns>
-        private async Task<TvGroupCollection?> GetSeriesGroupAsync(int tvShowId, string displayOrder, string? language, string? imageLanguages, CancellationToken cancellationToken)
+        private async Task<TvGroupCollection?> GetSeriesGroupAsync(int tvShowId, string displayOrder, string? language, string? imageLanguages, string? countryCode, CancellationToken cancellationToken)
        {
            TvGroupType? groupType =
                string.Equals(displayOrder, "originalAirDate", StringComparison.Ordinal) ? TvGroupType.OriginalAirDate :
@@ -190,7 +194,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb

            await EnsureClientConfigAsync().ConfigureAwait(false);

-            var series = await GetSeriesAsync(tvShowId, language, imageLanguages, cancellationToken).ConfigureAwait(false);
+            var series = await GetSeriesAsync(tvShowId, language, imageLanguages, countryCode, cancellationToken).ConfigureAwait(false);
            var episodeGroupId = series?.EpisodeGroups.Results.Find(g => g.Type == groupType)?.Id;

            if (episodeGroupId is null)
@@ -200,7 +204,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb

            group = await _tmDbClient.GetTvEpisodeGroupsAsync(
                episodeGroupId,
-                language: TmdbUtils.NormalizeLanguage(language),
+                language: TmdbUtils.NormalizeLanguage(language, countryCode),
                cancellationToken: cancellationToken).ConfigureAwait(false);

            if (group is not null)
@@ -218,9 +222,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
        /// <param name="seasonNumber">The season number.</param>
        /// <param name="language">The tv season's language.</param>
        /// <param name="imageLanguages">A comma-separated list of image languages.</param>
+        /// <param name="countryCode">The country code, ISO 3166-1.</param>
        /// <param name="cancellationToken">The cancellation token.</param>
        /// <returns>The TMDb tv season information or null if not found.</returns>
-        public async Task<TvSeason?> GetSeasonAsync(int tvShowId, int seasonNumber, string? language, string? imageLanguages, CancellationToken cancellationToken)
+        public async Task<TvSeason?> GetSeasonAsync(int tvShowId, int seasonNumber, string? language, string? imageLanguages, string? countryCode, CancellationToken cancellationToken)
        {
            var key = $"season-{tvShowId.ToString(CultureInfo.InvariantCulture)}-s{seasonNumber.ToString(CultureInfo.InvariantCulture)}-{language}";
            if (_memoryCache.TryGetValue(key, out TvSeason? season))
@@ -233,7 +238,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
            season = await _tmDbClient.GetTvSeasonAsync(
                tvShowId,
                seasonNumber,
-                language: TmdbUtils.NormalizeLanguage(language),
+                language: TmdbUtils.NormalizeLanguage(language, countryCode),
                includeImageLanguage: imageLanguages,
                extraMethods: TvSeasonMethods.Credits | TvSeasonMethods.Images | TvSeasonMethods.ExternalIds | TvSeasonMethods.Videos,
                cancellationToken: cancellationToken).ConfigureAwait(false);
@@ -255,9 +260,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
        /// <param name="displayOrder">The display order.</param>
        /// <param name="language">The episode's language.</param>
        /// <param name="imageLanguages">A comma-separated list of image languages.</param>
+        /// <param name="countryCode">The country code, ISO 3166-1.</param>
        /// <param name="cancellationToken">The cancellation token.</param>
        /// <returns>The TMDb tv episode information or null if not found.</returns>
-        public async Task<TvEpisode?> GetEpisodeAsync(int tvShowId, int seasonNumber, int episodeNumber, string displayOrder, string? language, string? imageLanguages, CancellationToken cancellationToken)
+        public async Task<TvEpisode?> GetEpisodeAsync(int tvShowId, int seasonNumber, int episodeNumber, string displayOrder, string? language, string? imageLanguages, string? countryCode, CancellationToken cancellationToken)
        {
            var key = $"episode-{tvShowId.ToString(CultureInfo.InvariantCulture)}-s{seasonNumber.ToString(CultureInfo.InvariantCulture)}e{episodeNumber.ToString(CultureInfo.InvariantCulture)}-{displayOrder}-{language}";
            if (_memoryCache.TryGetValue(key, out TvEpisode? episode))
@@ -267,7 +273,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb

            await EnsureClientConfigAsync().ConfigureAwait(false);

-            var group = await GetSeriesGroupAsync(tvShowId, displayOrder, language, imageLanguages, cancellationToken).ConfigureAwait(false);
+            var group = await GetSeriesGroupAsync(tvShowId, displayOrder, language, imageLanguages, countryCode, cancellationToken).ConfigureAwait(false);
            if (group is not null)
            {
                var season = group.Groups.Find(s => s.Order == seasonNumber);
@@ -284,7 +290,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
                tvShowId,
                seasonNumber,
                episodeNumber,
-                language: TmdbUtils.NormalizeLanguage(language),
+                language: TmdbUtils.NormalizeLanguage(language, countryCode),
                includeImageLanguage: imageLanguages,
                extraMethods: TvEpisodeMethods.Credits | TvEpisodeMethods.Images | TvEpisodeMethods.ExternalIds | TvEpisodeMethods.Videos,
                cancellationToken: cancellationToken).ConfigureAwait(false);
@@ -301,10 +307,11 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
        /// Gets a person eg. cast or crew member from the TMDb API based on its TMDb id.
        /// </summary>
        /// <param name="personTmdbId">The person's TMDb id.</param>
-        /// <param name="language">The episode's language.</param>
+        /// <param name="language">The person's language.</param>
+        /// <param name="countryCode">The country code, ISO 3166-1.</param>
        /// <param name="cancellationToken">The cancellation token.</param>
        /// <returns>The TMDb person information or null if not found.</returns>
-        public async Task<Person?> GetPersonAsync(int personTmdbId, string language, CancellationToken cancellationToken)
+        public async Task<Person?> GetPersonAsync(int personTmdbId, string language, string? countryCode, CancellationToken cancellationToken)
        {
            var key = $"person-{personTmdbId.ToString(CultureInfo.InvariantCulture)}-{language}";
            if (_memoryCache.TryGetValue(key, out Person? person))
@@ -316,7 +323,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb

            person = await _tmDbClient.GetPersonAsync(
                personTmdbId,
-                TmdbUtils.NormalizeLanguage(language),
+                TmdbUtils.NormalizeLanguage(language, countryCode),
                PersonMethods.TvCredits | PersonMethods.MovieCredits | PersonMethods.Images | PersonMethods.ExternalIds,
                cancellationToken).ConfigureAwait(false);

@@ -334,12 +341,14 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
        /// <param name="externalId">The item's external id.</param>
        /// <param name="source">The source of the id eg. IMDb.</param>
        /// <param name="language">The item's language.</param>
+        /// <param name="countryCode">The country code, ISO 3166-1.</param>
        /// <param name="cancellationToken">The cancellation token.</param>
        /// <returns>The TMDb item or null if not found.</returns>
        public async Task<FindContainer?> FindByExternalIdAsync(
            string externalId,
            FindExternalSource source,
            string language,
+            string? countryCode,
            CancellationToken cancellationToken)
        {
            var key = $"find-{source.ToString()}-{externalId.ToString(CultureInfo.InvariantCulture)}-{language}";
@@ -353,7 +362,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
            result = await _tmDbClient.FindAsync(
                source,
                externalId,
-                TmdbUtils.NormalizeLanguage(language),
+                TmdbUtils.NormalizeLanguage(language, countryCode),
                cancellationToken).ConfigureAwait(false);

            if (result is not null)
@@ -369,10 +378,11 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
        /// </summary>
        /// <param name="name">The name of the tv show.</param>
        /// <param name="language">The tv show's language.</param>
+        /// <param name="countryCode">The country code, ISO 3166-1.</param>
        /// <param name="year">The year the tv show first aired.</param>
        /// <param name="cancellationToken">The cancellation token.</param>
        /// <returns>The TMDb tv show information.</returns>
-        public async Task<IReadOnlyList<SearchTv>> SearchSeriesAsync(string name, string language, int year = 0, CancellationToken cancellationToken = default)
+        public async Task<IReadOnlyList<SearchTv>> SearchSeriesAsync(string name, string language, string? countryCode, int year = 0, CancellationToken cancellationToken = default)
        {
            var key = $"searchseries-{name}-{year.ToString(CultureInfo.InvariantCulture)}-{language}";
            if (_memoryCache.TryGetValue(key, out SearchContainer<SearchTv>? series) && series is not null)
@@ -383,7 +393,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
            await EnsureClientConfigAsync().ConfigureAwait(false);

            var searchResults = await _tmDbClient
-                .SearchTvShowAsync(name, TmdbUtils.NormalizeLanguage(language), includeAdult: Plugin.Instance.Configuration.IncludeAdult, firstAirDateYear: year, cancellationToken: cancellationToken)
+                .SearchTvShowAsync(name, TmdbUtils.NormalizeLanguage(language, countryCode), includeAdult: Plugin.Instance.Configuration.IncludeAdult, firstAirDateYear: year, cancellationToken: cancellationToken)
                .ConfigureAwait(false);

            if (searchResults.Results.Count > 0)
@@ -431,7 +441,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
        /// <returns>The TMDb movie information.</returns>
        public Task<IReadOnlyList<SearchMovie>> SearchMovieAsync(string name, string language, CancellationToken cancellationToken)
        {
-            return SearchMovieAsync(name, 0, language, cancellationToken);
+            return SearchMovieAsync(name, 0, language, null, cancellationToken);
        }

        /// <summary>
@@ -440,9 +450,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
        /// <param name="name">The name of the movie.</param>
        /// <param name="year">The release year of the movie.</param>
        /// <param name="language">The movie's language.</param>
+        /// <param name="countryCode">The country code, ISO 3166-1.</param>
        /// <param name="cancellationToken">The cancellation token.</param>
        /// <returns>The TMDb movie information.</returns>
-        public async Task<IReadOnlyList<SearchMovie>> SearchMovieAsync(string name, int year, string language, CancellationToken cancellationToken)
+        public async Task<IReadOnlyList<SearchMovie>> SearchMovieAsync(string name, int year, string language, string? countryCode, CancellationToken cancellationToken)
        {
            var key = $"moviesearch-{name}-{year.ToString(CultureInfo.InvariantCulture)}-{language}";
            if (_memoryCache.TryGetValue(key, out SearchContainer<SearchMovie>? movies) && movies is not null)
@@ -453,7 +464,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
            await EnsureClientConfigAsync().ConfigureAwait(false);

            var searchResults = await _tmDbClient
-                .SearchMovieAsync(name, TmdbUtils.NormalizeLanguage(language), includeAdult: Plugin.Instance.Configuration.IncludeAdult, year: year, cancellationToken: cancellationToken)
+                .SearchMovieAsync(name, TmdbUtils.NormalizeLanguage(language, countryCode), includeAdult: Plugin.Instance.Configuration.IncludeAdult, year: year, cancellationToken: cancellationToken)
                .ConfigureAwait(false);

            if (searchResults.Results.Count > 0)
@@ -469,9 +480,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
        /// </summary>
        /// <param name="name">The name of the collection.</param>
        /// <param name="language">The collection's language.</param>
+        /// <param name="countryCode">The country code, ISO 3166-1.</param>
        /// <param name="cancellationToken">The cancellation token.</param>
        /// <returns>The TMDb collection information.</returns>
-        public async Task<IReadOnlyList<SearchCollection>> SearchCollectionAsync(string name, string language, CancellationToken cancellationToken)
+        public async Task<IReadOnlyList<SearchCollection>> SearchCollectionAsync(string name, string language, string? countryCode, CancellationToken cancellationToken)
        {
            var key = $"collectionsearch-{name}-{language}";
            if (_memoryCache.TryGetValue(key, out SearchContainer<SearchCollection>? collections) && collections is not null)
@@ -482,7 +494,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
            await EnsureClientConfigAsync().ConfigureAwait(false);

            var searchResults = await _tmDbClient
-                .SearchCollectionAsync(name, TmdbUtils.NormalizeLanguage(language), cancellationToken: cancellationToken)
+                .SearchCollectionAsync(name, TmdbUtils.NormalizeLanguage(language, countryCode), cancellationToken: cancellationToken)
                .ConfigureAwait(false);

            if (searchResults.Results.Count > 0)
@@ -105,14 +105,15 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
        /// Normalizes a language string for use with TMDb's include image language parameter.
        /// </summary>
        /// <param name="preferredLanguage">The preferred language as either a 2 letter code with or without country code.</param>
+        /// <param name="countryCode">The country code, ISO 3166-1.</param>
        /// <returns>The comma separated language string.</returns>
-        public static string GetImageLanguagesParam(string preferredLanguage)
+        public static string GetImageLanguagesParam(string preferredLanguage, string? countryCode = null)
        {
            var languages = new List<string>();

            if (!string.IsNullOrEmpty(preferredLanguage))
            {
-                preferredLanguage = NormalizeLanguage(preferredLanguage);
+                preferredLanguage = NormalizeLanguage(preferredLanguage, countryCode);

                languages.Add(preferredLanguage);

@@ -140,15 +141,24 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
        /// Normalizes a language string for use with TMDb's language parameter.
        /// </summary>
        /// <param name="language">The language code.</param>
+        /// <param name="countryCode">The country code.</param>
        /// <returns>The normalized language code.</returns>
        [return: NotNullIfNotNull(nameof(language))]
-        public static string? NormalizeLanguage(string? language)
+        public static string? NormalizeLanguage(string? language, string? countryCode = null)
        {
            if (string.IsNullOrEmpty(language))
            {
                return language;
            }

+            // Handle es-419 (Latin American Spanish) by converting to regional variant
+            if (string.Equals(language, "es-419", StringComparison.OrdinalIgnoreCase) && !string.IsNullOrEmpty(countryCode))
+            {
+                language = string.Equals(countryCode, "AR", StringComparison.OrdinalIgnoreCase)
+                    ? "es-AR"
+                    : "es-MX";
+            }
+
            // TMDb requires this to be uppercase
            // Everything after the hyphen must be written in uppercase due to a way TMDb wrote their API.
            // See here: https://www.themoviedb.org/talk/5119221d760ee36c642af4ad?page=3#56e372a0c3a3685a9e0019ab
@@ -185,7 +195,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb
                return requestLanguage;
            }

-            return imageLanguage;
+            // TMDb now returns xx for no language instead of an empty string.
+            return string.Equals(imageLanguage, "xx", StringComparison.OrdinalIgnoreCase)
+                ? string.Empty
+                : imageLanguage;
        }

        /// <summary>
@@ -107,6 +107,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
            // Additional Mappings
            _validProviderIds.Add("collectionnumber", "TmdbCollection");
            _validProviderIds.Add("tmdbcolid", "TmdbCollection");
+            _validProviderIds.Add("tmdbcol", "TmdbCollection");
            _validProviderIds.Add("imdb_id", "Imdb");

            Fetch(item, metadataFile, GetXmlReaderSettings(), cancellationToken);
@@ -315,7 +316,11 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                            if (userData is not null)
                            {
                                userData.Played = played;
-                                _userDataManager.SaveUserData(user, item, userData, UserDataSaveReason.Import, CancellationToken.None);
+
+                                if (!item.Id.IsEmpty())
+                                {
+                                    _userDataManager.SaveUserData(user, item, userData, UserDataSaveReason.Import, CancellationToken.None);
+                                }
                            }
                        }
                    }
@@ -332,7 +337,11 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                            if (userData is not null)
                            {
                                userData.PlayCount = count;
-                                _userDataManager.SaveUserData(user, item, userData, UserDataSaveReason.Import, CancellationToken.None);
+
+                                if (!item.Id.IsEmpty())
+                                {
+                                    _userDataManager.SaveUserData(user, item, userData, UserDataSaveReason.Import, CancellationToken.None);
+                                }
                            }
                        }
                    }
@@ -349,7 +358,11 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                            if (userData is not null)
                            {
                                userData.LastPlayedDate = lastPlayed;
-                                _userDataManager.SaveUserData(user, item, userData, UserDataSaveReason.Import, CancellationToken.None);
+
+                                if (!item.Id.IsEmpty())
+                                {
+                                    _userDataManager.SaveUserData(user, item, userData, UserDataSaveReason.Import, CancellationToken.None);
+                                }
                            }
                        }
                    }
@@ -590,7 +603,18 @@ namespace MediaBrowser.XbmcMetadata.Parsers

                    var provider = reader.GetAttribute("type");
                    var providerId = reader.ReadElementContentAsString();
-                    item.TrySetProviderId(provider, providerId);
+
+                    if (!string.IsNullOrEmpty(provider))
+                    {
+                        if (_validProviderIds.TryGetValue(provider, out string? normalizedProvider))
+                        {
+                            item.TrySetProviderId(normalizedProvider, providerId);
+                        }
+                        else
+                        {
+                            item.TrySetProviderId(provider, providerId);
+                        }
+                    }

                    break;
                case "thumb":
@@ -53,6 +53,33 @@ public static class JellyfinQueryHelperExtensions
        return baseQuery.Where(ReferencedItemFilterExpressionBuilder(context, itemValueType, referenceIds, invert));
    }

+    /// <summary>
+    /// Builds a query that checks referenced ItemValues for a cross BaseItem lookup.
+    /// </summary>
+    /// <param name="baseQuery">The source query.</param>
+    /// <param name="context">The database context.</param>
+    /// <param name="itemValueTypes">The type of item value to reference.</param>
+    /// <param name="referenceIds">The list of BaseItem ids to check matches.</param>
+    /// <param name="invert">If set an exclusion check is performed instead.</param>
+    /// <returns>A Query.</returns>
+    public static IQueryable<BaseItemEntity> WhereReferencedItemMultipleTypes(
+        this IQueryable<BaseItemEntity> baseQuery,
+        JellyfinDbContext context,
+        IList<ItemValueType> itemValueTypes,
+        IList<Guid> referenceIds,
+        bool invert = false)
+    {
+        var itemFilter = OneOrManyExpressionBuilder<BaseItemEntity, Guid>(referenceIds, f => f.Id);
+
+        return baseQuery.Where(item =>
+            context.ItemValues
+                .Join(context.ItemValuesMap, e => e.ItemValueId, e => e.ItemValueId, (itemVal, map) => new { itemVal, map })
+                .Any(val =>
+                    itemValueTypes.Contains(val.itemVal.Type)
+                    && context.BaseItems.Where(itemFilter).Any(e => e.CleanName == val.itemVal.CleanValue)
+                    && val.map.ItemId == item.Id) == EF.Constant(!invert));
+    }
+
    /// <summary>
    /// Builds a query expression that checks referenced ItemValues for a cross BaseItem lookup.
    /// </summary>
@@ -12,7 +12,7 @@ public class PeopleBaseItemMapConfiguration : IEntityTypeConfiguration<PeopleBas
    /// <inheritdoc/>
    public void Configure(EntityTypeBuilder<PeopleBaseItemMap> builder)
    {
-        builder.HasKey(e => new { e.ItemId, e.PeopleId });
+        builder.HasKey(e => new { e.ItemId, e.PeopleId, e.Role });
        builder.HasIndex(e => new { e.ItemId, e.SortOrder });
        builder.HasIndex(e => new { e.ItemId, e.ListOrder });
        builder.HasOne(e => e.Item);
@@ -10,6 +10,28 @@ namespace Jellyfin.Server.Implementations.Migrations
        /// <inheritdoc />
        protected override void Up(MigrationBuilder migrationBuilder)
        {
+            migrationBuilder.Sql("""
+DELETE FROM BaseItems
+        WHERE
+        ParentId IS NOT NULL
+        AND
+        NOT EXISTS(SELECT 1 FROM BaseItems parent WHERE parent.Id = BaseItems.ParentId);
+DELETE FROM BaseItems
+        WHERE
+        ParentId IS NOT NULL
+        AND
+        NOT EXISTS(SELECT 1 FROM BaseItems parent WHERE parent.Id = BaseItems.ParentId);
+DELETE FROM BaseItems
+        WHERE
+        ParentId IS NOT NULL
+        AND
+        NOT EXISTS(SELECT 1 FROM BaseItems parent WHERE parent.Id = BaseItems.ParentId);
+DELETE FROM BaseItems
+        WHERE
+        ParentId IS NOT NULL
+        AND
+        NOT EXISTS(SELECT 1 FROM BaseItems parent WHERE parent.Id = BaseItems.ParentId);
+""");
            migrationBuilder.AddForeignKey(
                name: "FK_BaseItems_BaseItems_ParentId",
                table: "BaseItems",
@@ -0,0 +1,54 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Jellyfin.Server.Implementations.Migrations
+{
+    /// <inheritdoc />
+    public partial class ExtendPeopleMapKey : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_PeopleBaseItemMap",
+                table: "PeopleBaseItemMap");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Role",
+                table: "PeopleBaseItemMap",
+                type: "TEXT",
+                nullable: false,
+                defaultValue: string.Empty,
+                oldClrType: typeof(string),
+                oldType: "TEXT",
+                oldNullable: true);
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_PeopleBaseItemMap",
+                table: "PeopleBaseItemMap",
+                columns: new[] { "ItemId", "PeopleId", "Role" });
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropPrimaryKey(
+                name: "PK_PeopleBaseItemMap",
+                table: "PeopleBaseItemMap");
+
+            migrationBuilder.AlterColumn<string>(
+                name: "Role",
+                table: "PeopleBaseItemMap",
+                type: "TEXT",
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "TEXT");
+
+            migrationBuilder.AddPrimaryKey(
+                name: "PK_PeopleBaseItemMap",
+                table: "PeopleBaseItemMap",
+                columns: new[] { "ItemId", "PeopleId" });
+        }
+    }
+}
@@ -999,16 +999,16 @@ namespace Jellyfin.Server.Implementations.Migrations
                    b.Property<Guid>("PeopleId")
                        .HasColumnType("TEXT");

-                    b.Property<int?>("ListOrder")
-                        .HasColumnType("INTEGER");
-
                    b.Property<string>("Role")
                        .HasColumnType("TEXT");

+                    b.Property<int?>("ListOrder")
+                        .HasColumnType("INTEGER");
+
                    b.Property<int?>("SortOrder")
                        .HasColumnType("INTEGER");

-                    b.HasKey("ItemId", "PeopleId");
+                    b.HasKey("ItemId", "PeopleId", "Role");

                    b.HasIndex("PeopleId");

@@ -29,6 +29,7 @@ namespace Jellyfin.Providers.Tests.Tmdb
        [InlineData("fr-CA", "fr-BE", "fr-CA")]
        [InlineData("fr-CA", "fr", "fr-CA")]
        [InlineData("de", "en-US", "de")]
+        [InlineData("", "en-US", "")]
        public static void AdjustImageLanguage_Valid_Success(string imageLanguage, string requestLanguage, string? expected)
        {
            Assert.Equal(expected, TmdbUtils.AdjustImageLanguage(imageLanguage, requestLanguage));
@@ -275,5 +275,24 @@ namespace Jellyfin.XbmcMetadata.Tests.Parsers
            Assert.StartsWith(">>", item.Overview, StringComparison.InvariantCulture);
            Assert.EndsWith("<<", item.Overview, StringComparison.InvariantCulture);
        }
+
+        [Fact]
+        public void Parse_TmdbcolUniqueId_NormalizedToTmdbCollection()
+        {
+            var result = new MetadataResult<Video>()
+            {
+                Item = new Movie()
+            };
+
+            _parser.Fetch(result, "Test Data/Lilo & Stitch.nfo", CancellationToken.None);
+            var item = (Movie)result.Item;
+
+            // Verify that <uniqueid type="tmdbcol"> is normalized to TmdbCollection
+            Assert.True(item.ProviderIds.ContainsKey(MetadataProvider.TmdbCollection.ToString()));
+            Assert.Equal("97020", item.ProviderIds[MetadataProvider.TmdbCollection.ToString()]);
+
+            // Verify that the lowercase "tmdbcol" is NOT in the provider IDs
+            Assert.False(item.ProviderIds.ContainsKey("tmdbcol"));
+        }
    }
 }
@@ -2,6 +2,7 @@
 <movie>
  <title>Lilo &amp; Stitch</title>
  <originaltitle>Lilo &amp; Stitch</originaltitle>
+  <uniqueid type="tmdbcol" default="false">97020</uniqueid>
  <set>Lilo &amp; Stitch Collection</set>
  <plot>&gt;&gt;As Stitch, a runaway genetic experiment from a faraway planet, wreaks havoc on the Hawaiian Islands, he becomes the mischievous adopted alien "puppy" of an independent little girl named Lilo and learns about loyalty, friendship, and ʻohana, the Hawaiian tradition of family.&lt;&lt;</plot>
 </movie>
Author	SHA1	Message	Date
Jellyfin Release Bot	877251bcae	Bump version to 10.11.0	2025-10-19 20:45:12 -04:00
Bond-009	ace30afcf8	Merge pull request #15016 from jellyfin/renovate/ci-deps Update github/codeql-action action to v4.30.9	2025-10-19 11:14:52 +02:00
rimasx	fc056b6273	Translated using Weblate (Estonian) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/et/	2025-10-19 05:33:11 +00:00
rimasx	ac5efb4775	Translated using Weblate (Estonian) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/et/	2025-10-18 11:54:27 +00:00
renovate[bot]	fefd676adc	Update github/codeql-action action to v4.30.9	2025-10-17 15:56:06 +00:00
Bond-009	59c17a663c	Merge pull request #15006 from jellyfin/renovate/dotnet-monorepo Update dependency dotnet-ef to v9.0.10	2025-10-15 17:39:47 +02:00
Bond-009	641551e164	Merge pull request #15007 from jellyfin/renovate/microsoft Update Microsoft to 9.0.10	2025-10-15 17:39:32 +02:00
renovate[bot]	bd543d7ac3	Update Microsoft to 9.0.10	2025-10-15 00:34:53 +00:00
renovate[bot]	545e412259	Update dependency dotnet-ef to v9.0.10	2025-10-15 00:34:44 +00:00
Cody Robibero	7dff92bb82	Use TryAdd instead of Add (#14997 )	2025-10-13 22:18:37 +02:00
Cody Robibero	b36aab9399	Validate encoder path (#14996 )	2025-10-13 14:16:05 -06:00
Erik W	2c7d2d4719	Handle es-419 in TMDb (#14946 )	2025-10-13 13:47:16 -06:00
Tim Eisele	5c519270b8	Remove chapters on file change (#14984 )	2025-10-13 12:32:41 -06:00
theguymadmax	55047b1183	Fix exception when saving user data to NFO files (#14993 )	2025-10-13 10:09:40 -06:00
theguymadmax	794e1361d7	Fix contributing artist query (#14991 )	2025-10-13 09:09:09 -06:00
kreaxv	27c9c9c0ed	Translated using Weblate (Mongolian) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/mn/	2025-10-13 12:42:46 +00:00
rimasx	68636b2390	Translated using Weblate (Estonian) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/et/	2025-10-12 18:15:54 +00:00
Joshua M. Boniface	2e6430c4f4	Merge pull request #14965 from KGT1/mapTmdbcol add xmbc nfo uniqueid type norminalisation	2025-10-11 17:21:32 -04:00
Joshua M. Boniface	c88d792963	Merge pull request #14960 from karm235/13697-fix-lufs-detection Fix LUFS detection deadlock per issue #13697	2025-10-11 17:20:52 -04:00
Joshua M. Boniface	73dbc9e89f	Merge pull request #14978 from theguymadmax/fix-playlistfolder Prevent PlaylistsFolder deletion during library removal	2025-10-11 17:20:40 -04:00
Joshua M. Boniface	cf3edd9875	Merge pull request #14971 from theguymadmax/skip-artist-album-persontype Skip creating Person entities for Artist and AlbumArtist types	2025-10-11 17:20:31 -04:00
Joshua M. Boniface	ef0131ad69	Merge pull request #14976 from JPVenson/bugfix/ItemCounterSorting apply sort on ItemValue query	2025-10-11 17:20:23 -04:00
rimasx	056c318f04	Translated using Weblate (Estonian) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/et/	2025-10-11 11:46:41 +00:00
theguymadmax	49c3443b0c	Prevent PlaylistsFolder deletion during library removal	2025-10-10 18:34:37 -04:00
Bond-009	e415718fe7	Merge pull request #14975 from jellyfin/renovate/ci-deps Update github/codeql-action action to v4.30.8	2025-10-10 22:09:46 +02:00
JPVenson	8abcfb2a80	Fix ordering query	2025-10-10 20:08:59 +00:00
Bond-009	9aadf97958	Merge pull request #14945 from jellyfin/renovate/asynckeyedlock-7.x Update dependency AsyncKeyedLock to 7.1.7	2025-10-10 18:10:38 +02:00
renovate[bot]	9e57121171	Update github/codeql-action action to v4.30.8	2025-10-10 16:02:22 +00:00
Bond-009	b471811920	Merge pull request #14959 from jellyfin/renovate/github-codeql-action-4.x Update github/codeql-action action to v4	2025-10-10 18:01:21 +02:00
renovate[bot]	3cb99add76	Update github/codeql-action action to v4	2025-10-10 15:51:16 +00:00
Bond-009	001f1c4377	Merge pull request #14954 from jellyfin/renovate/ci-deps Update CI dependencies	2025-10-10 17:50:15 +02:00
Bond-009	9ef3706b44	Merge pull request #14969 from theguymadmax/fix-artist-external-id Fix artist external Url	2025-10-10 17:49:39 +02:00
rimasx	864d6d0b8f	Translated using Weblate (Estonian) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/et/	2025-10-10 10:58:43 +00:00
faquino	a565e4896e	Translated using Weblate (Galician) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/gl/	2025-10-10 10:58:43 +00:00
JPVenson	ceef9143ad	cleanup	2025-10-10 09:18:05 +00:00
JPVenson	a7a92509c7	fixes #14952 apply sort on ItemValue query	2025-10-10 09:10:21 +00:00
taham	e876e784da	Translated using Weblate (Urdu) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ur/	2025-10-10 05:25:11 +00:00
taham	9b7d5edc86	Translated using Weblate (Urdu (Pakistan)) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ur_PK/	2025-10-10 05:25:10 +00:00
JPVenson	f01cddf273	Add migration attribute	2025-10-09 19:45:43 +00:00
JPVenson	0d4bd0495b	Add migration to remove artist and album artists from database	2025-10-09 19:44:07 +00:00
theguymadmax	6f9c4dea6e	Skip creating Person entities for Artist and AlbumArtist types	2025-10-09 11:00:36 -05:00
rimasx	8c51920911	Translated using Weblate (Estonian) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/et/	2025-10-09 12:39:38 +00:00
faquino	8f2fd65810	Translated using Weblate (Galician) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/gl/	2025-10-09 12:39:38 +00:00
rimasx	953659980f	Translated using Weblate (Estonian) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/et/	2025-10-09 10:47:27 +00:00
renovate[bot]	8ab1fecb70	Update CI dependencies	2025-10-09 10:20:29 +00:00
theguymadmax	f5d42ee180	Fix artist external Url	2025-10-09 01:14:49 -05:00
KGT1	e28d547006	add test for new uniqueid nfo key normalisation	2025-10-08 15:32:30 +00:00
KGT1	b3b9f74014	also apply provider normalisation on uniqueid type tag	2025-10-08 15:23:50 +00:00
theguymadmax	07d31c6ba5	Improve performance on people query (#14963 )	2025-10-08 09:23:20 -06:00
KGT1	a9198e865e	map tmdbcol nfo property to TmdbCollection	2025-10-08 14:33:50 +00:00
theguymadmax	79ff0b0b00	Fix collections folder duplication (#14925 )	2025-10-08 08:32:00 -06:00
theguymadmax	2b45a984dd	Clean up missing image references (#14962 )	2025-10-08 08:23:12 -06:00
Milo Ivir	739642b330	Translated using Weblate (Croatian) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/hr/	2025-10-07 19:45:38 +00:00
karm235	6097045d71	cleanup	2025-10-07 12:20:08 -05:00
karm235	51e20a14c2	Fix LUFS detection deadlock on albums with verbose output	2025-10-07 12:11:02 -05:00
rimasx	eb0d05cf1e	Translated using Weblate (Estonian) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/et/	2025-10-06 08:38:24 +00:00
Bond-009	d3d5915f31	Truncate password reset file on open for writing (#14948 )	2025-10-05 11:24:12 -06:00
Bond-009	288640a5d0	Merge pull request #14940 from jellyfin/renovate/ci-deps Update actions/stale action to v10.1.0	2025-10-04 21:15:57 +02:00
Cody Robibero	ff0a1b999f	Handle xx as TMDb no language for backdrops (#14941 )	2025-10-04 21:04:35 +02:00
renovate[bot]	da0fe7455e	Update dependency AsyncKeyedLock to 7.1.7	2025-10-04 14:59:22 +00:00
Thomas Jones	bf69f9d8a8	Validate wizard-created libraries immediately instead of only doing it after a library refresh was triggered (#14942 ) Co-authored-by: Derpipose <90276123+Derpipose@users.noreply.github.com>	2025-10-04 08:58:51 -06:00
Nyanmisaka	badf22fcc2	Limit decoder thread count on AMD AMF to save VRAM (#14943 )	2025-10-04 08:04:25 -06:00
renovate[bot]	b59e9f90f0	Update actions/stale action to v10.1.0	2025-10-03 22:04:26 +00:00
renovate[bot]	056b92dbd5	Update dependency Microsoft.NET.Test.Sdk to v18 (#14930 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-10-02 17:34:06 -06:00
renovate[bot]	ba80f5e416	Update peter-evans/create-or-update-comment action to v5 (#14933 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-10-02 17:33:54 -06:00
lostb1t	97ec4c1da2	fix: get total count after grouping (#14931 )	2025-10-02 17:33:50 -06:00
renovate[bot]	894ba1a410	Update github/codeql-action action to v3.30.6 (#14932 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-10-02 17:33:37 -06:00
gnattu	0a0aaefad5	Fix mka-style tagging key (#14936 )	2025-10-02 17:33:31 -06:00
JPVenson	c8b97bf533	Readd wildcard search (#14934 )	2025-10-02 17:33:01 -06:00
Bond-009	cfa4e357ea	Merge pull request #14923 from jellyfin/renovate/peter-evans-find-comment-4.x Update peter-evans/find-comment action to v4	2025-10-02 20:50:59 +02:00
theguymadmax	0f42aa892e	Fix BoxSet sorting (#14919 ) Co-authored-by: Cody Robibero <cody@robibe.ro>	2025-10-01 21:10:31 -06:00
JPVenson	cce6bf27e0	Add check for processing recursive data structures (#14897 )	2025-10-01 17:26:56 -06:00
theguymadmax	d6cebf1e67	Add tag filtering and random sorting to GetSimilarItems (#14918 )	2025-10-01 17:26:48 -06:00
theguymadmax	c053a6cd78	Fix parental ratings logic (#14909 )	2025-10-01 17:26:30 -06:00
renovate[bot]	d8c62420bf	Update peter-evans/find-comment action to v4	2025-10-01 22:51:24 +00:00
Joshua M. Boniface	d483c3efe6	Merge pull request #14887 from JPVenson/bugfix/fixMigrationReferences Add explicit reference check to migration	2025-09-28 12:44:09 -04:00
Joshua M. Boniface	275c1a3cc1	Merge pull request #14883 from crobibero/code-analysis Only include custom code analysis for debug builds	2025-09-28 12:34:21 -04:00
Joshua M. Boniface	4942b2c15f	Merge pull request #14890 from nielsvanvelzen/destructive-migration Fix AddProperParentChildRelationBaseItemWithCascade migration deleting all items	2025-09-28 12:26:40 -04:00
Niels van Velzen	3fc71293b4	Fix AddProperParentChildRelationBaseItemWithCascade migration deleting all items	2025-09-28 13:14:10 +02:00
JPVenson	8ea9bece03	Add explicit reference check to migration	2025-09-28 08:46:31 +00:00
Nicolas N	baa7f5f0b0	Translated using Weblate (Haitian) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ht/	2025-09-28 06:47:40 +00:00
Cody Robibero	b9c96f3d2c	Revert "Add Jellyfin.CodeAnalysis project to abi diff (#14875 )" This reverts commit `526ec83305`.	2025-09-27 16:41:01 -06:00
Cody Robibero	08f9b932ac	Only include CodeAnalysis in debug mode	2025-09-27 16:39:40 -06:00
daswesen123	e6cd73df03	Translated using Weblate (English (Pirate)) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/en@pirate/	2025-09-27 22:14:14 +00:00
Corentin Malbet	71ebb1f456	Fixing the UFID field value giving a warning and not being correctly processed (#14851 )	2025-09-26 14:24:59 -06:00
Tim Eisele	9c298c52f5	Expose ExtractAllExtractableSubtitles (#14876 )	2025-09-26 13:45:01 -06:00
Niels van Velzen	3e8db40901	Merge pull request #14874 from jellyfin/renovate/polly-monorepo Update dependency Polly to 8.6.4	2025-09-26 21:39:47 +02:00
Niels van Velzen	f9ead9615c	Merge pull request #14855 from jellyfin/renovate/ci-deps Update CI dependencies	2025-09-26 21:39:16 +02:00
Niels van Velzen	93af2d6f67	Merge pull request #14873 from theguymadmax/use-listorder Restore NFO/import ordering by using ListOrder instead of SortOrder	2025-09-26 21:38:29 +02:00
renovate[bot]	027c91949d	Update CI dependencies	2025-09-26 17:50:59 +00:00
JPVenson	526ec83305	Add Jellyfin.CodeAnalysis project to abi diff (#14875 )	2025-09-26 11:49:51 -06:00
renovate[bot]	dfcacce1b0	Update dependency Polly to 8.6.4	2025-09-26 15:13:09 +00:00
theguymadmax	2a54669a8a	Restore NFO/import ordering by using ListOrder instead of SortOrder	2025-09-26 10:49:38 -04:00
JPVenson	54d48fa446	Fix people deduplication lookup (#14864 )	2025-09-25 19:27:38 -06:00
JPVenson	1736a566cc	Fixes FK on unconnected base items (#14863 )	2025-09-25 19:27:17 -06:00
gnattu	04ab362e59	Revert "Update skiasharp monorepo (#14849 )" (#14862 )	2025-09-25 16:05:04 +02:00
JPVenson	e282b05b8f	fixes #14859 Add Check for ItemValues (#14860 )	2025-09-25 08:02:20 -06:00