Merge pull request #17709 from Shadowghost/fix-people-task-perist

Persist the refresh stamp so the people task stops redoing its work
Merge pull request #17715 from Shadowghost/fix-people-cleanup
2026-08-25 19:10:44 -04:00 · 2026-08-25 18:28:52 -04:00 · 2026-08-25 18:26:50 -04:00 · 2026-08-25 18:26:09 -04:00 · 2026-08-25 18:24:46 -04:00 · 2026-08-25 18:23:42 -04:00
144 changed files with 9404 additions and 1082 deletions
@@ -3,7 +3,7 @@
  "isRoot": true,
  "tools": {
    "dotnet-ef": {
-      "version": "10.0.10",
+      "version": "10.0.11",
      "commands": [
        "dotnet-ef"
      ]
@@ -32,13 +32,13 @@ jobs:
        dotnet-version: '10.0.x'

    - name: Initialize CodeQL
-      uses: github/codeql-action/init@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
+      uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
      with:
        languages: ${{ matrix.language }}
        queries: +security-extended

    - name: Autobuild
-      uses: github/codeql-action/autobuild@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
+      uses: github/codeql-action/autobuild@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7

    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@5595ccaf912efad79be6eef63a5619ff05969be3 # v4.37.6
+      uses: github/codeql-action/analyze@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
@@ -143,6 +143,7 @@
 - [Smith00101010](https://github.com/Smith00101010)
 - [sorinyo2004](https://github.com/sorinyo2004)
 - [Soumyadip Auddy](https://github.com/SoumyadipAuddy)
+ - [st7105](https://github.com/st7105)
 - [sparky8251](https://github.com/sparky8251)
 - [spookbits](https://github.com/spookbits)
 - [ssenart](https://github.com/ssenart)
@@ -237,6 +238,8 @@
 - [elio42](https://github.com/elio42)
 - [rwebster85](https://github.com/rwebster85)
 - [Florin-Popescu](https://github.com/Florin-Popescu)
+ - [m0g3r](https://github.com/m0g3r)
+ - [martin-77](https://github.com/martin-77)

 # Emby Contributors

@@ -247,7 +250,7 @@
 - [Mark2xv](https://github.com/Mark2xv)
 - [ScottRapsey](https://github.com/ScottRapsey)
 - [skynet600](https://github.com/skynet600)
- - [Cheesegeezer](https://githum.com/Cheesegeezer)
+ - [Cheesegeezer](https://github.com/Cheesegeezer)
 - [Radeon](https://github.com/radeonorama)
 - [gcw07](https://github.com/gcw07)
 - [SivaramAdhiappan](https://github.com/shivaram1190)
@@ -26,28 +26,28 @@
    <PackageVersion Include="libse" Version="4.0.12" />
    <PackageVersion Include="LrcParser" Version="2025.623.0" />
    <PackageVersion Include="MetaBrainz.MusicBrainz" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="10.0.10" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.10" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.11" />
    <PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="5.6.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.6.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.6.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.6.0" />
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.10" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.10" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.10" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.10" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.10" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.10" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.10" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.10" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.10" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.10" />
-    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="10.0.10" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.10" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.10" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.10" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.10" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.9.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.9.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.9.0" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
    <PackageVersion Include="MimeTypes" Version="2.5.2" />
    <PackageVersion Include="Morestachio" Version="5.0.1.670" />
    <PackageVersion Include="Moq" Version="4.18.4" />
@@ -78,11 +78,11 @@
    <PackageVersion Include="Svg.Skia" Version="3.7.0" />
    <PackageVersion Include="Swashbuckle.AspNetCore.ReDoc" Version="10.2.3" />
    <PackageVersion Include="Swashbuckle.AspNetCore" Version="10.2.3" />
-    <PackageVersion Include="System.Text.Json" Version="10.0.10" />
+    <PackageVersion Include="System.Text.Json" Version="10.0.11" />
    <PackageVersion Include="TagLibSharp" Version="2.3.0" />
-    <PackageVersion Include="z440.atl.core" Version="7.15.3" />
+    <PackageVersion Include="z440.atl.core" Version="7.16.0" />
    <PackageVersion Include="TMDbLib" Version="3.0.0" />
-    <PackageVersion Include="UTF.Unknown" Version="2.6.0" />
+    <PackageVersion Include="UTF.Unknown" Version="2.7.0" />
    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
    <PackageVersion Include="xunit.v3" Version="3.2.2" />
    <PackageVersion Include="Xunit.v3.Priority" Version="1.1.18" />
@@ -151,7 +151,7 @@ namespace Emby.Naming.Common

            CleanStrings =
            [
-                @"^\s*(?<cleaned>.+?)[ _\,\.\(\)\[\]\-](3d|sbs|tab|hsbs|htab|mvc|HDR|HDC|UHD|UltraHD|4k|ac3|dts|custom|dc|divx|divx5|dsr|dsrip|dutch|dvd|dvdrip|dvdscr|dvdscreener|screener|dvdivx|cam|fragment|fs|hdtv|hdrip|hdtvrip|internal|limited|multi|subs|ntsc|ogg|ogm|pal|pdtv|proper|repack|rerip|retail|cd[1-9]|r5|bd5|bd|se|svcd|swedish|german|read.nfo|nfofix|unrated|ws|telesync|ts|telecine|tc|brrip|bdrip|480p|480i|576p|576i|720p|720i|1080p|1080i|2160p|hrhd|hrhdtv|hddvd|bluray|blu-ray|x264|x265|h264|h265|xvid|xvidvd|xxx|www.www|AAC|DTS)(?=[ _\,\.\(\)\[\]\-]|$)",
+                @"^\s*(?<cleaned>.+?)[ _\,\.\(\)\[\]\-](3d|sbs|tab|hsbs|htab|mvc|HDR|HDC|UHD|UltraHD|4k|ac3|dts|custom|dc|divx|divx5|dsr|dsrip|dutch|dvd|dvdrip|dvdscr|dvdscreener|screener|dvdivx|cam|fragment|fs|hdtv|hdrip|hdtvrip|internal|limited|multi|subs|ntsc|ogg|ogm|pal|pdtv|proper|repack|rerip|retail|cd[1-9]|r5|bd5|bd|se|svcd|swedish|german|read.nfo|nfofix|unrated|ws|web-dl|telesync|ts|telecine|tc|brrip|bdrip|480p|480i|576p|576i|720p|720i|1080p|1080i|2160p|hrhd|hrhdtv|hddvd|bluray|blu-ray|x264|x265|h264|h265|xvid|xvidvd|xxx|www.www|AAC|DTS)(?=[ _\,\.\(\)\[\]\-]|$)",
                @"^\s*(?<cleaned>.+?)((\s*\[[^\]]+\]\s*)+)(\.[^\s]+)?$",
                @"^\s*(?<cleaned>.+?)\WE[0-9]+(-|~)E?[0-9]+(\W|$)",
                @"^\s*\[[^\]]+\](?!\.\w+$)\s*(?<cleaned>.+)",
@@ -107,7 +107,8 @@ namespace Emby.Server.Implementations.Collections
                SaveLocalMetadata = true
            };

-            var name = _localizationManager.GetLocalizedString("Collections");
+            // This names a library for the whole server, so ignore the requesting client's language.
+            var name = _localizationManager.GetServerLocalizedString("Collections");

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

@@ -1914,14 +1914,14 @@ namespace Emby.Server.Implementations.Library
            }

            // Optimize by querying against top level views
-            query.TopParentIds = parents.SelectMany(i => GetTopParentIdsForQuery(i, query.User)).ToArray();
-            query.AncestorIds = [];
-
-            // Prevent searching in all libraries due to empty filter
-            if (query.TopParentIds.Length == 0)
+            var topParentIds = parents.SelectMany(i => GetTopParentIdsForQuery(i, query.User)).ToArray();
+            if (topParentIds.Length == 0)
            {
-                query.TopParentIds = [Guid.NewGuid()];
+                return;
            }
+
+            query.TopParentIds = topParentIds;
+            query.AncestorIds = [];
        }

        public QueryResult<(BaseItem Item, ItemCounts ItemCounts)> GetAlbumArtists(InternalItemsQuery query)
@@ -1967,12 +1967,15 @@ namespace Emby.Server.Implementations.Library
            if (parents.All(i => i is ICollectionFolder || i is UserView))
            {
                // Optimize by querying against top level views
-                query.TopParentIds = parents.SelectMany(i => GetTopParentIdsForQuery(i, query.User)).ToArray();
+                var topParentIds = parents.SelectMany(i => GetTopParentIdsForQuery(i, query.User)).ToArray();

-                // Prevent searching in all libraries due to empty filter
-                if (query.TopParentIds.Length == 0)
+                if (topParentIds.Length > 0)
                {
-                    query.TopParentIds = [Guid.NewGuid()];
+                    query.TopParentIds = topParentIds;
+                }
+                else
+                {
+                    SetAncestorIds(query, parents);
                }
            }
            else if (parents.Count == 1 && parents.First() is Folder folder
@@ -1996,19 +1999,24 @@ namespace Emby.Server.Implementations.Library
            }
            else
            {
-                // We need to be able to query from any arbitrary ancestor up the tree
-                query.AncestorIds = parents.SelectMany(i => i.GetIdsForAncestorQuery()).ToArray();
-
-                // Prevent searching in all libraries due to empty filter
-                if (query.AncestorIds.Length == 0)
-                {
-                    query.AncestorIds = [Guid.NewGuid()];
-                }
+                SetAncestorIds(query, parents);
            }

            query.Parent = null;
        }

+        private static void SetAncestorIds(InternalItemsQuery query, IReadOnlyCollection<BaseItem> parents)
+        {
+            // We need to be able to query from any arbitrary ancestor up the tree
+            query.AncestorIds = parents.SelectMany(i => i.GetIdsForAncestorQuery()).ToArray();
+
+            // Prevent searching in all libraries due to empty filter
+            if (query.AncestorIds.Length == 0)
+            {
+                query.AncestorIds = [Guid.NewGuid()];
+            }
+        }
+
        private void AddUserToQuery(InternalItemsQuery query, User user, bool allowExternalContent = true)
        {
            if (query.User is null)
@@ -2519,9 +2527,15 @@ namespace Emby.Server.Implementations.Library
                    }
                }

-                if (!File.Exists(image.Path))
+                if (string.IsNullOrEmpty(image.Path) || !File.Exists(image.Path))
                {
-                    _logger.LogWarning("Image not found at {ImagePath}", image.Path);
+                    _logger.LogWarning(
+                        "{ImageType} image for {ItemName} ({ItemId}) not found at \"{ImagePath}\", source was {SourcePath}",
+                        img.Type,
+                        item.Name,
+                        item.Id,
+                        image.Path,
+                        img.Path);
                    continue;
                }

@@ -2919,7 +2933,8 @@ namespace Emby.Server.Implementations.Library
                "views",
                _fileSystem.GetValidFilename(viewType.ToString()));

-            var id = GetNewItemId(path + "_namedview_" + name, typeof(UserView));
+            // The display name is localized, so it must not take part in the id.
+            var id = GetNewItemId(path + "_namedview_" + viewType.ToString(), typeof(UserView));

            var item = GetItemById(id) as UserView;

@@ -2943,6 +2958,13 @@ namespace Emby.Server.Implementations.Library

                refresh = true;
            }
+            else if (!string.Equals(item.Name, name, StringComparison.Ordinal))
+            {
+                item.Name = name;
+                item.ForcedSortName = sortName;
+
+                refresh = true;
+            }

            if (refresh)
            {
@@ -2963,7 +2985,9 @@ namespace Emby.Server.Implementations.Library
            var parentIdString = parentId.IsEmpty()
                ? null
                : parentId.ToString("N", CultureInfo.InvariantCulture);
-            var idValues = "38_namedview_" + name + user.Id.ToString("N", CultureInfo.InvariantCulture) + (parentIdString ?? string.Empty) + (viewType?.ToString() ?? string.Empty);
+
+            // The name is either localized (grouped views) or the library folder's own name.
+            var idValues = "38_namedview_" + user.Id.ToString("N", CultureInfo.InvariantCulture) + (parentIdString ?? string.Empty) + (viewType?.ToString() ?? string.Empty);

            var id = GetNewItemId(idValues, typeof(UserView));

@@ -2993,6 +3017,11 @@ namespace Emby.Server.Implementations.Library

                isNew = true;
            }
+            else if (!string.Equals(item.Name, name, StringComparison.Ordinal))
+            {
+                item.Name = name;
+                item.UpdateToRepositoryAsync(ItemUpdateType.MetadataEdit, CancellationToken.None).GetAwaiter().GetResult();
+            }

            var lastRefreshedUtc = item.DateLastRefreshed;
            var refresh = isNew || DateTime.UtcNow - lastRefreshedUtc >= _viewRefreshInterval;
@@ -3094,7 +3123,7 @@ namespace Emby.Server.Implementations.Library
            var parentIdString = parentId.IsEmpty()
                ? null
                : parentId.ToString("N", CultureInfo.InvariantCulture);
-            var idValues = "37_namedview_" + name + (parentIdString ?? string.Empty) + (viewType?.ToString() ?? string.Empty);
+            var idValues = "37_namedview_" + (parentIdString ?? string.Empty) + (viewType?.ToString() ?? string.Empty);
            if (!string.IsNullOrEmpty(uniqueId))
            {
                idValues += uniqueId;
@@ -3128,9 +3157,10 @@ namespace Emby.Server.Implementations.Library
                isNew = true;
            }

-            if (viewType != item.ViewType)
+            if (viewType != item.ViewType || !string.Equals(item.Name, name, StringComparison.Ordinal))
            {
                item.ViewType = viewType;
+                item.Name = name;
                item.UpdateToRepositoryAsync(ItemUpdateType.MetadataEdit, CancellationToken.None).GetAwaiter().GetResult();
            }

@@ -3550,6 +3580,12 @@ namespace Emby.Server.Implementations.Library
            return _peopleRepository.GetPeopleNames(query);
        }

+        /// <inheritdoc/>
+        public int DeleteOrphanedCredits()
+        {
+            return _peopleRepository.DeleteOrphanedCredits();
+        }
+
        /// <inheritdoc/>
        public IReadOnlyDictionary<Guid, IReadOnlyList<string>> GetPeopleNamesByItems(IReadOnlyList<Guid> itemIds, IReadOnlyList<string> personTypes)
        {
@@ -3595,7 +3631,20 @@ namespace Emby.Server.Implementations.Library

                    await item.UpdateToRepositoryAsync(ItemUpdateType.ImageUpdate, CancellationToken.None).ConfigureAwait(false);

-                    return item.GetImageInfo(image.Type, imageIndex);
+                    var localImage = item.GetImageInfo(image.Type, imageIndex);
+                    if (localImage is null)
+                    {
+                        throw new InvalidOperationException(string.Format(
+                            CultureInfo.InvariantCulture,
+                            "Downloaded {0} image {1} from {2} is not attached to {3} ({4})",
+                            image.Type,
+                            imageIndex,
+                            url,
+                            item.Name,
+                            item.Id));
+                    }
+
+                    return localImage;
                }
                catch (HttpRequestException ex)
                {
@@ -3617,7 +3666,13 @@ namespace Emby.Server.Implementations.Library
                await item.UpdateToRepositoryAsync(ItemUpdateType.ImageUpdate, CancellationToken.None).ConfigureAwait(false);
            }

-            throw new InvalidOperationException("Unable to convert any images to local");
+            throw new InvalidOperationException(string.Format(
+                CultureInfo.InvariantCulture,
+                "Unable to convert any {0} image url in \"{1}\" to a local file for {2} ({3})",
+                image.Type,
+                image.Path,
+                item.Name,
+                item.Id));
        }

        public async Task AddVirtualFolder(string name, CollectionTypeOptions? collectionType, LibraryOptions options, bool refreshLibrary)
@@ -99,7 +99,7 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
                        args.LibraryOptions.SeasonZeroDisplayName :
                        string.Format(
                            CultureInfo.InvariantCulture,
-                            _localization.GetLocalizedString("NameSeasonNumber"),
+                            _localization.GetServerLocalizedString("NameSeasonNumber"),
                            seasonNumber,
                            args.LibraryOptions.PreferredMetadataLanguage);
                }
@@ -112,7 +112,7 @@ namespace Emby.Server.Implementations.Library

            if (_config.Configuration.EnableFolderView)
            {
-                var name = _localizationManager.GetLocalizedString("Folders");
+                var name = _localizationManager.GetServerLocalizedString("Folders");
                list.Add(_libraryManager.GetNamedView(name, CollectionType.folders, string.Empty));
            }

@@ -168,7 +168,7 @@ namespace Emby.Server.Implementations.Library

        public UserView GetUserSubView(Guid parentId, CollectionType? type, string localizationKey, string sortName)
        {
-            var name = _localizationManager.GetLocalizedString(localizationKey);
+            var name = _localizationManager.GetServerLocalizedString(localizationKey);

            return GetUserSubViewWithName(name, parentId, type, sortName);
        }
@@ -191,7 +191,7 @@ namespace Emby.Server.Implementations.Library
                return GetUserView((Folder)parents[0], viewType, string.Empty);
            }

-            var name = _localizationManager.GetLocalizedString(localizationKey);
+            var name = _localizationManager.GetServerLocalizedString(localizationKey);
            return _libraryManager.GetNamedView(user, name, viewType, sortName);
        }

@@ -396,6 +396,12 @@ namespace Emby.Server.Implementations.Library
                    query.Limit = limit;
                    return _libraryManager.GetLatestItemList(query, parents, CollectionType.movies);
                }
+
+                if (collectionType is null)
+                {
+                    query.Limit = limit;
+                    return _libraryManager.GetLatestItemList(query, parents, CollectionType.unknown);
+                }
            }

            return _libraryManager.GetItemList(query, parents);
@@ -49,6 +49,14 @@ public class PeopleValidator
    /// <returns>Task.</returns>
    public async Task ValidatePeople(CancellationToken cancellationToken, IProgress<double> progress)
    {
+        // Before the refresh below walks them: a credit no item maps to any more stands for nothing,
+        // and while it is there the person it names cannot reach the dead-person sweep either.
+        var numOrphaned = _libraryManager.DeleteOrphanedCredits();
+        if (numOrphaned > 0)
+        {
+            _logger.LogDebug("Deleted {Amount} credits no item maps to", numOrphaned);
+        }
+
        var people = _libraryManager.GetPeopleNames(new InternalPeopleQuery());

        var numComplete = 0;
@@ -115,6 +123,6 @@ public class PeopleValidator

        progress.Report(100);

-        _logger.LogInformation("People validation complete");
+        _logger.LogInformation("People validation complete, deleted {Orphaned} orphaned credits", numOrphaned);
    }
 }
@@ -106,5 +106,20 @@
    "TaskMoveTrickplayImagesDescription": "Премества съществуващите trickplay изображения спрямо настройките на библиотеката.",
    "TaskExtractMediaSegments": "Сканиране за сегменти",
    "CleanupUserDataTask": "Задача за почистване на потребителски данни",
-    "CleanupUserDataTaskDescription": "Почиства всички потребителски данни (статус на гледане, любими и т.н.) от медия, която вече не е налична от поне 90 дни."
+    "CleanupUserDataTaskDescription": "Почиства всички потребителски данни (статус на гледане, любими и т.н.) от медия, която вече не е налична от поне 90 дни.",
+    "LyricDownloadFailureFromForItem": "Текстът на песента не успя да се изтегли от {0} за {1}",
+    "NameExtraBehindTheScenes": "Зад кулисите",
+    "NameExtraScene": "Сцена",
+    "NameExtraShort": "Откъс",
+    "NameExtraThemeVideo": "Тематично видео",
+    "NameExtraTrailer": "Трейлър",
+    "NameExtraUnknown": "Екстра",
+    "NameExtraClip": "Клип",
+    "NameExtraDeletedScene": "Изтрита Сцена",
+    "NameExtraFeaturette": "Кратък филм",
+    "NameExtraInterview": "Интервю",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "Пример",
+    "NameExtraThemeSong": "Тема-песен",
+    "Original": "Оригинал"
 }
@@ -51,7 +51,7 @@
    "Shows": "Serier",
    "StartupEmbyServerIsLoading": "Jellyfin er i gang med at starte. Prøv igen om et øjeblik.",
    "SubtitleDownloadFailureFromForItem": "Undertekster kunne ikke hentes fra {0} til {1}",
-    "TvShows": "TV-serier",
+    "TvShows": "Serier",
    "UserCreatedWithName": "Bruger {0} er blevet oprettet",
    "UserDeletedWithName": "Brugeren {0} er nu slettet",
    "UserDownloadingItemWithValues": "{0} henter {1}",
@@ -80,8 +80,8 @@
    "TaskRefreshChapterImagesDescription": "Laver miniaturebilleder for videoer, der har kapitler.",
    "TaskRefreshChannelsDescription": "Opdaterer information for internetkanaler.",
    "TaskRefreshChannels": "Opdatér kanaler",
-    "TaskCleanTranscodeDescription": "Fjerner omkodningsfiler, som er mere end 1 dag gamle.",
-    "TaskCleanTranscode": "Tøm omkodningsmappen",
+    "TaskCleanTranscodeDescription": "Fjerner transkodningsfiler, som er mere end 1 dag gamle.",
+    "TaskCleanTranscode": "Tøm transkodningsmappen",
    "TaskRefreshPeople": "Opdatér personer",
    "TaskRefreshPeopleDescription": "Opdaterer metadata for skuespillere og instruktører i dit mediebibliotek.",
    "TaskCleanActivityLogDescription": "Sletter linjer i aktivitetsloggen ældre end den konfigurerede alder.",
@@ -109,17 +109,17 @@
    "CleanupUserDataTaskDescription": "Rydder alle brugerdata (eks. visning- og favoritstatus) fra medier, der har været utilgængelige i mindst 90 dage.",
    "LyricDownloadFailureFromForItem": "Sangtekster kunne ikke downloades fra {0} til {1}",
    "Original": "Original",
-    "NameExtraBehindTheScenes": "Bag Scenerne",
+    "NameExtraBehindTheScenes": "Bag scenerne",
    "NameExtraClip": "Klip",
-    "NameExtraDeletedScene": "Slettet Scene",
+    "NameExtraDeletedScene": "Slettet scene",
    "NameExtraFeaturette": "Featurette",
    "NameExtraInterview": "Interview",
    "NameExtraNumbered": "{0} {1}",
    "NameExtraSample": "Smagsprøve",
    "NameExtraScene": "Scene",
    "NameExtraShort": "Kort",
-    "NameExtraThemeSong": "Tema Sang",
-    "NameExtraThemeVideo": "Tema Video",
+    "NameExtraThemeSong": "Temasang",
+    "NameExtraThemeVideo": "Temavideo",
    "NameExtraTrailer": "Trailer",
    "NameExtraUnknown": "Ekstra"
 }
@@ -1,6 +1,6 @@
 {
    "AppDeviceValues": "App: {0}, Gerät: {1}",
-    "Artists": "Interpreten",
+    "Artists": "Künstler",
    "AuthenticationSucceededWithUserName": "{0} erfolgreich authentifiziert",
    "Books": "Bücher",
    "ChapterNameValue": "Kapitel {0}",
@@ -24,8 +24,8 @@
    "Music": "Music",
    "MusicVideos": "Music Videos",
    "NameInstallFailed": "{0} installation failed",
-    "NameSeasonNumber": "Season {0}",
-    "NameSeasonUnknown": "Season Unknown",
+    "NameSeasonNumber": "Series {0}",
+    "NameSeasonUnknown": "Series Unknown",
    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
    "NotificationOptionApplicationUpdateAvailable": "Application update available",
    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
@@ -108,5 +108,17 @@
    "CleanupUserDataTask": "User data cleanup task",
    "CleanupUserDataTaskDescription": "Cleans all user data (Watch state, favourite status etc) from media that is no longer present for at least 90 days.",
    "LyricDownloadFailureFromForItem": "Lyrics failed to download from {0} for {1}",
-    "Original": "Original"
+    "Original": "Original",
+    "NameExtraBehindTheScenes": "Behind The Scenes",
+    "NameExtraClip": "Clip",
+    "NameExtraDeletedScene": "Deleted Scene",
+    "NameExtraFeaturette": "Featurette",
+    "NameExtraInterview": "Interview",
+    "NameExtraSample": "Sample",
+    "NameExtraScene": "Scene",
+    "NameExtraShort": "Short",
+    "NameExtraThemeSong": "Theme Song",
+    "NameExtraThemeVideo": "Theme Video",
+    "NameExtraTrailer": "Trailer",
+    "NameExtraUnknown": "Extra"
 }
@@ -97,5 +97,9 @@
    "TaskAudioNormalizationDescription": "Skanas dosierojn por sonnivelaj normaligaj datumoj.",
    "TaskRefreshTrickplayImages": "Generi la bildojn por TrickPlay (Antaŭrigardo rapida antaŭen)",
    "TaskAudioNormalization": "Normaligo Sonnivela",
-    "HearingImpaired": "Surda"
+    "HearingImpaired": "Surda",
+    "NameExtraDeletedScene": "Forigita sceno",
+    "NameExtraScene": "Sceno",
+    "NameExtraThemeSong": "Tema Kanto",
+    "Original": "Originala"
 }
@@ -114,5 +114,12 @@
    "NameExtraScene": "Eszena",
    "NameExtraShort": "Laburra",
    "NameExtraThemeSong": "Gai-abestia",
-    "NameExtraThemeVideo": "Gai-bideoa"
+    "NameExtraThemeVideo": "Gai-bideoa",
+    "NameExtraBehindTheScenes": "Eszenen atzean",
+    "NameExtraClip": "Klipa",
+    "NameExtraDeletedScene": "Ezabatutako eszena",
+    "NameExtraFeaturette": "Erreportajea",
+    "NameExtraInterview": "Elkarrizketa",
+    "NameExtraTrailer": "Trailerra",
+    "NameExtraUnknown": "Extra"
 }
@@ -108,5 +108,10 @@
    "CleanupUserDataTask": "Käyttäjätietojen puhdistustehtävä",
    "CleanupUserDataTaskDescription": "Puhdistaa kaikki käyttäjätiedot (katselutila, suosikit ym.) medioista, joita ei ole ollut saatavilla yli 90 päivään.",
    "LyricDownloadFailureFromForItem": "Sanoitusten lataus kohteesta {0} kappaleelle {1} epäonnistui",
-    "Original": "Alkuperäinen"
+    "Original": "Alkuperäinen",
+    "NameExtraBehindTheScenes": "Kulissien Takana",
+    "NameExtraClip": "Klippi",
+    "NameExtraDeletedScene": "Poistettu Kohtaus",
+    "NameExtraFeaturette": "Lyhytelokuva",
+    "NameExtraInterview": "Haastattelu"
 }
@@ -1,6 +1,6 @@
 {
    "Artists": "Tónlistafólk",
-    "Collections": "Søvn",
+    "Collections": "Samlingar",
    "Default": "Forsett",
    "External": "Ytri",
    "Genres": "Greinar",
@@ -55,8 +55,8 @@
    "TaskUpdatePluginsDescription": "Niðurtekur og innleggur dagføringar til ískoytisforrit ið eru stillaði til at dagførast sjálvvirkandi.",
    "TaskCleanTranscodeDescription": "Strikar umkotaðar fílar ið eru eldri enn 1 dag.",
    "TaskOptimizeDatabase": "Albøt dátugrunn",
-    "NameSeasonNumber": "Sesong {0}",
-    "NameSeasonUnknown": "Ókend sesong",
+    "NameSeasonNumber": "Umfar {0}",
+    "NameSeasonUnknown": "Ókent umfar",
    "ScheduledTaskFailedWithName": "{0} miseydnaðist",
    "Undefined": "Óskilmarkað",
    "TasksMaintenanceCategory": "Viðlíkahald",
@@ -111,5 +111,15 @@
    "NameExtraNumbered": "{0} {1}",
    "NameExtraFeaturette": "Stuttur heimildarfilmur",
    "TaskAudioNormalization": "Ljóðjavnan",
-    "TaskAudioNormalizationDescription": "Kannar fílur fyri dátum til ljóðjavnan."
+    "TaskAudioNormalizationDescription": "Kannar fílur fyri dátum til ljóðjavnan.",
+    "NameExtraSample": "Kut",
+    "TaskRefreshTrickplayImages": "Framleið Trickplay-myndir",
+    "TaskRefreshTrickplayImagesDescription": "Framleiðir trickplay-myndir fyri kykmyndir í søvnunm har tað er virkt.",
+    "TaskMoveTrickplayImages": "Flyt Trickplay-myndagoymslustað",
+    "TaskMoveTrickplayImagesDescription": "Flytur verandi trickplay-fílur sambært savnsstillingunum.",
+    "NameExtraThemeVideo": "Eyðkenniskykmynd",
+    "NameExtraDeletedScene": "Úrtikin mynd (scena)",
+    "NameExtraScene": "Mynd (scena)",
+    "NameExtraUnknown": "Eykatilfar",
+    "Original": "Upprunalig(t/ur)"
 }
@@ -107,5 +107,19 @@
    "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.",
-    "Original": "Orixinal"
+    "Original": "Orixinal",
+    "LyricDownloadFailureFromForItem": "Non se puideron descargar as letras desde {0} para {1}",
+    "NameExtraBehindTheScenes": "Detrás das Cámaras",
+    "NameExtraClip": "Clip",
+    "NameExtraDeletedScene": "Escena Eliminada",
+    "NameExtraFeaturette": "Reportaxe especial",
+    "NameExtraInterview": "Entrevista",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "Mostra",
+    "NameExtraScene": "Escena",
+    "NameExtraShort": "Curtametraxe",
+    "NameExtraThemeSong": "Canción principal",
+    "NameExtraThemeVideo": "Vídeo da canción principal",
+    "NameExtraTrailer": "Tráiler",
+    "NameExtraUnknown": "Extra"
 }
@@ -108,5 +108,12 @@
    "CleanupUserDataTaskDescription": "ניקוי כל המידע של המשתמש (מצב צפייה, מועדפים וכו) ממדיה שאינה קיימת מעל 90 יום.",
    "CleanupUserDataTask": "משימת ניקוי מידע משתמש",
    "LyricDownloadFailureFromForItem": "הורדת המילים מ-{0} עבור {1} נכשלה",
-    "Original": "מקור"
+    "Original": "מקור",
+    "NameExtraBehindTheScenes": "מאחורי הקלעים",
+    "NameExtraClip": "קליפ",
+    "NameExtraDeletedScene": "סצנה שנמחקה",
+    "NameExtraFeaturette": "סרט קצר",
+    "NameExtraInterview": "ריאיון",
+    "NameExtraSample": "דגימה",
+    "NameExtraScene": "סצנה"
 }
@@ -106,5 +106,20 @@
    "TaskMoveTrickplayImages": "ट्रिकप्ले छवि स्थान माइग्रेट करें",
    "TaskMoveTrickplayImagesDescription": "लाइब्रेरी सेटिंग्स के अनुसार मौजूदा ट्रिकप्ले फ़ाइलों को स्थानांतरित करता है।",
    "CleanupUserDataTask": "यूज़र डेटा सफाई कार्य",
-    "Original": "असली"
+    "Original": "असली",
+    "LyricDownloadFailureFromForItem": "{0} के लिए {1} से बोल (Lyrics) डाउनलोड करने में विफल रहा",
+    "NameExtraBehindTheScenes": "परदे के पीछे",
+    "NameExtraClip": "क्लिप",
+    "NameExtraDeletedScene": "हटाया गया दृश्य",
+    "NameExtraFeaturette": "फीचरेट",
+    "NameExtraInterview": "साक्षात्कार",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "नमूना",
+    "NameExtraScene": "दृश्य",
+    "NameExtraShort": "शॉर्ट",
+    "NameExtraThemeSong": "थीम सॉन्ग",
+    "NameExtraThemeVideo": "थीम वीडियो",
+    "NameExtraTrailer": "ट्रेलर",
+    "NameExtraUnknown": "अतिरिक्त",
+    "CleanupUserDataTaskDescription": "कम से कम 90 दिनों से अनुपस्थित मीडिया से सभी उपयोगकर्ता डेटा (देखने की स्थिति, पसंदीदा स्थिति आदि) को साफ़ करता है।"
 }
@@ -120,5 +120,6 @@
    "NameExtraThemeSong": "Főcímdal",
    "NameExtraThemeVideo": "Főcímvideó",
    "NameExtraTrailer": "Előzetes",
-    "NameExtraUnknown": "Extra"
+    "NameExtraUnknown": "Extra",
+    "NameExtraNumbered": "{0} {1}"
 }
@@ -24,5 +24,10 @@
    "TaskDownloadMissingSubtitles": "Ներբեռնել պակասող ենթագրերը",
    "AppDeviceValues": "Հավելված` {0}, Սարք `{1}",
    "ChapterNameValue": "Գլուխ {0}",
-    "Collections": "Հավաքածուներ"
+    "Collections": "Հավաքածուներ",
+    "Artists": "Երաժիշտներ",
+    "Default": "Լռելյայն",
+    "Favorites": "Ընտրյալ",
+    "Forced": "Ստիպուած",
+    "Genres": "Ոճ"
 }
@@ -118,5 +118,8 @@
    "NameExtraSample": "Campione",
    "NameExtraShort": "Corto",
    "NameExtraThemeSong": "Sigla musicale",
-    "NameExtraTrailer": "Trailer"
+    "NameExtraTrailer": "Trailer",
+    "NameExtraFeaturette": "Caratteristica",
+    "NameExtraThemeVideo": "Video tematico",
+    "NameExtraUnknown": "Extra"
 }
@@ -59,8 +59,8 @@
    "UserOfflineFromDevice": "{0} buvo atjungtas nuo {1}",
    "UserOnlineFromDevice": "{0} prisijungęs iš {1}",
    "UserPasswordChangedWithName": "Slaptažodis pakeistas naudotojui {0}",
-    "UserStartedPlayingItemWithValues": "{0} leidžia {1} į {2}",
-    "UserStoppedPlayingItemWithValues": "{0} baigė leisti {1} į {2}",
+    "UserStartedPlayingItemWithValues": "{0} atkuriama {1} į {2}",
+    "UserStoppedPlayingItemWithValues": "{0} baigė atkūrimą {1} į {2}",
    "VersionNumber": "Versija {0}",
    "TaskUpdatePluginsDescription": "Atsisiunčia ir įdiegia įskiepių, kurie sukonfigūruoti atnaujinti automatiškai, naujinius.",
    "TaskUpdatePlugins": "Atnaujinti įskieius",
@@ -87,7 +87,7 @@
    "TaskCleanActivityLog": "Išvalyti veiklos žurnalą",
    "Undefined": "Neapibrėžtas",
    "Forced": "Priverstinis",
-    "Default": "Numatytas",
+    "Default": "Numatytasis",
    "TaskCleanActivityLogDescription": "Ištrina senesnius nei nustatytas amžius veiklos žurnalo įrašus.",
    "TaskOptimizeDatabase": "Optimizuoti duomenų bazę",
    "TaskKeyframeExtractorDescription": "Iš vaizdo įrašo paruošia reikšminius kadrus, kad būtų sukuriamas tikslenis HLS grojaraštis. Šios užduoties vykdymas gali ilgai užtrukti.",
@@ -106,5 +106,11 @@
    "TaskAudioNormalization": "Normalisasi Audio",
    "TaskAudioNormalizationDescription": "Mengimbas fail-fail untuk data normalisasi audio.",
    "CleanupUserDataTaskDescription": "Membersihkan semua data pengguna (keadaan tontonan, status kegemaran, dan sebagainya) daripada media yang tidak lagi wujud sekurang-kurangnya selama 90 hari.",
-    "CleanupUserDataTask": "Tugas pembersihan data pengguna"
+    "CleanupUserDataTask": "Tugas pembersihan data pengguna",
+    "LyricDownloadFailureFromForItem": "Lirik gagal dimuat turun dari {0} untuk {1}",
+    "NameExtraBehindTheScenes": "Di Sebalik Takbir",
+    "NameExtraClip": "Klip",
+    "NameExtraInterview": "Temu bual",
+    "NameExtraThemeSong": "Lagu Tema",
+    "NameExtraThemeVideo": "Video Tema"
 }
@@ -120,5 +120,6 @@
    "NameExtraThemeVideo": "Vídeo de Abertura",
    "NameExtraTrailer": "Trailer",
    "NameExtraUnknown": "Extra",
-    "NameExtraFeaturette": "Nos Bastidores"
+    "NameExtraFeaturette": "Nos Bastidores",
+    "NameExtraInterview": "Entrevista"
 }
@@ -5,108 +5,121 @@
    "Books": "Livros",
    "ChapterNameValue": "Capítulo {0}",
    "Collections": "Coleções",
-    "FailedLoginAttemptWithUserName": "Tentativa de login falhada a partir de {0}",
+    "FailedLoginAttemptWithUserName": "Tentativa falhada de início de sessão do utilizador {0}",
    "Favorites": "Favoritos",
    "Folders": "Pastas",
    "Genres": "Géneros",
    "HeaderContinueWatching": "Continuar a ver",
-    "HeaderFavoriteEpisodes": "Episódios Favoritos",
-    "HeaderFavoriteShows": "Séries Favoritas",
-    "HeaderLiveTV": "TV em Direto",
-    "HeaderNextUp": "A Seguir",
-    "HomeVideos": "Vídeos Caseiros",
+    "HeaderFavoriteEpisodes": "Episódios favoritos",
+    "HeaderFavoriteShows": "Séries favoritas",
+    "HeaderLiveTV": "TV em direto",
+    "HeaderNextUp": "A seguir",
+    "HomeVideos": "Vídeos caseiros",
    "Inherit": "Herdar",
    "LabelIpAddressValue": "Endereço IP: {0}",
    "LabelRunningTimeValue": "Duração: {0}",
-    "Latest": "Mais Recente",
-    "MixedContent": "Conteúdo Misto",
+    "Latest": "Mais recente",
+    "MixedContent": "Conteúdo misto",
    "Movies": "Filmes",
    "Music": "Música",
    "MusicVideos": "Videoclipes",
-    "NameInstallFailed": "{0} falha na instalação",
+    "NameInstallFailed": "Falha na instalação de {0}",
    "NameSeasonNumber": "Temporada {0}",
-    "NameSeasonUnknown": "Temporada Desconhecida",
+    "NameSeasonUnknown": "Temporada desconhecida",
    "NewVersionIsAvailable": "Está disponível para transferência uma nova versão do servidor Jellyfin.",
    "NotificationOptionApplicationUpdateAvailable": "Atualização de aplicação disponível",
    "NotificationOptionApplicationUpdateInstalled": "Atualização de aplicação instalada",
-    "NotificationOptionAudioPlayback": "Reprodução Iniciada",
-    "NotificationOptionAudioPlaybackStopped": "Reprodução Parada",
+    "NotificationOptionAudioPlayback": "Reprodução de áudio iniciada",
+    "NotificationOptionAudioPlaybackStopped": "Reprodução de áudio interrompida",
    "NotificationOptionCameraImageUploaded": "Imagem da câmara enviada",
    "NotificationOptionInstallationFailed": "Falha na instalação",
    "NotificationOptionNewLibraryContent": "Novo conteúdo adicionado",
-    "NotificationOptionPluginError": "Falha na extensão",
-    "NotificationOptionPluginInstalled": "Extensão instalada",
-    "NotificationOptionPluginUninstalled": "Extensão desinstalada",
-    "NotificationOptionPluginUpdateInstalled": "Extensão atualizada",
+    "NotificationOptionPluginError": "Falha no plugin",
+    "NotificationOptionPluginInstalled": "Plugin instalado",
+    "NotificationOptionPluginUninstalled": "Plugin desinstalado",
+    "NotificationOptionPluginUpdateInstalled": "Atualização de plugin instalada",
    "NotificationOptionServerRestartRequired": "Necessário reiniciar o servidor",
    "NotificationOptionTaskFailed": "Falha em tarefa agendada",
    "NotificationOptionUserLockedOut": "Utilizador bloqueado",
-    "NotificationOptionVideoPlayback": "Reprodução do vídeo iniciada",
-    "NotificationOptionVideoPlaybackStopped": "Reprodução do vídeo parada",
+    "NotificationOptionVideoPlayback": "Reprodução de vídeo iniciada",
+    "NotificationOptionVideoPlaybackStopped": "Reprodução de vídeo interrompida",
    "Photos": "Fotografias",
    "PluginInstalledWithName": "{0} foi instalado",
    "PluginUninstalledWithName": "{0} foi desinstalado",
    "PluginUpdatedWithName": "{0} foi atualizado",
    "ScheduledTaskFailedWithName": "{0} falhou",
    "Shows": "Séries",
-    "StartupEmbyServerIsLoading": "O servidor Jellyfin está a iniciar. Tente novamente mais tarde.",
-    "SubtitleDownloadFailureFromForItem": "Falha na transferência de legendas a partir de {0} para {1}",
-    "TvShows": "Séries",
+    "StartupEmbyServerIsLoading": "O servidor Jellyfin está a iniciar. Tenta novamente dentro de instantes.",
+    "SubtitleDownloadFailureFromForItem": "Falha ao transferir legendas de {0} para {1}",
+    "TvShows": "Séries de TV",
    "UserCreatedWithName": "Utilizador {0} criado",
-    "UserDeletedWithName": "Utilizador {0} apagado",
+    "UserDeletedWithName": "Utilizador {0} eliminado",
    "UserDownloadingItemWithValues": "{0} está a transferir {1}",
    "UserLockedOutWithName": "Utilizador {0} bloqueado",
-    "UserOfflineFromDevice": "{0} desligou-se a partir de {1}",
-    "UserOnlineFromDevice": "{0} ligou-se a partir de {1}",
+    "UserOfflineFromDevice": "{0} desligou-se de {1}",
+    "UserOnlineFromDevice": "{0} está online em {1}",
    "UserPasswordChangedWithName": "Palavra-passe alterada para o utilizador {0}",
    "UserStartedPlayingItemWithValues": "{0} está a reproduzir {1} em {2}",
    "UserStoppedPlayingItemWithValues": "{0} terminou a reprodução de {1} em {2}",
    "VersionNumber": "Versão {0}",
-    "TaskDownloadMissingSubtitlesDescription": "Procurar na internet por legendas em falta baseado na configuração de metadados.",
+    "TaskDownloadMissingSubtitlesDescription": "Procura na Internet legendas em falta com base na configuração dos metadados.",
    "TaskDownloadMissingSubtitles": "Transferir legendas em falta",
-    "TaskRefreshChannelsDescription": "Atualizar informação sobre canais da Internet.",
-    "TaskRefreshChannels": "Atualizar Canais",
-    "TaskCleanTranscodeDescription": "Apagar ficheiros de transcode com mais de um dia.",
-    "TaskCleanTranscode": "Limpar a Diretoria de Transcode",
-    "TaskUpdatePluginsDescription": "Faz o download e instala updates para os plugins que estão configurados para atualizar automaticamente.",
-    "TaskUpdatePlugins": "Atualizar Plugins",
-    "TaskRefreshPeopleDescription": "Atualizar metadados para elenco e equipa técnica da tua mediateca.",
-    "TaskRefreshPeople": "Atualizar Pessoas",
-    "TaskCleanLogsDescription": "Apagar ficheiros de log que têm mais de {0} dias.",
-    "TaskCleanLogs": "Limpar a Diretoria de Logs",
-    "TaskRefreshLibraryDescription": "Analisar a mediateca para novos ficheiros e atualizar os metadados.",
-    "TaskRefreshLibrary": "Analisar mediateca",
-    "TaskRefreshChapterImagesDescription": "Criar thumbnails para os vídeos que têm capítulos.",
-    "TaskRefreshChapterImages": "Extrair Imagens dos Capítulos",
-    "TaskCleanCacheDescription": "Apagar ficheiros em cache que já não são necessários.",
-    "TaskCleanCache": "Limpar Cache",
+    "TaskRefreshChannelsDescription": "Atualiza as informações dos canais da Internet.",
+    "TaskRefreshChannels": "Atualizar canais",
+    "TaskCleanTranscodeDescription": "Elimina ficheiros de transcodificação com mais de um dia.",
+    "TaskCleanTranscode": "Limpar pasta de transcodificação",
+    "TaskUpdatePluginsDescription": "Transfere e instala atualizações dos plugins configurados para atualização automática.",
+    "TaskUpdatePlugins": "Atualizar plugins",
+    "TaskRefreshPeopleDescription": "Atualiza os metadados de atores e realizadores na tua biblioteca multimédia.",
+    "TaskRefreshPeople": "Atualizar pessoas",
+    "TaskCleanLogsDescription": "Elimina ficheiros de registo com mais de {0} dias.",
+    "TaskCleanLogs": "Limpar pasta de registos",
+    "TaskRefreshLibraryDescription": "Analisa a biblioteca multimédia à procura de novos ficheiros e atualiza os metadados.",
+    "TaskRefreshLibrary": "Analisar biblioteca multimédia",
+    "TaskRefreshChapterImagesDescription": "Cria miniaturas para vídeos que têm capítulos.",
+    "TaskRefreshChapterImages": "Extrair imagens dos capítulos",
+    "TaskCleanCacheDescription": "Elimina ficheiros de cache que já não são necessários ao sistema.",
+    "TaskCleanCache": "Limpar pasta de cache",
    "TasksChannelsCategory": "Canais da Internet",
    "TasksApplicationCategory": "Aplicação",
-    "TasksLibraryCategory": "Mediateca",
+    "TasksLibraryCategory": "Biblioteca",
    "TasksMaintenanceCategory": "Manutenção",
-    "TaskCleanActivityLogDescription": "Apaga as entradas do registo de atividade anteriores à data configurada.",
+    "TaskCleanActivityLogDescription": "Elimina as entradas do registo de atividade mais antigas do que o período configurado.",
    "TaskCleanActivityLog": "Limpar registo de atividade",
    "Undefined": "Indefinido",
    "Forced": "Forçado",
    "Default": "Predefinição",
-    "TaskOptimizeDatabaseDescription": "Otimiza e liberta espaço livre na base de dados. A execução desta tarefa depois de analisar a mediateca ou efetuar outras alterações que impliquem modificações na base de dados pode melhorar o desempenho.",
+    "TaskOptimizeDatabaseDescription": "Compacta a base de dados e liberta espaço não utilizado. A execução desta tarefa depois de analisar a biblioteca ou de outras alterações que modifiquem a base de dados pode melhorar o desempenho.",
    "TaskOptimizeDatabase": "Otimizar base de dados",
-    "TaskKeyframeExtractorDescription": "Extrai quadros-chave de ficheiros de video para criar listas de reprodução HLS mais precisas. Esta tarefa pode demorar algum tempo.",
-    "TaskKeyframeExtractor": "Extrator de Quadros-chave",
+    "TaskKeyframeExtractorDescription": "Extrai fotogramas-chave de ficheiros de vídeo para criar playlists HLS mais precisas. Esta tarefa pode demorar algum tempo.",
+    "TaskKeyframeExtractor": "Extrator de fotogramas-chave",
    "External": "Externo",
-    "HearingImpaired": "Surdo",
+    "HearingImpaired": "Deficiência auditiva",
    "TaskRefreshTrickplayImages": "Gerar imagens de trickplay",
    "TaskRefreshTrickplayImagesDescription": "Cria pré-visualizações de trickplay para vídeos nas bibliotecas ativadas.",
    "TaskAudioNormalizationDescription": "Analisa os ficheiros para obter dados de normalização de áudio.",
    "TaskAudioNormalization": "Normalização de áudio",
-    "TaskExtractMediaSegments": "Analisar segmentos de multimédia",
-    "TaskDownloadMissingLyrics": "Transferir letra em falta",
-    "TaskMoveTrickplayImages": "Migrar a localização da imagem do Trickplay",
-    "TaskDownloadMissingLyricsDescription": "Transferir letra para músicas",
-    "TaskExtractMediaSegmentsDescription": "Extrai ou obtém segmentos de multimédia a partir de plugins com suporte para MediaSegment.",
-    "TaskMoveTrickplayImagesDescription": "Move os ficheiros trickplay existentes de acordo com as definições da mediateca.",
-    "CleanupUserDataTaskDescription": "Apaga todos os dados de utilizador (estados de reprodução, favoritos, etc) de arquivos média não presentes há 90 dias ou mais.",
+    "TaskExtractMediaSegments": "Analisar segmentos multimédia",
+    "TaskDownloadMissingLyrics": "Transferir letras em falta",
+    "TaskMoveTrickplayImages": "Migrar localização das imagens de trickplay",
+    "TaskDownloadMissingLyricsDescription": "Transfere letras de músicas",
+    "TaskExtractMediaSegmentsDescription": "Extrai ou obtém segmentos multimédia de plugins com MediaSegment ativado.",
+    "TaskMoveTrickplayImagesDescription": "Move os ficheiros de trickplay existentes de acordo com as definições da biblioteca.",
+    "CleanupUserDataTaskDescription": "Remove todos os dados de utilizador (estado de reprodução, estado de favorito, etc.) de conteúdos multimédia que já não estejam presentes há pelo menos 90 dias.",
    "CleanupUserDataTask": "Limpeza de dados de utilizador",
    "Original": "Original",
-    "LyricDownloadFailureFromForItem": "Erro ao descarregar letras de {0} para {1}"
+    "LyricDownloadFailureFromForItem": "Falha ao transferir letras de {0} para {1}",
+    "NameExtraDeletedScene": "Cena eliminada",
+    "NameExtraInterview": "Entrevista",
+    "NameExtraUnknown": "Extra",
+    "NameExtraBehindTheScenes": "Bastidores",
+    "NameExtraSample": "Amostra",
+    "NameExtraScene": "Cena",
+    "NameExtraClip": "Excerto",
+    "NameExtraFeaturette": "Minidocumentário",
+    "NameExtraThemeSong": "Tema musical",
+    "NameExtraThemeVideo": "Vídeo temático",
+    "NameExtraShort": "Curta-metragem",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraTrailer": "Trailer"
 }
@@ -1,124 +1,125 @@
 {
-    "HeaderLiveTV": "TV Em Direto",
+    "HeaderLiveTV": "TV em direto",
    "Collections": "Coleções",
    "Books": "Livros",
    "Artists": "Artistas",
-    "HeaderNextUp": "A Seguir",
-    "HeaderFavoriteEpisodes": "Episódios Favoritos",
-    "HeaderFavoriteShows": "Séries Favoritas",
+    "HeaderNextUp": "A seguir",
+    "HeaderFavoriteEpisodes": "Episódios favoritos",
+    "HeaderFavoriteShows": "Séries favoritas",
    "HeaderContinueWatching": "Continuar a ver",
    "Genres": "Géneros",
    "Folders": "Pastas",
    "Favorites": "Favoritos",
-    "UserDownloadingItemWithValues": "{0} está sendo baixado {1}",
+    "UserDownloadingItemWithValues": "{0} está a transferir {1}",
    "VersionNumber": "Versão {0}",
    "UserStoppedPlayingItemWithValues": "{0} terminou a reprodução de {1} em {2}",
-    "UserStartedPlayingItemWithValues": "{0} está reproduzindo {1} em {2}",
-    "UserPasswordChangedWithName": "A senha do usuário {0} foi alterada",
-    "UserOnlineFromDevice": "{0} está online a partir de {1}",
-    "UserOfflineFromDevice": "{0} desconectou-se a partir de {1}",
-    "UserLockedOutWithName": "O usuário {0} foi bloqueado",
-    "UserDeletedWithName": "O usuário {0} foi removido",
-    "UserCreatedWithName": "O usuário {0} foi criado",
-    "TvShows": "Séries",
-    "SubtitleDownloadFailureFromForItem": "Falha na transferência de legendas de {0} para {1}",
-    "StartupEmbyServerIsLoading": "O servidor Jellyfin está iniciando. Tente novamente dentro de momentos.",
+    "UserStartedPlayingItemWithValues": "{0} está a reproduzir {1} em {2}",
+    "UserPasswordChangedWithName": "Palavra-passe alterada para o utilizador {0}",
+    "UserOnlineFromDevice": "{0} está online em {1}",
+    "UserOfflineFromDevice": "{0} desligou-se de {1}",
+    "UserLockedOutWithName": "Utilizador {0} bloqueado",
+    "UserDeletedWithName": "Utilizador {0} eliminado",
+    "UserCreatedWithName": "Utilizador {0} criado",
+    "TvShows": "Séries de TV",
+    "SubtitleDownloadFailureFromForItem": "Falha ao transferir legendas de {0} para {1}",
+    "StartupEmbyServerIsLoading": "O servidor Jellyfin está a iniciar. Tenta novamente dentro de instantes.",
    "ScheduledTaskFailedWithName": "{0} falhou",
    "PluginUpdatedWithName": "{0} foi atualizado",
    "PluginUninstalledWithName": "{0} foi desinstalado",
    "PluginInstalledWithName": "{0} foi instalado",
-    "NotificationOptionVideoPlaybackStopped": "Reprodução de vídeo parada",
+    "NotificationOptionVideoPlaybackStopped": "Reprodução de vídeo interrompida",
    "NotificationOptionVideoPlayback": "Reprodução de vídeo iniciada",
-    "NotificationOptionUserLockedOut": "Usuário bloqueado",
-    "NotificationOptionTaskFailed": "Falha na tarefa agendada",
-    "NotificationOptionServerRestartRequired": "É necessário reiniciar o servidor",
-    "NotificationOptionPluginUpdateInstalled": "Plugin atualizado",
+    "NotificationOptionUserLockedOut": "Utilizador bloqueado",
+    "NotificationOptionTaskFailed": "Falha em tarefa agendada",
+    "NotificationOptionServerRestartRequired": "Necessário reiniciar o servidor",
+    "NotificationOptionPluginUpdateInstalled": "Atualização de plugin instalada",
    "NotificationOptionPluginUninstalled": "Plugin desinstalado",
    "NotificationOptionPluginInstalled": "Plugin instalado",
    "NotificationOptionPluginError": "Falha no plugin",
    "NotificationOptionNewLibraryContent": "Novo conteúdo adicionado",
-    "NotificationOptionInstallationFailed": "Falha de instalação",
-    "NotificationOptionCameraImageUploaded": "Imagem de câmera enviada",
-    "NotificationOptionAudioPlaybackStopped": "Reprodução Parada",
-    "NotificationOptionAudioPlayback": "Reprodução Iniciada",
-    "NotificationOptionApplicationUpdateInstalled": "A atualização do aplicativo foi instalada",
-    "NotificationOptionApplicationUpdateAvailable": "Uma atualização do aplicativo está disponível",
-    "NewVersionIsAvailable": "Uma nova versão do servidor Jellyfin está disponível para download.",
-    "NameSeasonUnknown": "Temporada Desconhecida",
+    "NotificationOptionInstallationFailed": "Falha na instalação",
+    "NotificationOptionCameraImageUploaded": "Imagem da câmara enviada",
+    "NotificationOptionAudioPlaybackStopped": "Reprodução de áudio interrompida",
+    "NotificationOptionAudioPlayback": "Reprodução de áudio iniciada",
+    "NotificationOptionApplicationUpdateInstalled": "Atualização de aplicação instalada",
+    "NotificationOptionApplicationUpdateAvailable": "Atualização de aplicação disponível",
+    "NewVersionIsAvailable": "Está disponível para transferência uma nova versão do servidor Jellyfin.",
+    "NameSeasonUnknown": "Temporada desconhecida",
    "NameSeasonNumber": "Temporada {0}",
    "NameInstallFailed": "Falha na instalação de {0}",
    "MusicVideos": "Videoclipes",
    "Music": "Música",
-    "MixedContent": "Conteúdo diverso",
-    "Latest": "Mais Recente",
+    "MixedContent": "Conteúdo misto",
+    "Latest": "Mais recente",
    "LabelRunningTimeValue": "Duração: {0}",
-    "LabelIpAddressValue": "Endereço de IP: {0}",
+    "LabelIpAddressValue": "Endereço IP: {0}",
    "Inherit": "Herdar",
-    "HomeVideos": "Vídeos Caseiros",
+    "HomeVideos": "Vídeos caseiros",
    "Shows": "Séries",
    "Photos": "Fotografias",
    "Movies": "Filmes",
-    "FailedLoginAttemptWithUserName": "Tentativa de início de sessão falhada a partir de {0}",
+    "FailedLoginAttemptWithUserName": "Tentativa falhada de início de sessão do utilizador {0}",
    "ChapterNameValue": "Capítulo {0}",
    "AuthenticationSucceededWithUserName": "{0} autenticado com sucesso",
    "AppDeviceValues": "Aplicação: {0}, Dispositivo: {1}",
-    "TaskCleanCache": "Limpar Diretório de Cache",
+    "TaskCleanCache": "Limpar pasta de cache",
    "TasksApplicationCategory": "Aplicação",
-    "TasksLibraryCategory": "Mediateca",
+    "TasksLibraryCategory": "Biblioteca",
    "TasksMaintenanceCategory": "Manutenção",
-    "TaskRefreshChannels": "Atualizar Canais",
-    "TaskUpdatePlugins": "Atualizar Plugins",
-    "TaskCleanLogsDescription": "Deletar arquivos de log que existe a mais de {0} dias.",
-    "TaskCleanLogs": "Limpar diretório de logs",
-    "TaskRefreshLibrary": "Analisar mediateca",
+    "TaskRefreshChannels": "Atualizar canais",
+    "TaskUpdatePlugins": "Atualizar plugins",
+    "TaskCleanLogsDescription": "Elimina ficheiros de registo com mais de {0} dias.",
+    "TaskCleanLogs": "Limpar pasta de registos",
+    "TaskRefreshLibrary": "Analisar biblioteca multimédia",
    "TaskRefreshChapterImagesDescription": "Cria miniaturas para vídeos que têm capítulos.",
-    "TaskCleanCacheDescription": "Apaga ficheiros em cache que já não são usados pelo sistema.",
-    "TasksChannelsCategory": "Canais de Internet",
-    "TaskRefreshChapterImages": "Extrair Imagens do Capítulo",
-    "TaskDownloadMissingSubtitlesDescription": "Pesquisa na Internet as legendas em falta com base na configuração de metadados.",
+    "TaskCleanCacheDescription": "Elimina ficheiros de cache que já não são necessários ao sistema.",
+    "TasksChannelsCategory": "Canais da Internet",
+    "TaskRefreshChapterImages": "Extrair imagens dos capítulos",
+    "TaskDownloadMissingSubtitlesDescription": "Procura na Internet legendas em falta com base na configuração dos metadados.",
    "TaskDownloadMissingSubtitles": "Transferir legendas em falta",
-    "TaskRefreshChannelsDescription": "Atualiza as informações do canal da Internet.",
-    "TaskCleanTranscodeDescription": "Apagar os ficheiros com mais de um dia, de Transcode.",
-    "TaskCleanTranscode": "Limpar o diretório de Transcode",
-    "TaskUpdatePluginsDescription": "Baixa e instala as atualizações para plug-ins configurados para atualização automática.",
-    "TaskRefreshPeopleDescription": "Atualizar metadados para elenco e equipa técnica da tua mediateca.",
+    "TaskRefreshChannelsDescription": "Atualiza as informações dos canais da Internet.",
+    "TaskCleanTranscodeDescription": "Elimina ficheiros de transcodificação com mais de um dia.",
+    "TaskCleanTranscode": "Limpar pasta de transcodificação",
+    "TaskUpdatePluginsDescription": "Transfere e instala atualizações dos plugins configurados para atualização automática.",
+    "TaskRefreshPeopleDescription": "Atualiza os metadados de atores e realizadores na tua biblioteca multimédia.",
    "TaskRefreshPeople": "Atualizar pessoas",
-    "TaskRefreshLibraryDescription": "Analisar a mediateca para novos ficheiros e atualizar os metadados.",
-    "TaskCleanActivityLog": "Limpar registro de atividade",
+    "TaskRefreshLibraryDescription": "Analisa a biblioteca multimédia à procura de novos ficheiros e atualiza os metadados.",
+    "TaskCleanActivityLog": "Limpar registo de atividade",
    "Undefined": "Indefinido",
    "Forced": "Forçado",
    "Default": "Predefinição",
-    "TaskCleanActivityLogDescription": "Apaga itens no registro com idade acima do que é configurado.",
+    "TaskCleanActivityLogDescription": "Elimina as entradas do registo de atividade mais antigas do que o período configurado.",
    "TaskOptimizeDatabase": "Otimizar base de dados",
-    "TaskOptimizeDatabaseDescription": "Otimiza e liberta espaço livre na base de dados. A execução desta tarefa depois de analisar a mediateca ou efetuar outras alterações que impliquem modificações na base de dados pode melhorar o desempenho.",
+    "TaskOptimizeDatabaseDescription": "Compacta a base de dados e liberta espaço não utilizado. A execução desta tarefa depois de analisar a biblioteca ou de outras alterações que modifiquem a base de dados pode melhorar o desempenho.",
    "External": "Externo",
-    "HearingImpaired": "Problemas auditivos",
-    "TaskKeyframeExtractor": "Extrator de quadro-chave",
-    "TaskKeyframeExtractorDescription": "Retira frames chave do video para criar listas HLS precisas. Esta tarefa pode correr durante algum tempo.",
-    "TaskRefreshTrickplayImages": "Gerar imagens de Trickplay",
-    "TaskRefreshTrickplayImagesDescription": "Cria miniaturas de pré-visualização (Trickplay) para vídeos nas bibliotecas ativadas.",
+    "HearingImpaired": "Deficiência auditiva",
+    "TaskKeyframeExtractor": "Extrator de fotogramas-chave",
+    "TaskKeyframeExtractorDescription": "Extrai fotogramas-chave de ficheiros de vídeo para criar playlists HLS mais precisas. Esta tarefa pode demorar algum tempo.",
+    "TaskRefreshTrickplayImages": "Gerar imagens de trickplay",
+    "TaskRefreshTrickplayImagesDescription": "Cria pré-visualizações de trickplay para vídeos nas bibliotecas ativadas.",
    "TaskAudioNormalizationDescription": "Analisa os ficheiros para obter dados de normalização de áudio.",
    "TaskAudioNormalization": "Normalização de áudio",
-    "TaskDownloadMissingLyrics": "Transferir letra em falta",
-    "TaskDownloadMissingLyricsDescription": "Transferir letra para músicas",
-    "TaskMoveTrickplayImagesDescription": "Move os ficheiros Trickplay existentes de acordo com as definições da mediateca.",
-    "TaskExtractMediaSegments": "Analisar segmentos de multimédia",
-    "TaskExtractMediaSegmentsDescription": "Extrai ou obtém segmentos de multimédia a partir de plugins com suporte para MediaSegment.",
-    "TaskMoveTrickplayImages": "Migrar a localização das imagens de Trickplay",
-    "CleanupUserDataTask": "Task de limpeza de dados do usuário",
-    "CleanupUserDataTaskDescription": "Remove todos os dados do usuário (progresso, favoritos etc) de mídias que não estão presentes há pelo menos 90 dias.",
+    "TaskDownloadMissingLyrics": "Transferir letras em falta",
+    "TaskDownloadMissingLyricsDescription": "Transfere letras de músicas",
+    "TaskMoveTrickplayImagesDescription": "Move os ficheiros de trickplay existentes de acordo com as definições da biblioteca.",
+    "TaskExtractMediaSegments": "Analisar segmentos multimédia",
+    "TaskExtractMediaSegmentsDescription": "Extrai ou obtém segmentos multimédia de plugins com MediaSegment ativado.",
+    "TaskMoveTrickplayImages": "Migrar localização das imagens de trickplay",
+    "CleanupUserDataTask": "Limpeza de dados de utilizador",
+    "CleanupUserDataTaskDescription": "Remove todos os dados de utilizador (estado de reprodução, estado de favorito, etc.) de conteúdos multimédia que já não estejam presentes há pelo menos 90 dias.",
    "Original": "Original",
-    "LyricDownloadFailureFromForItem": "Erro ao descarregar letras de {0} para {1}",
+    "LyricDownloadFailureFromForItem": "Falha ao transferir letras de {0} para {1}",
    "NameExtraBehindTheScenes": "Bastidores",
-    "NameExtraClip": "Clip",
-    "NameExtraDeletedScene": "Cena Eliminada",
-    "NameExtraFeaturette": "Média-metragem",
+    "NameExtraClip": "Excerto",
+    "NameExtraDeletedScene": "Cena eliminada",
+    "NameExtraFeaturette": "Minidocumentário",
    "NameExtraInterview": "Entrevista",
    "NameExtraSample": "Amostra",
    "NameExtraShort": "Curta-metragem",
-    "NameExtraThemeSong": "Tema Principal",
-    "NameExtraThemeVideo": "Vídeo de Abertura",
+    "NameExtraThemeSong": "Tema musical",
+    "NameExtraThemeVideo": "Vídeo temático",
    "NameExtraScene": "Cena",
    "NameExtraUnknown": "Extra",
-    "NameExtraTrailer": "Trailer"
+    "NameExtraTrailer": "Trailer",
+    "NameExtraNumbered": "{0} {1}"
 }
@@ -108,5 +108,8 @@
    "CleanupUserDataTask": "Sarcina de curatare a datelor utilizatorului",
    "CleanupUserDataTaskDescription": "Sterge toate datele utilizatorului (starea vizionarii, starea favoritelor etc.) de pe suporturile media care nu mai sunt prezente timp de cel puțin 90 de zile.",
    "LyricDownloadFailureFromForItem": "Versurile nu au putut fi descărcate din {0} pentru {1}",
-    "Original": "Original"
+    "Original": "Original",
+    "NameExtraBehindTheScenes": "În culise",
+    "NameExtraClip": "Clip",
+    "NameExtraDeletedScene": "Scenă ștearsă"
 }
@@ -109,7 +109,7 @@
    "CleanupUserDataTaskDescription": "Очищает все пользовательские данные (состояние просмотра, статус избранного и т.д.) с медиа, отсутствующих по меньшей мере в течение 90 дней.",
    "Original": "Оригинальный",
    "LyricDownloadFailureFromForItem": "Не получилось скачать текст песни с {0} для {1}",
-    "NameExtraBehindTheScenes": "За кулисами",
+    "NameExtraBehindTheScenes": "За кадром",
    "NameExtraClip": "Отрывок",
    "NameExtraDeletedScene": "Удалённая сцена",
    "NameExtraFeaturette": "Короткометражка",
@@ -119,5 +119,7 @@
    "NameExtraThemeSong": "Заглавная песня",
    "NameExtraThemeVideo": "Заглавное видео",
    "NameExtraTrailer": "Трейлер",
-    "NameExtraUnknown": "Дополнительный материал"
+    "NameExtraUnknown": "Дополнительный материал",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraShort": "Короткометражка"
 }
@@ -91,7 +91,7 @@
    "Default": "Predvolené",
    "TaskOptimizeDatabaseDescription": "Zmenší databázu a odstráni prázdne miesto. Spustenie tejto úlohy po skenovaní knižnice alebo po iných zmenách zahŕňajúcich úpravy databáze môže zlepšiť výkon.",
    "TaskOptimizeDatabase": "Optimalizovať databázu",
-    "TaskKeyframeExtractorDescription": "Extrahuje kľúčové snímky z video súborov na vytvorenie presnejších HLS playlistov. Táto úloha môže trvať dlhšiu dobu.",
+    "TaskKeyframeExtractorDescription": "Extrahuje kľúčové snímky z video súborov na vytvorenie presnejších HLS zoznamov prehrávania. Táto úloha môže trvať dlhšiu dobu.",
    "TaskKeyframeExtractor": "Extraktor kľúčových snímkov",
    "External": "Externé",
    "HearingImpaired": "Sluchovo postihnutí",
@@ -108,5 +108,18 @@
    "CleanupUserDataTaskDescription": "Pastron të gjitha të dhënat e përdorueseve (gjendja e shikimit, statusi i të preferuarave etj.) nga mediat që nuk janë më të pranishme për të paktën 90 ditë.",
    "CleanupUserDataTask": "Veprim për pastrimin të dhënave të përdorueseve",
    "LyricDownloadFailureFromForItem": "Teksti i këngës nuk arriti të shkarkohej nga {0} për {1}",
-    "Original": "Origjinal"
+    "Original": "Origjinal",
+    "NameExtraBehindTheScenes": "Pamje nga prapaskenat",
+    "NameExtraClip": "Pjesë",
+    "NameExtraDeletedScene": "Skenë e fshirë",
+    "NameExtraFeaturette": "Film i shkurtër",
+    "NameExtraInterview": "Intervistë",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "Shembull",
+    "NameExtraScene": "Skenë",
+    "NameExtraShort": "Film i shkurtër",
+    "NameExtraThemeSong": "Kënga e temës",
+    "NameExtraThemeVideo": "Videoja e temës",
+    "NameExtraTrailer": "Parapamje",
+    "NameExtraUnknown": "Shtesë"
 }
@@ -108,5 +108,18 @@
    "TaskMoveTrickplayImages": "Промени локацију сличица за визуелно премотавање",
    "TaskDownloadMissingLyricsDescription": "Преузми стихове песама",
    "LyricDownloadFailureFromForItem": "Није успело преузимање стихова са {0} за {1}",
-    "Original": "Изворно"
+    "Original": "Изворно",
+    "NameExtraBehindTheScenes": "Иза кулиса",
+    "NameExtraClip": "Исечак",
+    "NameExtraDeletedScene": "Обрисана сцена",
+    "NameExtraFeaturette": "Кратки прилог",
+    "NameExtraInterview": "Интервју",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "Узорак",
+    "NameExtraScene": "Сцена",
+    "NameExtraShort": "Кратки филм",
+    "NameExtraThemeSong": "Музичка тема",
+    "NameExtraThemeVideo": "Спот музичке теме",
+    "NameExtraTrailer": "Реклама",
+    "NameExtraUnknown": "Додатак"
 }
@@ -116,5 +116,10 @@
    "NameExtraScene": "Scen",
    "NameExtraShort": "Kortfilm",
    "NameExtraThemeSong": "Signaturmelodi",
-    "NameExtraTrailer": "Trailer"
+    "NameExtraTrailer": "Trailer",
+    "NameExtraClip": "Klipp",
+    "NameExtraFeaturette": "Kortfilm",
+    "NameExtraSample": "Prov",
+    "NameExtraThemeVideo": "Signaturvideo",
+    "NameExtraUnknown": "Extra"
 }
@@ -106,5 +106,20 @@
    "TaskExtractMediaSegments": "மீடியா பிரிவு ஸ்கேன்",
    "TaskExtractMediaSegmentsDescription": "மீடியாசெக்மென்ட் இயக்கப்பட்ட செருகுநிரல்களிலிருந்து மீடியா பிரிவுகளைப் பிரித்தெடுக்கிறது அல்லது பெறுகிறது.",
    "CleanupUserDataTaskDescription": "குறைந்தது 90 நாட்களுக்கு இல்லாத மீடியாவிலிருந்து அனைத்து பயனர் தரவையும் (கண்காணிப்பு நிலை, பிடித்த நிலை போன்றவை) சுத்தம் செய்கிறது.",
-    "CleanupUserDataTask": "பயனர் தரவை சுத்தம் செய்யும் பணி"
+    "CleanupUserDataTask": "பயனர் தரவை சுத்தம் செய்யும் பணி",
+    "LyricDownloadFailureFromForItem": "{0} இலிருந்து {1} க்கு பாடல் வரிகளைப் பதிவிறக்க முடியவில்லை",
+    "NameExtraBehindTheScenes": "திரைக்குப் பின்னால்",
+    "NameExtraClip": "துண்டுக்காட்சி",
+    "NameExtraDeletedScene": "நீக்கப்பட்ட காட்சிகள்",
+    "NameExtraFeaturette": "திரைப்பின்னணித் தொகுப்பு",
+    "NameExtraInterview": "நேர்காணல்",
+    "NameExtraSample": "மாதிரி",
+    "NameExtraScene": "காட்சி",
+    "NameExtraShort": "குறுகிய",
+    "NameExtraThemeSong": "மையப் பாடல்",
+    "NameExtraThemeVideo": "மையக் காணொளி",
+    "NameExtraTrailer": "முன்னோட்டம்",
+    "NameExtraUnknown": "கூடுதல்",
+    "Original": "அசல்",
+    "NameExtraNumbered": "{0} {1}"
 }
@@ -1,5 +1,5 @@
 {
-    "AppDeviceValues": "Uygulama: {0}, Aygıt: {1}",
+    "AppDeviceValues": "Uygulama: {0}, Cihaz: {1}",
    "Artists": "Sanatçılar",
    "AuthenticationSucceededWithUserName": "{0} kimliği başarıyla doğrulandı",
    "Books": "Kitaplar",
@@ -115,11 +115,11 @@
    "NameExtraFeaturette": "花絮",
    "NameExtraInterview": "采访",
    "NameExtraNumbered": "{0} {1}",
-    "NameExtraSample": "样本",
-    "NameExtraScene": "场景",
-    "NameExtraShort": "短片",
+    "NameExtraSample": "试看",
+    "NameExtraScene": "精选片段",
+    "NameExtraShort": "短篇",
    "NameExtraThemeSong": "主题曲",
    "NameExtraThemeVideo": "主题视频",
    "NameExtraTrailer": "预告片",
-    "NameExtraUnknown": "额外"
+    "NameExtraUnknown": "额外内容"
 }
@@ -10,8 +10,8 @@
    "Folders": "資料夾",
    "Genres": "風格",
    "HeaderContinueWatching": "繼續睇返",
-    "HeaderFavoriteEpisodes": "心水嘅劇集",
-    "HeaderFavoriteShows": "心水嘅節目",
+    "HeaderFavoriteEpisodes": "心水劇集",
+    "HeaderFavoriteShows": "心水節目",
    "HeaderLiveTV": "電視直播",
    "HeaderNextUp": "跟住落嚟",
    "HomeVideos": "家庭影片",
@@ -108,5 +108,18 @@
    "CleanupUserDataTask": "清理使用者資料嘅任務",
    "CleanupUserDataTaskDescription": "清理已消失至少 90 日嘅媒體用家數據（包括觀看狀態、心水狀態等）。",
    "LyricDownloadFailureFromForItem": "冇辦法從 {0} 下載 {1} 嘅歌詞",
-    "Original": "原始"
+    "Original": "原始",
+    "NameExtraBehindTheScenes": "幕後花絮",
+    "NameExtraClip": "片段",
+    "NameExtraDeletedScene": "刪減場景",
+    "NameExtraFeaturette": "花絮",
+    "NameExtraInterview": "采訪",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "試看",
+    "NameExtraScene": "精選片段",
+    "NameExtraShort": "短篇",
+    "NameExtraThemeSong": "主題曲",
+    "NameExtraThemeVideo": "主題影片",
+    "NameExtraTrailer": "預告片",
+    "NameExtraUnknown": "額外內容"
 }
@@ -108,5 +108,18 @@
    "CleanupUserDataTask": "用戶資料清理工作",
    "CleanupUserDataTaskDescription": "從用戶資料中清除已被刪除超過 90 天的媒體的相關資料。",
    "Original": "原作",
-    "LyricDownloadFailureFromForItem": "無法從 {0} 下載 {1} 的歌詞"
+    "LyricDownloadFailureFromForItem": "無法從 {0} 下載 {1} 的歌詞",
+    "NameExtraBehindTheScenes": "幕後花絮",
+    "NameExtraClip": "片段",
+    "NameExtraDeletedScene": "刪減場景",
+    "NameExtraFeaturette": "花絮",
+    "NameExtraInterview": "采訪",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "試看",
+    "NameExtraScene": "精選片段",
+    "NameExtraShort": "短篇",
+    "NameExtraThemeSong": "主題曲",
+    "NameExtraThemeVideo": "主題影片",
+    "NameExtraTrailer": "預告片",
+    "NameExtraUnknown": "額外內容"
 }
@@ -174,7 +174,7 @@ public partial class AudioNormalizationTask : IScheduledTask
                if (!t.NormalizationGain.HasValue && !t.LUFS.HasValue && t.IsFileProtocol)
                {
                    t.LUFS = await CalculateLUFSAsync(
-                        string.Format(CultureInfo.InvariantCulture, "-i \"{0}\"", t.Path.Replace("\"", "\\\"", StringComparison.Ordinal)),
+                        string.Format(CultureInfo.InvariantCulture, "-i \"{0}\"", t.Path.EscapeProcessArgument()),
                        false,
                        cancellationToken).ConfigureAwait(false);
                    toSaveDbItems.Add(t);
@@ -177,33 +177,14 @@ public class PeopleValidationTask : IScheduledTask, IConfigurableScheduledTask
        var thirtyDaysAgo = DateTime.UtcNow.AddDays(-30);
        var personTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.Person];

+        List<Guid> peopleIds;
+
        var context = await _dbContextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
        await using (context.ConfigureAwait(false))
        {
-            const int PartitionSize = 100;
-
-            var numPeople = await context.BaseItems
-                .AsNoTracking()
-                .Where(b => b.Type == personTypeName)
-                .Where(b => b.DateLastRefreshed == null || b.DateLastRefreshed < thirtyDaysAgo)
-                .Where(b =>
-                    !b.Images!.Any(i => i.ImageType == ImageInfoImageType.Primary) ||
-                    string.IsNullOrEmpty(b.Overview))
-                .CountAsync(cancellationToken)
-                .ConfigureAwait(false);
-
-            _logger.LogDebug("Found {Count} people needing image/overview refresh", numPeople);
-
-            if (numPeople == 0)
-            {
-                progress.Report(100);
-                return;
-            }
-
-            var numComplete = 0;
-            var numRefreshed = 0;
-
-            await foreach (var entry in context.BaseItems
+            // Read the candidates in one go rather than paging them. A refresh stamps the person and takes
+            // it out of this set, so a growing offset over a shrinking set walks past people it never visits.
+            peopleIds = await context.BaseItems
                .AsNoTracking()
                .Where(b => b.Type == personTypeName)
                .Where(b => b.DateLastRefreshed == null || b.DateLastRefreshed < thirtyDaysAgo)
@@ -211,22 +192,36 @@ public class PeopleValidationTask : IScheduledTask, IConfigurableScheduledTask
                    !b.Images!.Any(i => i.ImageType == ImageInfoImageType.Primary) ||
                    string.IsNullOrEmpty(b.Overview))
                .OrderBy(b => b.Id)
-                .WithPartitionProgress(partition => _logger.LogDebug("Processing people partition {Partition}", partition))
-                .PartitionEagerAsync(PartitionSize, cancellationToken)
-                .WithCancellation(cancellationToken)
-                .ConfigureAwait(false))
-            {
-                if (await RefreshPersonAsync(entry.Id, cancellationToken).ConfigureAwait(false))
-                {
-                    numRefreshed++;
-                }
+                .Select(b => b.Id)
+                .ToListAsync(cancellationToken)
+                .ConfigureAwait(false);
+        }

-                numComplete++;
-                progress.Report(100.0 * numComplete / numPeople);
+        _logger.LogDebug("Found {Count} people needing image/overview refresh", peopleIds.Count);
+
+        if (peopleIds.Count == 0)
+        {
+            progress.Report(100);
+            return;
+        }
+
+        var numComplete = 0;
+        var numRefreshed = 0;
+
+        foreach (var personId in peopleIds)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            if (await RefreshPersonAsync(personId, cancellationToken).ConfigureAwait(false))
+            {
+                numRefreshed++;
            }

-            _logger.LogInformation("Refreshed metadata for {Count} people missing images or overview", numRefreshed);
+            numComplete++;
+            progress.Report(100.0 * numComplete / peopleIds.Count);
        }
+
+        _logger.LogInformation("Refreshed metadata for {Count} people missing images or overview", numRefreshed);
    }

    private async Task<bool> RefreshPersonAsync(Guid personId, CancellationToken cancellationToken)
@@ -243,8 +238,8 @@ public class PeopleValidationTask : IScheduledTask, IConfigurableScheduledTask

            var options = new MetadataRefreshOptions(new DirectoryService(_fileSystem))
            {
-                ImageRefreshMode = hasImage ? MetadataRefreshMode.ValidationOnly : MetadataRefreshMode.Default,
-                MetadataRefreshMode = hasOverview ? MetadataRefreshMode.ValidationOnly : MetadataRefreshMode.Default
+                ImageRefreshMode = hasImage ? MetadataRefreshMode.ValidationOnly : MetadataRefreshMode.FullRefresh,
+                MetadataRefreshMode = hasOverview ? MetadataRefreshMode.ValidationOnly : MetadataRefreshMode.FullRefresh
            };

            await item.RefreshMetadata(options, cancellationToken).ConfigureAwait(false);
@@ -655,7 +655,7 @@ namespace Emby.Server.Implementations.Session
                            ItemId = session.NowPlayingItem is null ? Guid.Empty : session.NowPlayingItem.Id,
                            SessionId = session.Id,
                            MediaSourceId = session.PlayState?.MediaSourceId,
-                            PositionTicks = session.PlayState?.PositionTicks
+                            PositionTicks = session.LastPlaybackCheckInPositionTicks
                        }).ConfigureAwait(false);
                    }
                    catch (Exception ex)
@@ -20,7 +20,6 @@ using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Controller.Streaming;
-using MediaBrowser.MediaEncoding.Encoder;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Entities;
@@ -1652,9 +1651,9 @@ public class DynamicHlsController : BaseJellyfinApiController
            segmentFormat,
            startNumber.ToString(CultureInfo.InvariantCulture),
            baseUrlParam,
-            EncodingUtils.NormalizePath(outputTsArg),
+            outputTsArg.EscapeProcessArgument(),
            hlsArguments,
-            EncodingUtils.NormalizePath(outputPath)).Trim();
+            outputPath.EscapeProcessArgument()).Trim();
    }

    /// <summary>
@@ -13,6 +13,7 @@ using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Providers;
 using Microsoft.AspNetCore.Authorization;
@@ -263,7 +264,7 @@ public class ItemLookupController : BaseJellyfinApiController
            searchResult.ProviderIds);

        // Since the refresh process won't erase provider Ids, we need to set this explicitly now.
-        item.ProviderIds = searchResult.ProviderIds;
+        item.SetProviderIds(searchResult.ProviderIds);
        await _providerManager.RefreshFullItem(
            item,
            new MetadataRefreshOptions(new DirectoryService(_fileSystem))
@@ -428,15 +428,7 @@ public class ItemUpdateController : BaseJellyfinApiController

        if (request.ProviderIds is not null)
        {
-            foreach (var pair in request.ProviderIds.ToList())
-            {
-                if (string.IsNullOrEmpty(pair.Value))
-                {
-                    request.ProviderIds.Remove(pair.Key);
-                }
-            }
-
-            item.ProviderIds = request.ProviderIds;
+            item.SetProviderIds(request.ProviderIds);
        }

        if (item is Video video)
@@ -34,6 +34,8 @@ namespace Jellyfin.Api.Controllers;
 [Tags("Library")]
 public class UserLibraryController : BaseJellyfinApiController
 {
+    private static readonly TimeSpan RefreshOnDemandTimeout = TimeSpan.FromSeconds(3);
+
    private readonly IUserManager _userManager;
    private readonly IUserDataManager _userDataRepository;
    private readonly ILibraryManager _libraryManager;
@@ -79,7 +81,7 @@ public class UserLibraryController : BaseJellyfinApiController
    /// <returns>An <see cref="OkResult"/> containing the item.</returns>
    [HttpGet("Items/{itemId}")]
    [ProducesResponseType(StatusCodes.Status200OK)]
-    public ActionResult<BaseItemDto> GetItem(
+    public async Task<ActionResult<BaseItemDto>> GetItem(
        [FromQuery] Guid? userId,
        [FromRoute, Required] Guid itemId)
    {
@@ -98,7 +100,7 @@ public class UserLibraryController : BaseJellyfinApiController
            return NotFound();
        }

-        QueueRefreshOnDemandIfNeeded(item);
+        await RefreshOnDemandIfNeeded(item).ConfigureAwait(false);

        var dtoOptions = new DtoOptions();

@@ -116,7 +118,7 @@ public class UserLibraryController : BaseJellyfinApiController
    [ProducesResponseType(StatusCodes.Status200OK)]
    [Obsolete("Kept for backwards compatibility")]
    [ApiExplorerSettings(IgnoreApi = true)]
-    public ActionResult<BaseItemDto> GetItemLegacy(
+    public Task<ActionResult<BaseItemDto>> GetItemLegacy(
        [FromRoute, Required] Guid userId,
        [FromRoute, Required] Guid itemId)
        => GetItem(userId, itemId);
@@ -643,7 +645,7 @@ public class UserLibraryController : BaseJellyfinApiController
            limit,
            groupItems);

-    private void QueueRefreshOnDemandIfNeeded(BaseItem item)
+    private async Task RefreshOnDemandIfNeeded(BaseItem item)
    {
        if (item is not Person)
        {
@@ -656,15 +658,24 @@ public class UserLibraryController : BaseJellyfinApiController
            return;
        }

-        _providerManager.QueueRefresh(
-            item.Id,
-            new MetadataRefreshOptions(new DirectoryService(_fileSystem))
-            {
-                MetadataRefreshMode = MetadataRefreshMode.FullRefresh,
-                ImageRefreshMode = MetadataRefreshMode.FullRefresh,
-                ForceSave = true
-            },
-            RefreshPriority.High);
+        var options = new MetadataRefreshOptions(new DirectoryService(_fileSystem))
+        {
+            MetadataRefreshMode = MetadataRefreshMode.FullRefresh,
+            ImageRefreshMode = MetadataRefreshMode.FullRefresh,
+            ForceSave = true
+        };
+
+        using var timeout = CancellationTokenSource.CreateLinkedTokenSource(HttpContext.RequestAborted);
+        timeout.CancelAfter(RefreshOnDemandTimeout);
+
+        try
+        {
+            await item.RefreshMetadata(options, timeout.Token).ConfigureAwait(false);
+        }
+        catch (OperationCanceledException) when (!HttpContext.RequestAborted.IsCancellationRequested)
+        {
+            _providerManager.QueueRefresh(item.Id, options, RefreshPriority.High);
+        }
    }

    /// <summary>
@@ -12,6 +12,7 @@ using Jellyfin.Database.Implementations;
 using Jellyfin.Database.Implementations.Entities;
 using Jellyfin.Database.Implementations.Enums;
 using Jellyfin.Extensions;
+using Jellyfin.Server.Implementations.Extensions;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Querying;
@@ -323,10 +324,21 @@ public sealed partial class BaseItemRepository
            orderedQuery = query.OrderBy(relevanceExpression);
        }

+        // Folders carry no played flag of their own, so these two keys go through the same predicate
+        // the isPlayed filter uses rather than through the stored-column lookup in OrderMapper.
+        Expression<Func<BaseItemEntity, object?>> MapOrderByField(ItemSortBy sortBy) => sortBy switch
+        {
+            ItemSortBy.IsPlayed when filter.User is not null
+                => AsOrderKey(BuildIsPlayedFilter(context, filter.User)),
+            ItemSortBy.IsUnplayed when filter.User is not null
+                => AsOrderKey(BuildIsPlayedFilter(context, filter.User).Not()),
+            _ => OrderMapper.MapOrderByField(sortBy, filter, context)
+        };
+
        if (orderBy.Length > 0)
        {
            var firstOrdering = orderBy[0];
-            var expression = OrderMapper.MapOrderByField(firstOrdering.OrderBy, filter, context);
+            var expression = MapOrderByField(firstOrdering.OrderBy);

            if (orderedQuery is null)
            {
@@ -350,7 +362,7 @@ public sealed partial class BaseItemRepository

            foreach (var item in orderBy.Skip(1))
            {
-                expression = OrderMapper.MapOrderByField(item.OrderBy, filter, context);
+                expression = MapOrderByField(item.OrderBy);
                orderedQuery = item.SortOrder == SortOrder.Ascending
                    ? orderedQuery.ThenBy(expression)
                    : orderedQuery.ThenByDescending(expression);
@@ -666,6 +678,9 @@ public sealed partial class BaseItemRepository
        return ApplyAccessFiltering(context, leafItems, new InternalItemsQuery(user) { IncludeOwnedItems = includeOwnedItems });
    }

+    private static Expression<Func<BaseItemEntity, object?>> AsOrderKey(Expression<Func<BaseItemEntity, bool>> predicate)
+        => Expression.Lambda<Func<BaseItemEntity, object?>>(Expression.Convert(predicate.Body, typeof(object)), predicate.Parameters);
+
    /// <inheritdoc />
    public Expression<Func<BaseItemEntity, bool>> BuildHasDescendantFilter(JellyfinDbContext context, IQueryable<BaseItemEntity> descendants)
    {
@@ -110,7 +110,7 @@ public sealed partial class BaseItemRepository
        PrepareFilterQuery(filter);

        // Early exit if collection type is not supported
-        if (collectionType is not CollectionType.movies and not CollectionType.tvshows and not CollectionType.music)
+        if (collectionType is not CollectionType.movies and not CollectionType.tvshows and not CollectionType.music and not CollectionType.unknown)
        {
            return [];
        }
@@ -121,30 +121,27 @@ public sealed partial class BaseItemRepository
        var baseQuery = PrepareItemQuery(context, filter);
        baseQuery = TranslateQuery(baseQuery, context, filter);

-        if (collectionType == CollectionType.tvshows)
+        if (collectionType is CollectionType.tvshows)
        {
            return GetLatestTvShowItems(context, baseQuery, filter, limit);
        }

        if (collectionType is CollectionType.movies)
        {
-            // Pick, per PresentationUniqueKey, the newest item; return the newest `limit` of those.
-            // Build up until limit by streaming through results and deduplicating on the fly.
-            var orderedIds = baseQuery
-                .Where(e => e.PresentationUniqueKey != null)
-                .OrderByDescending(e => e.DateCreated)
-                .ThenByDescending(e => e.Id)
-                .Select(e => new { e.Id, e.PresentationUniqueKey });
+            return GetLatestMovieItems(context, baseQuery, filter, limit);
+        }

-            // DistinctBy and Take are lazy, so enumeration stops as soon as limit distinct keys are read.
-            var firstIds = orderedIds
-                .AsEnumerable()
-                .DistinctBy(row => row.PresentationUniqueKey)
-                .Select(row => row.Id)
+        if (collectionType is CollectionType.unknown)
+        {
+            var moviesQuery = baseQuery.Where(e => e.SeriesName == null);
+            var latestMovies = GetLatestMovieItems(context, moviesQuery, filter, limit);
+            var latestShows = GetLatestTvShowItems(context, baseQuery, filter, limit);
+
+            return latestMovies.Concat(latestShows)
+                .OrderByDescending(dto => dto.DateCreated)
+                .ThenByDescending(dto => dto.Id)
                .Take(limit ?? int.MaxValue)
                .ToList();
-
-            return LoadLatestByIds(context, firstIds, filter);
        }

        var musicAlbumTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicAlbum]!;
@@ -225,6 +222,39 @@ public sealed partial class BaseItemRepository
            .ToArray()!;
    }

+    /// <summary>
+    /// Gets the latest movies, deduplicated so each movie only appears once.
+    /// </summary>
+    /// <param name="context">The database context.</param>
+    /// <param name="baseQuery">The query to pull movies from, with filters already applied.</param>
+    /// <param name="filter">The original query filter, used when loading the final items.</param>
+    /// <param name="limit">How many items to return.</param>
+    /// <returns>The latest movies, newest first.</returns>
+    private IReadOnlyList<BaseItemDto> GetLatestMovieItems(
+        JellyfinDbContext context,
+        IQueryable<BaseItemEntity> baseQuery,
+        InternalItemsQuery filter,
+        int? limit)
+    {
+        // Pick, per PresentationUniqueKey, the newest item; return the newest `limit` of those.
+        // Build up until limit by streaming through results and deduplicating on the fly.
+        var orderedIds = baseQuery
+            .Where(e => e.PresentationUniqueKey != null)
+            .OrderByDescending(e => e.DateCreated)
+            .ThenByDescending(e => e.Id)
+            .Select(e => new { e.Id, e.PresentationUniqueKey });
+
+        // DistinctBy and Take are lazy, so enumeration stops as soon as limit distinct keys are read.
+        var firstIds = orderedIds
+            .AsEnumerable()
+            .DistinctBy(row => row.PresentationUniqueKey)
+            .Select(row => row.Id)
+            .Take(limit ?? int.MaxValue)
+            .ToList();
+
+        return LoadLatestByIds(context, firstIds, filter);
+    }
+
    /// <summary>
    /// Gets the latest TV show items with smart Season/Series container selection.
    /// </summary>
@@ -35,6 +35,39 @@ public sealed partial class BaseItemRepository
    // instance across several lambdas, and this filter is combined into a tree more than once.
    private static Expression<Func<BaseItemEntity, bool>> IsFolderFilter => e => e.IsFolder;

+    // Shared by the isPlayed filter and the IsPlayed/IsUnplayed ordering so the two cannot disagree.
+    private Expression<Func<BaseItemEntity, bool>> BuildIsPlayedFilter(JellyfinDbContext context, User user)
+    {
+        var userId = user.Id;
+
+        // Leaf items carry their own played state.
+        var playedItemIds = context.UserData
+            .Where(ud => ud.UserId == userId && ud.Played)
+            .Select(ud => ud.ItemId);
+
+        // Folders (Series, Seasons, BoxSets, albums, ...) have none and count as played once no
+        // descendant is left unplayed, matching what the DTO reports for them. This has to key off
+        // the item itself rather than off the requested item types: tag and collection listings mix
+        // folders and leaf items in a single query.
+        var unplayedLeafItems = GetAccessFilteredLeafItemsQuery(context, user)
+            .Where(e => !e.UserData!.Any(ud => ud.UserId == userId && ud.Played));
+
+        return IsFolderFilter.And(BuildHasDescendantFilter(context, unplayedLeafItems).Not())
+            .Or(IsFolderFilter.Not().And(e => playedItemIds.Contains(e.Id)));
+    }
+
+    // "und" is the language filters' stand-in for a track that declares no language at all.
+    private static string NormalizeLanguage(string language)
+        => string.Equals(language, "und", StringComparison.OrdinalIgnoreCase) ? "und" : language;
+
+    // The primary versions whose alternate version satisfies a dimension bound. Anchored on
+    // PrimaryVersionId so the filtered index carries it rather than a scan of every item.
+    private static IQueryable<Guid> VersionsMatchingDimension(JellyfinDbContext context, Expression<Func<BaseItemEntity, bool>> bound)
+        => context.BaseItems
+            .Where(v => v.PrimaryVersionId != null)
+            .Where(bound)
+            .Select(v => v.PrimaryVersionId!.Value);
+
    /// <inheritdoc />
    public IQueryable<BaseItemEntity> TranslateQuery(
        IQueryable<BaseItemEntity> baseQuery,
@@ -70,47 +103,86 @@ public sealed partial class BaseItemRepository
                include4K = true;
            }

-            // Non-folders: check own resolution directly (no subquery).
-            // Folders (Series, BoxSets): EXISTS check on descendants/linked children.
-            // Using navigation properties (a.Item, lc.Child) produces efficient
-            // EXISTS + JOIN instead of nested IN (SELECT ...) subqueries.
+            // A 4K remux of an SD primary is a version of the same item, so the bucket a caller filters
+            // on is the best any of the item's versions offers, not just the primary file's. Three sets,
+            // because a bucket is as much about what the version group does not have as what it does, and
+            // because an unprobed primary can still be placed by a version that does carry dimensions.
+            // The filtered PrimaryVersionId index keeps all three to the few items that have versions.
+            var versionsSd = VersionsMatchingDimension(context, v => v.Width > 0 && v.Width < HDWidth);
+            var versionsHd = VersionsMatchingDimension(context, v => v.Width >= HDWidth);
+            var versions4K = VersionsMatchingDimension(context, v => v.Width >= UHDWidth || v.Height >= UHDHeight);
+
+            // Only the SD test needs the Width > 0 guard against a row with no dimensions: such a row
+            // cannot reach the HD or 4K bound anyway, and EF lowers the HD bucket's negated "not itself
+            // 4K" guard to CASE WHEN ... THEN 0 ELSE 1, which already reads unknown as not 4K rather
+            // than propagating a null. Folders (Series, BoxSets) answer on their descendants, bucketed
+            // exactly as a top-level item is so that the two cannot disagree; the navigation properties
+            // (a.Item, lc.Child) give EXISTS + JOIN rather than nested IN (SELECT ...).
            baseQuery = baseQuery.Where(e =>
-                (!e.IsFolder && e.Width > 0
-                    && ((includeSD && e.Width < HDWidth)
-                        || (includeHD && e.Width >= HDWidth && !(e.Width >= UHDWidth || e.Height >= UHDHeight))
-                        || (include4K && (e.Width >= UHDWidth || e.Height >= UHDHeight))))
+                (!e.IsFolder
+                    && ((includeSD
+                            && ((e.Width > 0 && e.Width < HDWidth) || versionsSd.Contains(e.Id))
+                            && !versionsHd.Contains(e.Id)
+                            && !versions4K.Contains(e.Id))
+                        || (includeHD
+                            && (e.Width >= HDWidth || versionsHd.Contains(e.Id))
+                            && !(e.Width >= UHDWidth || e.Height >= UHDHeight)
+                            && !versions4K.Contains(e.Id))
+                        || (include4K
+                            && (e.Width >= UHDWidth || e.Height >= UHDHeight || versions4K.Contains(e.Id)))))
                || (e.IsFolder
                    && (e.Children!.Any(a =>
-                            a.Item.Width > 0
-                            && ((includeSD && a.Item.Width < HDWidth)
-                                || (includeHD && a.Item.Width >= HDWidth && !(a.Item.Width >= UHDWidth || a.Item.Height >= UHDHeight))
-                                || (include4K && (a.Item.Width >= UHDWidth || a.Item.Height >= UHDHeight))))
+                            (includeSD
+                                && ((a.Item.Width > 0 && a.Item.Width < HDWidth) || versionsSd.Contains(a.ItemId))
+                                && !versionsHd.Contains(a.ItemId)
+                                && !versions4K.Contains(a.ItemId))
+                            || (includeHD
+                                && (a.Item.Width >= HDWidth || versionsHd.Contains(a.ItemId))
+                                && !(a.Item.Width >= UHDWidth || a.Item.Height >= UHDHeight)
+                                && !versions4K.Contains(a.ItemId))
+                            || (include4K
+                                && (a.Item.Width >= UHDWidth || a.Item.Height >= UHDHeight || versions4K.Contains(a.ItemId))))
                        || context.LinkedChildren.Any(lc =>
                            lc.ParentId == e.Id
-                            && lc.Child!.Width > 0
-                            && ((includeSD && lc.Child.Width < HDWidth)
-                                || (includeHD && lc.Child.Width >= HDWidth && !(lc.Child.Width >= UHDWidth || lc.Child.Height >= UHDHeight))
-                                || (include4K && (lc.Child.Width >= UHDWidth || lc.Child.Height >= UHDHeight)))))));
+                            && ((includeSD
+                                    && ((lc.Child!.Width > 0 && lc.Child!.Width < HDWidth) || versionsSd.Contains(lc.ChildId))
+                                    && !versionsHd.Contains(lc.ChildId)
+                                    && !versions4K.Contains(lc.ChildId))
+                                || (includeHD
+                                    && (lc.Child!.Width >= HDWidth || versionsHd.Contains(lc.ChildId))
+                                    && !(lc.Child!.Width >= UHDWidth || lc.Child!.Height >= UHDHeight)
+                                    && !versions4K.Contains(lc.ChildId))
+                                || (include4K
+                                    && (lc.Child!.Width >= UHDWidth || lc.Child!.Height >= UHDHeight || versions4K.Contains(lc.ChildId))))))));
        }

+        // Same reasoning as the resolution filter: a dimension bound is met if any version meets it.
        if (minWidth.HasValue)
        {
-            baseQuery = baseQuery.Where(e => e.Width >= minWidth);
+            var versionsWideEnough = VersionsMatchingDimension(context, v => v.Width >= minWidth);
+            baseQuery = baseQuery.Where(e => e.Width >= minWidth || versionsWideEnough.Contains(e.Id));
        }

        if (filter.MinHeight.HasValue)
        {
-            baseQuery = baseQuery.Where(e => e.Height >= filter.MinHeight);
+            var minHeight = filter.MinHeight;
+            var versionsTallEnough = VersionsMatchingDimension(context, v => v.Height >= minHeight);
+            baseQuery = baseQuery.Where(e => e.Height >= minHeight || versionsTallEnough.Contains(e.Id));
        }

+        // An upper bound inverts that: it is met only if no version breaches it, since the item's
+        // resolution is the best its version group offers.
        if (maxWidth.HasValue)
        {
-            baseQuery = baseQuery.Where(e => e.Width <= maxWidth);
+            var versionsTooWide = VersionsMatchingDimension(context, v => v.Width > maxWidth);
+            baseQuery = baseQuery.Where(e => e.Width <= maxWidth && !versionsTooWide.Contains(e.Id));
        }

        if (filter.MaxHeight.HasValue)
        {
-            baseQuery = baseQuery.Where(e => e.Height <= filter.MaxHeight);
+            var maxHeight = filter.MaxHeight;
+            var versionsTooTall = VersionsMatchingDimension(context, v => v.Height > maxHeight);
+            baseQuery = baseQuery.Where(e => e.Height <= maxHeight && !versionsTooTall.Contains(e.Id));
        }

        if (filter.IsLocked.HasValue)
@@ -472,22 +544,7 @@ public sealed partial class BaseItemRepository

        if (filter.IsPlayed.HasValue)
        {
-            var userId = filter.User!.Id;
-
-            // Leaf items carry their own played state.
-            var playedItemIds = context.UserData
-                .Where(ud => ud.UserId == userId && ud.Played)
-                .Select(ud => ud.ItemId);
-
-            // Folders (Series, Seasons, BoxSets, albums, ...) have none and count as played once no
-            // descendant is left unplayed, matching what the DTO reports for them. This has to key off
-            // the item itself rather than off the requested item types: tag and collection listings mix
-            // folders and leaf items in a single query.
-            var unplayedLeafItems = GetAccessFilteredLeafItemsQuery(context, filter.User!)
-                .Where(e => !e.UserData!.Any(ud => ud.UserId == userId && ud.Played));
-
-            var isPlayedFilter = IsFolderFilter.And(BuildHasDescendantFilter(context, unplayedLeafItems).Not())
-                .Or(IsFolderFilter.Not().And(e => playedItemIds.Contains(e.Id)));
+            var isPlayedFilter = BuildIsPlayedFilter(context, filter.User!);

            baseQuery = baseQuery.Where(filter.IsPlayed.Value ? isPlayedFilter : isPlayedFilter.Not());
        }
@@ -761,104 +818,144 @@ public sealed partial class BaseItemRepository

        if (!string.IsNullOrWhiteSpace(filter.HasNoAudioTrackWithLanguage))
        {
-            var lang = filter.HasNoAudioTrackWithLanguage;
-            var foldersWithAudio = DescendantQueryHelper.GetFolderIdsMatching(context, new HasMediaStreamType(MediaStreamTypeEntity.Audio, lang));
+            var lang = NormalizeLanguage(filter.HasNoAudioTrackWithLanguage);
+            var undetermined = string.Equals(lang, "und", StringComparison.Ordinal);
+            var criteria = new HasMediaStreamType(MediaStreamTypeEntity.Audio, lang);
+            // A track only an alternate version carries still belongs to the item a caller sees, so the
+            // item's own streams alone do not decide this. Same for every stream filter below.
+            var versionsWithAudio = DescendantQueryHelper.GetPrimaryVersionIdsMatching(context, criteria);
+            var foldersWithAudio = DescendantQueryHelper.GetFolderIdsMatching(context, criteria);

            baseQuery = baseQuery
                .Where(e =>
-                    (!e.IsFolder && !e.MediaStreams!.Any(ms => ms.StreamType == MediaStreamTypeEntity.Audio && ms.Language == lang))
+                    (!e.IsFolder
+                        && !e.MediaStreams!.Any(ms => ms.StreamType == MediaStreamTypeEntity.Audio
+                            && (ms.Language == lang || (undetermined && string.IsNullOrEmpty(ms.Language))))
+                        && !versionsWithAudio.Contains(e.Id))
                    || (e.IsFolder && !foldersWithAudio.Contains(e.Id)));
        }

        if (!string.IsNullOrWhiteSpace(filter.HasNoInternalSubtitleTrackWithLanguage))
        {
-            var lang = filter.HasNoInternalSubtitleTrackWithLanguage;
-            var foldersWithSubtitles = DescendantQueryHelper.GetFolderIdsMatching(context, new HasMediaStreamType(MediaStreamTypeEntity.Subtitle, lang, IsExternal: false));
+            var lang = NormalizeLanguage(filter.HasNoInternalSubtitleTrackWithLanguage);
+            var undetermined = string.Equals(lang, "und", StringComparison.Ordinal);
+            var criteria = new HasMediaStreamType(MediaStreamTypeEntity.Subtitle, lang, IsExternal: false);
+            var versionsWithSubtitles = DescendantQueryHelper.GetPrimaryVersionIdsMatching(context, criteria);
+            var foldersWithSubtitles = DescendantQueryHelper.GetFolderIdsMatching(context, criteria);

            baseQuery = baseQuery
                .Where(e =>
-                    (!e.IsFolder && !e.MediaStreams!.Any(ms => ms.StreamType == MediaStreamTypeEntity.Subtitle && !ms.IsExternal && ms.Language == lang))
+                    (!e.IsFolder
+                        && !e.MediaStreams!.Any(ms => ms.StreamType == MediaStreamTypeEntity.Subtitle && !ms.IsExternal
+                            && (ms.Language == lang || (undetermined && string.IsNullOrEmpty(ms.Language))))
+                        && !versionsWithSubtitles.Contains(e.Id))
                    || (e.IsFolder && !foldersWithSubtitles.Contains(e.Id)));
        }

        if (!string.IsNullOrWhiteSpace(filter.HasNoExternalSubtitleTrackWithLanguage))
        {
-            var lang = filter.HasNoExternalSubtitleTrackWithLanguage;
-            var foldersWithSubtitles = DescendantQueryHelper.GetFolderIdsMatching(context, new HasMediaStreamType(MediaStreamTypeEntity.Subtitle, lang, IsExternal: true));
+            var lang = NormalizeLanguage(filter.HasNoExternalSubtitleTrackWithLanguage);
+            var undetermined = string.Equals(lang, "und", StringComparison.Ordinal);
+            var criteria = new HasMediaStreamType(MediaStreamTypeEntity.Subtitle, lang, IsExternal: true);
+            var versionsWithSubtitles = DescendantQueryHelper.GetPrimaryVersionIdsMatching(context, criteria);
+            var foldersWithSubtitles = DescendantQueryHelper.GetFolderIdsMatching(context, criteria);

            baseQuery = baseQuery
                .Where(e =>
-                    (!e.IsFolder && !e.MediaStreams!.Any(ms => ms.StreamType == MediaStreamTypeEntity.Subtitle && ms.IsExternal && ms.Language == lang))
+                    (!e.IsFolder
+                        && !e.MediaStreams!.Any(ms => ms.StreamType == MediaStreamTypeEntity.Subtitle && ms.IsExternal
+                            && (ms.Language == lang || (undetermined && string.IsNullOrEmpty(ms.Language))))
+                        && !versionsWithSubtitles.Contains(e.Id))
                    || (e.IsFolder && !foldersWithSubtitles.Contains(e.Id)));
        }

        if (!string.IsNullOrWhiteSpace(filter.HasNoSubtitleTrackWithLanguage))
        {
-            var lang = filter.HasNoSubtitleTrackWithLanguage;
-            var foldersWithSubtitles = DescendantQueryHelper.GetFolderIdsMatching(context, new HasMediaStreamType(MediaStreamTypeEntity.Subtitle, lang));
+            var lang = NormalizeLanguage(filter.HasNoSubtitleTrackWithLanguage);
+            var undetermined = string.Equals(lang, "und", StringComparison.Ordinal);
+            var criteria = new HasMediaStreamType(MediaStreamTypeEntity.Subtitle, lang);
+            var versionsWithSubtitles = DescendantQueryHelper.GetPrimaryVersionIdsMatching(context, criteria);
+            var foldersWithSubtitles = DescendantQueryHelper.GetFolderIdsMatching(context, criteria);

            baseQuery = baseQuery
                .Where(e =>
-                    (!e.IsFolder && !e.MediaStreams!.Any(ms => ms.StreamType == MediaStreamTypeEntity.Subtitle && ms.Language == lang))
+                    (!e.IsFolder
+                        && !e.MediaStreams!.Any(ms => ms.StreamType == MediaStreamTypeEntity.Subtitle
+                            && (ms.Language == lang || (undetermined && string.IsNullOrEmpty(ms.Language))))
+                        && !versionsWithSubtitles.Contains(e.Id))
                    || (e.IsFolder && !foldersWithSubtitles.Contains(e.Id)));
        }

        if (filter.HasSubtitles.HasValue)
        {
            var hasSubtitles = filter.HasSubtitles.Value;
-            var foldersWithSubtitles = DescendantQueryHelper.GetFolderIdsMatching(context, new HasSubtitles());
+            var criteria = new HasSubtitles();
+            var versionsWithSubtitles = DescendantQueryHelper.GetPrimaryVersionIdsMatching(context, criteria);
+            var foldersWithSubtitles = DescendantQueryHelper.GetFolderIdsMatching(context, criteria);
            if (hasSubtitles)
            {
                baseQuery = baseQuery
                    .Where(e =>
-                        (!e.IsFolder && e.MediaStreams!.Any(f => f.StreamType == MediaStreamTypeEntity.Subtitle))
+                        (!e.IsFolder && (e.MediaStreams!.Any(f => f.StreamType == MediaStreamTypeEntity.Subtitle)
+                            || versionsWithSubtitles.Contains(e.Id)))
                        || (e.IsFolder && foldersWithSubtitles.Contains(e.Id)));
            }
            else
            {
                baseQuery = baseQuery
                    .Where(e =>
-                        (!e.IsFolder && !e.MediaStreams!.Any(f => f.StreamType == MediaStreamTypeEntity.Subtitle))
+                        (!e.IsFolder && !e.MediaStreams!.Any(f => f.StreamType == MediaStreamTypeEntity.Subtitle)
+                            && !versionsWithSubtitles.Contains(e.Id))
                        || (e.IsFolder && !foldersWithSubtitles.Contains(e.Id)));
            }
        }

        if (filter.SubtitleLanguages.Count > 0)
        {
-            var foldersWithSubtitles = DescendantQueryHelper.GetFolderIdsMatching(context, new HasMediaStreamType(MediaStreamTypeEntity.Subtitle, filter.SubtitleLanguages));
+            var criteria = new HasMediaStreamType(MediaStreamTypeEntity.Subtitle, filter.SubtitleLanguages);
+            var versionsWithSubtitles = DescendantQueryHelper.GetPrimaryVersionIdsMatching(context, criteria);
+            var foldersWithSubtitles = DescendantQueryHelper.GetFolderIdsMatching(context, criteria);
            baseQuery = baseQuery
                .Where(e =>
-                    (!e.IsFolder && e.MediaStreams!.Any(f => f.StreamType == MediaStreamTypeEntity.Subtitle
-                     && (filter.SubtitleLanguages.Contains(f.Language) || (filter.SubtitleLanguages.Contains("und") && string.IsNullOrEmpty(f.Language)))))
+                    (!e.IsFolder && (e.MediaStreams!.Any(f => f.StreamType == MediaStreamTypeEntity.Subtitle
+                        && (filter.SubtitleLanguages.Contains(f.Language) || (filter.SubtitleLanguages.Contains("und") && string.IsNullOrEmpty(f.Language))))
+                        || versionsWithSubtitles.Contains(e.Id)))
                    || (e.IsFolder && foldersWithSubtitles.Contains(e.Id)));
        }

        if (filter.AudioLanguages.Count > 0)
        {
-            var foldersWithAudio = DescendantQueryHelper.GetFolderIdsMatching(context, new HasMediaStreamType(MediaStreamTypeEntity.Audio, filter.AudioLanguages));
+            var criteria = new HasMediaStreamType(MediaStreamTypeEntity.Audio, filter.AudioLanguages);
+            var versionsWithAudio = DescendantQueryHelper.GetPrimaryVersionIdsMatching(context, criteria);
+            var foldersWithAudio = DescendantQueryHelper.GetFolderIdsMatching(context, criteria);
            baseQuery = baseQuery
                .Where(e =>
-                    (!e.IsFolder && e.MediaStreams!.Any(f => f.StreamType == MediaStreamTypeEntity.Audio
-                     && (filter.AudioLanguages.Contains(f.Language) || (filter.AudioLanguages.Contains("und") && string.IsNullOrEmpty(f.Language)))))
+                    (!e.IsFolder && (e.MediaStreams!.Any(f => f.StreamType == MediaStreamTypeEntity.Audio
+                        && (filter.AudioLanguages.Contains(f.Language) || (filter.AudioLanguages.Contains("und") && string.IsNullOrEmpty(f.Language))))
+                        || versionsWithAudio.Contains(e.Id)))
                    || (e.IsFolder && foldersWithAudio.Contains(e.Id)));
        }

        if (filter.HasChapterImages.HasValue)
        {
            var hasChapterImages = filter.HasChapterImages.Value;
-            var foldersWithChapterImages = DescendantQueryHelper.GetFolderIdsMatching(context, new HasChapterImages());
+            var criteria = new HasChapterImages();
+            var versionsWithChapterImages = DescendantQueryHelper.GetPrimaryVersionIdsMatching(context, criteria);
+            var foldersWithChapterImages = DescendantQueryHelper.GetFolderIdsMatching(context, criteria);
            if (hasChapterImages)
            {
                baseQuery = baseQuery
                    .Where(e =>
-                        (!e.IsFolder && e.Chapters!.Any(f => f.ImagePath != null))
+                        (!e.IsFolder && (e.Chapters!.Any(f => f.ImagePath != null)
+                            || versionsWithChapterImages.Contains(e.Id)))
                        || (e.IsFolder && foldersWithChapterImages.Contains(e.Id)));
            }
            else
            {
                baseQuery = baseQuery
                    .Where(e =>
-                        (!e.IsFolder && !e.Chapters!.Any(f => f.ImagePath != null))
+                        (!e.IsFolder && !e.Chapters!.Any(f => f.ImagePath != null)
+                            && !versionsWithChapterImages.Contains(e.Id))
                        || (e.IsFolder && !foldersWithChapterImages.Contains(e.Id)));
            }
        }
@@ -260,19 +260,21 @@ public class ItemCountService : IItemCountService
    /// <inheritdoc/>
    public int GetPlayedCount(InternalItemsQuery filter, Guid ancestorId)
    {
+        ArgumentNullException.ThrowIfNull(filter);
        ArgumentNullException.ThrowIfNull(filter.User);
        using var dbContext = _dbProvider.CreateDbContext();

-        var baseQuery = _queryHelpers.BuildAccessFilteredDescendantsQuery(dbContext, filter, ancestorId);
+        var baseQuery = BuildGroupedDescendantsQuery(dbContext, filter, ancestorId);
        return baseQuery.Count(b => b.UserData!.Any(u => u.UserId == filter.User.Id && u.Played));
    }

    /// <inheritdoc/>
    public int GetTotalCount(InternalItemsQuery filter, Guid ancestorId)
    {
+        ArgumentNullException.ThrowIfNull(filter);
        using var dbContext = _dbProvider.CreateDbContext();

-        var baseQuery = _queryHelpers.BuildAccessFilteredDescendantsQuery(dbContext, filter, ancestorId);
+        var baseQuery = BuildGroupedDescendantsQuery(dbContext, filter, ancestorId);
        return baseQuery.Count();
    }

@@ -283,10 +285,23 @@ public class ItemCountService : IItemCountService
        ArgumentNullException.ThrowIfNull(filter.User);
        using var dbContext = _dbProvider.CreateDbContext();

-        var baseQuery = _queryHelpers.BuildAccessFilteredDescendantsQuery(dbContext, filter, ancestorId);
+        var baseQuery = BuildGroupedDescendantsQuery(dbContext, filter, ancestorId);
        return GetPlayedAndTotalCountFromQuery(baseQuery, filter.User.Id);
    }

+    private IQueryable<BaseItemEntity> BuildGroupedDescendantsQuery(JellyfinDbContext dbContext, InternalItemsQuery filter, Guid ancestorId)
+    {
+        var ancestorIds = GetPresentationKeyGroups(dbContext, [ancestorId])[ancestorId];
+        var descendantIds = DescendantQueryHelper.GetAllDescendantIdsBatch(dbContext, ancestorIds).ToArray();
+
+        var baseQuery = dbContext.BaseItems
+            .AsNoTracking()
+            .WhereOneOrMany(descendantIds, b => b.Id)
+            .Where(DescendantQueryHelper.IsCountableLeaf);
+
+        return _queryHelpers.ApplyAccessFiltering(dbContext, baseQuery, filter);
+    }
+
    /// <inheritdoc/>
    public (int Played, int Total) GetPlayedAndTotalCountFromLinkedChildren(InternalItemsQuery filter, Guid parentId)
    {
@@ -294,9 +309,9 @@ public class ItemCountService : IItemCountService
        ArgumentNullException.ThrowIfNull(filter.User);
        using var dbContext = _dbProvider.CreateDbContext();

-        var allDescendantIds = DescendantQueryHelper.GetAllDescendantIds(dbContext, parentId);
+        var allDescendantIds = DescendantQueryHelper.GetAllDescendantIdsBatch(dbContext, [parentId]).ToArray();
        var baseQuery = dbContext.BaseItems
-            .Where(b => allDescendantIds.Contains(b.Id))
+            .WhereOneOrMany(allDescendantIds, b => b.Id)
            .Where(DescendantQueryHelper.IsCountableLeaf);
        baseQuery = _queryHelpers.ApplyAccessFiltering(dbContext, baseQuery, filter);

@@ -318,20 +333,29 @@ public class ItemCountService : IItemCountService
        var parentIdsArray = parentIds.ToArray();

        var hierarchicalCounts = dbContext.BaseItems
-            .Where(b => b.ParentId.HasValue && parentIdsArray.Contains(b.ParentId.Value))
+            .Where(b => b.ParentId.HasValue)
+            .WhereOneOrMany(parentIdsArray, b => b.ParentId!.Value)
            .GroupBy(b => b.ParentId!.Value)
            .Select(g => new { ParentId = g.Key, Count = g.Count() })
            .ToDictionary(x => x.ParentId, x => x.Count);

        var linkedCounts = dbContext.LinkedChildren
-            .Where(lc => parentIdsArray.Contains(lc.ParentId))
+            .WhereOneOrMany(parentIdsArray, lc => lc.ParentId)
            .GroupBy(lc => lc.ParentId)
            .Select(g => new { ParentId = g.Key, Count = g.Count() })
            .ToDictionary(x => x.ParentId, x => x.Count);

+        var mergedChildCounts = GetMergedChildCounts(dbContext, parentIdsArray);
+
        var result = new Dictionary<Guid, int>();
        foreach (var parentId in parentIds)
        {
+            if (mergedChildCounts.TryGetValue(parentId, out var mergedCount))
+            {
+                result[parentId] = mergedCount;
+                continue;
+            }
+
            var hierarchicalCount = hierarchicalCounts.GetValueOrDefault(parentId, 0);
            var linkedCount = linkedCounts.GetValueOrDefault(parentId, 0);

@@ -341,6 +365,50 @@ public class ItemCountService : IItemCountService
        return result;
    }

+    private static Dictionary<Guid, int> GetMergedChildCounts(JellyfinDbContext dbContext, IReadOnlyList<Guid> parentIds)
+    {
+        var mergedGroups = GetPresentationKeyGroups(dbContext, parentIds)
+            .Where(group => group.Value.Count > 1)
+            .ToArray();
+
+        if (mergedGroups.Length == 0)
+        {
+            return [];
+        }
+
+        // Only merged folders.
+        var memberIds = mergedGroups.SelectMany(group => group.Value).Distinct().ToArray();
+        var children = dbContext.BaseItems
+            .AsNoTracking()
+            .Where(b => b.ParentId.HasValue)
+            .WhereOneOrMany(memberIds, b => b.ParentId!.Value)
+            .Select(b => new { ParentId = b.ParentId!.Value, b.Id, b.PresentationUniqueKey })
+            .ToArray()
+            .GroupBy(b => b.ParentId)
+            .ToDictionary(
+                g => g.Key,
+                g => g.Select(b => string.IsNullOrEmpty(b.PresentationUniqueKey)
+                    ? b.Id.ToString("N", CultureInfo.InvariantCulture)
+                    : b.PresentationUniqueKey).ToArray());
+
+        var result = new Dictionary<Guid, int>();
+        foreach (var (parentId, members) in mergedGroups)
+        {
+            var childKeys = new HashSet<string>(StringComparer.Ordinal);
+            foreach (var member in members)
+            {
+                if (children.TryGetValue(member, out var keys))
+                {
+                    childKeys.UnionWith(keys);
+                }
+            }
+
+            result[parentId] = childKeys.Count;
+        }
+
+        return result;
+    }
+
    /// <inheritdoc/>
    public Dictionary<Guid, (int Played, int Total)> GetPlayedAndTotalCountBatch(IReadOnlyList<Guid> folderIds, User user)
    {
@@ -353,10 +421,13 @@ public class ItemCountService : IItemCountService
        }

        using var dbContext = _dbProvider.CreateDbContext();
-        var folderIdsArray = folderIds.ToArray();
        var filter = new InternalItemsQuery(user);
        var userId = user.Id;

+        // Merged series and seasons are stored as one row per folder-item sharing a presentation key.
+        var groups = GetPresentationKeyGroups(dbContext, folderIds);
+        var folderIdsArray = groups.Values.SelectMany(members => members).Distinct().ToArray();
+
        var leafItems = dbContext.BaseItems
            .Where(DescendantQueryHelper.IsCountableLeaf);
        leafItems = _queryHelpers.ApplyAccessFiltering(dbContext, leafItems, filter);
@@ -398,7 +469,7 @@ public class ItemCountService : IItemCountService
                b => b.Id,
                (x, b) => new { FolderId = x.ParentId, b.Id, b.Played });

-        var results = ancestorLeaves
+        var countsByFolder = ancestorLeaves
            .Union(linkedLeaves)
            .Union(linkedFolderLeaves)
            .GroupBy(x => x.FolderId)
@@ -410,9 +481,73 @@ public class ItemCountService : IItemCountService
            })
            .ToDictionary(x => x.FolderId, x => (x.Played, x.Total));

+        var results = new Dictionary<Guid, (int Played, int Total)>();
+        foreach (var (folderId, members) in groups)
+        {
+            var played = 0;
+            var total = 0;
+
+            // Members of a group are distinct folders, so their leaves cannot overlap.
+            foreach (var member in members)
+            {
+                if (countsByFolder.TryGetValue(member, out var counts))
+                {
+                    played += counts.Played;
+                    total += counts.Total;
+                }
+            }
+
+            if (total > 0 || played > 0)
+            {
+                results[folderId] = (played, total);
+            }
+        }
+
        return results;
    }

+    private static Dictionary<Guid, List<Guid>> GetPresentationKeyGroups(JellyfinDbContext dbContext, IReadOnlyList<Guid> folderIds)
+    {
+        var requested = dbContext.BaseItems
+            .AsNoTracking()
+            .WhereOneOrMany(folderIds, e => e.Id)
+            .Select(e => new { e.Id, e.PresentationUniqueKey })
+            .ToArray();
+
+        var keys = requested
+            .Select(e => e.PresentationUniqueKey)
+            .Where(key => !string.IsNullOrEmpty(key))
+            .Distinct(StringComparer.Ordinal)
+            .ToArray();
+
+        // Every item that is not merged carries a key derived from its own id, so in the common case
+        // each group resolves back to the single folder that was asked for.
+        var membersByKey = keys.Length == 0
+            ? []
+            : dbContext.BaseItems
+                .AsNoTracking()
+                .Where(e => e.IsFolder)
+                .WhereOneOrMany(keys, e => e.PresentationUniqueKey!)
+                .Select(e => new { e.Id, Key = e.PresentationUniqueKey! })
+                .ToArray()
+                .GroupBy(e => e.Key, StringComparer.Ordinal)
+                .ToDictionary(g => g.Key, g => g.Select(e => e.Id).ToList(), StringComparer.Ordinal);
+
+        var keyById = requested.ToDictionary(e => e.Id, e => e.PresentationUniqueKey);
+        var groups = new Dictionary<Guid, List<Guid>>();
+        foreach (var folderId in folderIds)
+        {
+            groups[folderId] = keyById.TryGetValue(folderId, out var key)
+                && !string.IsNullOrEmpty(key)
+                && membersByKey.TryGetValue(key, out var members)
+                && members.Count > 0
+                    ? members
+                    : [folderId];
+        }
+
+        return groups;
+    }
+
    private static (int Played, int Total) GetPlayedAndTotalCountFromQuery(IQueryable<BaseItemEntity> query, Guid userId)
    {
        var result = query
@@ -538,7 +538,7 @@ public class ItemPersistenceService : IItemPersistenceService
                var childIdsToCheck = resolvedChildren.Select(c => c.ChildId).Distinct().ToList();
                var existingChildIds = childIdsToCheck.Count > 0
                    ? context.BaseItems
-                        .Where(e => childIdsToCheck.Contains(e.Id))
+                        .WhereOneOrMany(childIdsToCheck, e => e.Id)
                        .Select(e => e.Id)
                        .ToHashSet()
                    : [];
@@ -7,6 +7,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Jellyfin.Data.Enums;
 using Jellyfin.Database.Implementations;
+using Jellyfin.Extensions;
 using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Persistence;
 using Microsoft.EntityFrameworkCore;
@@ -83,26 +84,27 @@ public class LinkedChildrenService : ILinkedChildrenService
    {
        using var dbContext = _dbProvider.CreateDbContext();

-        var lowerNames = artistNames.Select(n => n.ToLowerInvariant()).ToArray();
+        var cleanNames = artistNames.Select(n => (Original: n, Clean: n.GetCleanValue())).ToArray();
+        var cleanValues = cleanNames.Select(x => x.Clean).ToArray();
+
        var artists = dbContext.BaseItems
            .AsNoTracking()
            .Where(e => e.Type == _itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicArtist]!)
-            .Where(e => lowerNames.Contains(e.Name!.ToLower()))
+            .Where(e => cleanValues.Contains(e.CleanName))
            .ToArray();

        var lookup = artists
-            .GroupBy(e => e.Name!, StringComparer.OrdinalIgnoreCase)
+            .GroupBy(e => e.CleanName!)
            .ToDictionary(
                g => g.Key,
-                g => g.Select(f => _queryHelpers.DeserializeBaseItem(f)).Where(dto => dto is not null).Cast<MusicArtist>().ToArray(),
-                StringComparer.OrdinalIgnoreCase);
+                g => g.Select(f => _queryHelpers.DeserializeBaseItem(f)).Where(dto => dto is not null).Cast<MusicArtist>().ToArray());

-        var result = new Dictionary<string, MusicArtist[]>(artistNames.Count);
-        foreach (var name in artistNames)
+        var result = new Dictionary<string, MusicArtist[]>(cleanNames.Length);
+        foreach (var (original, clean) in cleanNames)
        {
-            if (lookup.TryGetValue(name, out var artistArray))
+            if (lookup.TryGetValue(clean, out var artistArray))
            {
-                result[name] = artistArray;
+                result[original] = artistArray;
            }
        }

@@ -194,12 +194,44 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I
            listOrder++;
        }

+        var droppedCredits = existingMaps.Select(e => e.PeopleId).Distinct().ToArray();
        context.PeopleBaseItemMap.RemoveRange(existingMaps);

+        context.SaveChanges();
+
+        // Nothing else ever deletes a credit row, so one left without a single mapping outlives the
+        // credit it stood for: it keeps a person of that name off the dead-person sweep, which only
+        // sees items no credit names, and keeps the name in every by-name list. That is how a credit
+        // a provider dropped, or one a broken provider result invented, becomes impossible to clean up.
+        DeleteCreditsWithoutMapping(context, droppedCredits);
+
        context.SaveChanges();
        transaction.Commit();
    }

+    /// <inheritdoc/>
+    public int DeleteOrphanedCredits()
+    {
+        using var context = _dbProvider.CreateDbContext();
+
+        return DeleteCreditsWithoutMapping(context, null);
+    }
+
+    // A null candidate list sweeps every credit, anything else only the ones just unmapped.
+    private int DeleteCreditsWithoutMapping(JellyfinDbContext context, IReadOnlyList<Guid>? candidates)
+    {
+        if (candidates is not null && candidates.Count == 0)
+        {
+            return 0;
+        }
+
+        var credits = candidates is null
+            ? context.Peoples.AsQueryable()
+            : context.Peoples.WhereOneOrMany(candidates, e => e.Id);
+
+        return credits.Where(e => !context.PeopleBaseItemMap.Any(f => f.PeopleId == e.Id)).ExecuteDelete();
+    }
+
    /// <inheritdoc/>
    public IReadOnlyDictionary<Guid, IReadOnlyList<string>> GetPeopleNamesByItems(IReadOnlyList<Guid> itemIds, IReadOnlyList<string> personTypes)
    {
@@ -351,7 +383,11 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I

        if (!filter.ItemId.IsEmpty())
        {
-            query = query.Where(e => e.BaseItems!.Any(w => w.ItemId.Equals(filter.ItemId)));
+            var itemId = filter.ItemId;
+            query = query.Where(e => context.PeopleBaseItemMap
+                .Where(m => m.ItemId.Equals(itemId))
+                .Select(m => m.PeopleId)
+                .Contains(e.Id));
        }

        if (filter.ParentId != null)
@@ -361,7 +397,11 @@ public class PeopleRepository(IDbContextFactory<JellyfinDbContext> dbProvider, I

        if (!filter.AppearsInItemId.IsEmpty())
        {
-            query = query.Where(e => e.BaseItems!.Any(w => w.ItemId.Equals(filter.AppearsInItemId)));
+            var appearsInItemId = filter.AppearsInItemId;
+            query = query.Where(e => context.PeopleBaseItemMap
+                .Where(m => m.ItemId.Equals(appearsInItemId))
+                .Select(m => m.PeopleId)
+                .Contains(e.Id));
        }

        var queryPersonTypes = filter.PersonTypes.Where(IsValidPersonType).ToList();
@@ -225,17 +225,8 @@ namespace Jellyfin.Server.Implementations.Users
                        ?? throw new ResourceNotFoundException(nameof(user.Id));

                    dbContext.Entry(dbUser).CurrentValues.SetValues(user);
-                    dbUser.Permissions.Clear();
-                    foreach (var permission in user.Permissions)
-                    {
-                        dbUser.Permissions.Add(new Permission(permission.Kind, permission.Value));
-                    }
-
-                    dbUser.Preferences.Clear();
-                    foreach (var preference in user.Preferences)
-                    {
-                        dbUser.Preferences.Add(new Preference(preference.Kind, preference.Value));
-                    }
+                    SyncPermissions(dbUser, user.Permissions);
+                    SyncPreferences(dbUser, user.Preferences);

                    dbUser.AccessSchedules.Clear();
                    foreach (var accessSchedule in user.AccessSchedules)
@@ -269,6 +260,60 @@ namespace Jellyfin.Server.Implementations.Users
            }
        }

+        private static void SyncPermissions(User dbUser, ICollection<Permission> source)
+        {
+            var incoming = new Dictionary<PermissionKind, bool>();
+            foreach (var permission in source)
+            {
+                incoming[permission.Kind] = permission.Value;
+            }
+
+            foreach (var existing in dbUser.Permissions)
+            {
+                if (incoming.Remove(existing.Kind, out var value))
+                {
+                    // EF only marks the row modified if the value actually differs, so an update that
+                    // touches nothing but the user row - a session activity stamp - writes no children.
+                    existing.Value = value;
+                }
+                else
+                {
+                    dbUser.Permissions.Remove(existing);
+                }
+            }
+
+            foreach (var (kind, value) in incoming)
+            {
+                dbUser.Permissions.Add(new Permission(kind, value));
+            }
+        }
+
+        private static void SyncPreferences(User dbUser, ICollection<Preference> source)
+        {
+            var incoming = new Dictionary<PreferenceKind, string>();
+            foreach (var preference in source)
+            {
+                incoming[preference.Kind] = preference.Value;
+            }
+
+            foreach (var existing in dbUser.Preferences)
+            {
+                if (incoming.Remove(existing.Kind, out var value))
+                {
+                    existing.Value = value;
+                }
+                else
+                {
+                    dbUser.Preferences.Remove(existing);
+                }
+            }
+
+            foreach (var (kind, value) in incoming)
+            {
+                dbUser.Preferences.Add(new Preference(kind, value));
+            }
+        }
+
        internal async Task<User> CreateUserInternalAsync(string name, JellyfinDbContext dbContext)
        {
            // TODO: Remove after user item data is migrated.
@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -15,9 +17,9 @@ using Microsoft.Extensions.Logging;
 namespace Jellyfin.Server.Migrations.Routines;

 /// <summary>
-/// Recomputes the presentation unique key for every series so existing items adopt the folder-set-free key format.
+/// Recomputes the presentation unique key of every series and season so merged series are scoped to their own library.
 /// </summary>
-[JellyfinMigration("2026-07-23T12:00:00", nameof(RecomputeSeriesPresentationKey))]
+[JellyfinMigration("2026-08-21T12:00:00", nameof(RecomputeSeriesPresentationKey))]
 [JellyfinMigrationBackup(JellyfinDb = true)]
 internal class RecomputeSeriesPresentationKey : IAsyncMigrationRoutine
 {
@@ -53,6 +55,7 @@ internal class RecomputeSeriesPresentationKey : IAsyncMigrationRoutine

        const int ProgressInterval = 250;
        var sw = Stopwatch.StartNew();
+        var newSeriesKeys = new Dictionary<Guid, string>();
        var processed = 0;
        var updated = 0;

@@ -68,9 +71,10 @@ internal class RecomputeSeriesPresentationKey : IAsyncMigrationRoutine
                    _logger.LogInformation("Processed {Processed}/{Total} series - Updated: {Updated} - Time: {Elapsed}", processed, series.Length, updated, sw.Elapsed);
                }

-                var oldKey = item.PresentationUniqueKey;
                var newKey = item.CreatePresentationUniqueKey();
-                if (string.Equals(oldKey, newKey, StringComparison.Ordinal))
+                newSeriesKeys[item.Id] = newKey;
+
+                if (string.Equals(item.PresentationUniqueKey, newKey, StringComparison.Ordinal))
                {
                    continue;
                }
@@ -82,21 +86,66 @@ internal class RecomputeSeriesPresentationKey : IAsyncMigrationRoutine
                    .ExecuteUpdateAsync(e => e.SetProperty(f => f.PresentationUniqueKey, newKey), cancellationToken)
                    .ConfigureAwait(false);

-                // Seasons and episodes cache the series key in SeriesPresentationUniqueKey and are matched
-                // to the series by it. Re-point every child still carrying the old key in a single set-based
-                // update so they stay attached without waiting for the next scan.
-                if (!string.IsNullOrEmpty(oldKey))
-                {
-                    await dbContext.BaseItems
-                        .Where(e => e.SeriesPresentationUniqueKey == oldKey)
-                        .ExecuteUpdateAsync(e => e.SetProperty(f => f.SeriesPresentationUniqueKey, newKey), cancellationToken)
-                        .ConfigureAwait(false);
-                }
+                // Seasons and episodes are matched to their series by SeriesPresentationUniqueKey, so
+                // re-point them here instead of waiting for the next scan. Scoped by SeriesId rather than
+                // by the old key: that key can be shared by every library holding the series, so matching
+                // on it would drag the other libraries' children along.
+                await dbContext.BaseItems
+                    .Where(e => e.SeriesId.HasValue && e.SeriesId.Value.Equals(id))
+                    .ExecuteUpdateAsync(e => e.SetProperty(f => f.SeriesPresentationUniqueKey, newKey), cancellationToken)
+                    .ConfigureAwait(false);

                updated++;
            }
+
+            var updatedSeasons = await RecomputeSeasonsAsync(dbContext, newSeriesKeys, cancellationToken).ConfigureAwait(false);
+
+            _logger.LogInformation(
+                "Recomputed presentation unique key for {Updated} of {Count} series and {UpdatedSeasons} seasons in {Elapsed}",
+                updated,
+                series.Length,
+                updatedSeasons,
+                sw.Elapsed);
+        }
+    }
+
+    private async Task<int> RecomputeSeasonsAsync(JellyfinDbContext dbContext, Dictionary<Guid, string> newSeriesKeys, CancellationToken cancellationToken)
+    {
+        // A season's own key embeds its series' key, so it goes stale with it.
+        var seasons = _libraryManager.GetItemList(new InternalItemsQuery
+        {
+            IncludeItemTypes = [BaseItemKind.Season]
+        }).OfType<Season>().ToArray();
+
+        var updated = 0;
+
+        foreach (var season in seasons)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            // Without an index number the season keeps the base key, which carries no series key at all.
+            if (!season.IndexNumber.HasValue
+                || !newSeriesKeys.TryGetValue(season.SeriesId, out var seriesKey))
+            {
+                continue;
+            }
+
+            // Mirrors Season.CreatePresentationUniqueKey.
+            var newKey = seriesKey + "-" + season.IndexNumber.Value.ToString("000", CultureInfo.InvariantCulture);
+            if (string.Equals(season.PresentationUniqueKey, newKey, StringComparison.Ordinal))
+            {
+                continue;
+            }
+
+            var id = season.Id;
+            await dbContext.BaseItems
+                .Where(e => e.Id.Equals(id))
+                .ExecuteUpdateAsync(e => e.SetProperty(f => f.PresentationUniqueKey, newKey), cancellationToken)
+                .ConfigureAwait(false);
+
+            updated++;
        }

-        _logger.LogInformation("Recomputed presentation unique key for {Updated} of {Count} series in {Elapsed}", updated, series.Length, sw.Elapsed);
+        return updated;
    }
 }
@@ -0,0 +1,334 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Jellyfin.Data.Enums;
+using Jellyfin.Database.Implementations;
+using Jellyfin.Database.Implementations.Entities;
+using Jellyfin.Database.Implementations.Enums;
+using Jellyfin.Server.ServerSetupApp;
+using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.IO;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+
+namespace Jellyfin.Server.Migrations.Routines;
+
+/// <summary>
+/// Moves the views whose id used to be derived from their localized name onto their name independent id.
+/// </summary>
+[JellyfinMigration("2026-08-25T20:00:00", nameof(ConsolidateLocalizedUserViews))]
+[JellyfinMigrationBackup(JellyfinDb = true)]
+internal class ConsolidateLocalizedUserViews : IAsyncMigrationRoutine
+{
+    private readonly IStartupLogger<ConsolidateLocalizedUserViews> _logger;
+    private readonly ILibraryManager _libraryManager;
+    private readonly IServerConfigurationManager _configurationManager;
+    private readonly IFileSystem _fileSystem;
+    private readonly IDbContextFactory<JellyfinDbContext> _dbProvider;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ConsolidateLocalizedUserViews"/> class.
+    /// </summary>
+    /// <param name="logger">The startup logger.</param>
+    /// <param name="libraryManager">The library manager.</param>
+    /// <param name="configurationManager">The server configuration manager.</param>
+    /// <param name="fileSystem">The file system.</param>
+    /// <param name="dbProvider">The database context factory.</param>
+    public ConsolidateLocalizedUserViews(
+        IStartupLogger<ConsolidateLocalizedUserViews> logger,
+        ILibraryManager libraryManager,
+        IServerConfigurationManager configurationManager,
+        IFileSystem fileSystem,
+        IDbContextFactory<JellyfinDbContext> dbProvider)
+    {
+        _logger = logger;
+        _libraryManager = libraryManager;
+        _configurationManager = configurationManager;
+        _fileSystem = fileSystem;
+        _dbProvider = dbProvider;
+    }
+
+    /// <inheritdoc />
+    public async Task PerformAsync(CancellationToken cancellationToken)
+    {
+        // The Live TV view is the one that hurts: every channel and program is parented to it, so a
+        // translation update or a change of UI culture used to leave them behind under a view nothing
+        // looks up any more.
+        var views = _libraryManager.GetItemList(new InternalItemsQuery
+        {
+            IncludeItemTypes = [BaseItemKind.UserView]
+        }).OfType<UserView>().Where(view => view.ViewType.HasValue).ToArray();
+
+        if (views.Length == 0)
+        {
+            return;
+        }
+
+        var dbContext = await _dbProvider.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
+        await using (dbContext.ConfigureAwait(false))
+        {
+            foreach (var group in views.GroupBy(view => view.ViewType!.Value))
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                var viewType = group.Key;
+                var folderName = _fileSystem.GetValidFilename(viewType.ToString());
+                var path = Path.Combine(_configurationManager.ApplicationPaths.InternalMetadataPath, "views", folderName);
+
+                // Only the views created for a view type as a whole are named after it. The per user and
+                // per parent ones get a folder of their own, and carry no children to lose. Match on the
+                // folder rather than the whole path so a metadata directory that has since moved still
+                // lines up.
+                var candidates = group
+                    .Where(view => !string.IsNullOrEmpty(view.Path)
+                        && string.Equals(Path.GetFileName(view.Path.TrimEnd(Path.DirectorySeparatorChar)), folderName, StringComparison.OrdinalIgnoreCase))
+                    .ToArray();
+                if (candidates.Length == 0)
+                {
+                    continue;
+                }
+
+                // Mirrors LibraryManager.GetNamedView(name, viewType, sortName).
+                var canonicalId = _libraryManager.GetNewItemId(path + "_namedview_" + viewType.ToString(), typeof(UserView));
+
+                var stale = candidates.Where(view => !view.Id.Equals(canonicalId)).ToArray();
+                if (stale.Length == 0)
+                {
+                    continue;
+                }
+
+                await ConsolidateAsync(dbContext, viewType, path, canonicalId, candidates, stale, cancellationToken).ConfigureAwait(false);
+            }
+        }
+    }
+
+    private async Task ConsolidateAsync(
+        JellyfinDbContext dbContext,
+        CollectionType viewType,
+        string path,
+        Guid canonicalId,
+        IReadOnlyList<UserView> candidates,
+        IReadOnlyList<UserView> stale,
+        CancellationToken cancellationToken)
+    {
+        var staleIds = stale.Select(view => view.Id).ToArray();
+        Guid? newParentId = canonicalId;
+        var sourceId = Guid.Empty;
+
+        if (!candidates.Any(view => view.Id.Equals(canonicalId)))
+        {
+            // Whichever of the old views the items ended up under is the one worth keeping, so give the
+            // canonical id a copy of it.
+            var source = await PickSourceAsync(dbContext, stale, staleIds, cancellationToken).ConfigureAwait(false);
+            sourceId = source.Id;
+
+            _libraryManager.CreateItem(
+                new UserView
+                {
+                    Path = path,
+                    Id = canonicalId,
+                    DateCreated = source.DateCreated,
+                    DateModified = source.DateModified,
+                    Name = source.Name,
+                    ViewType = viewType,
+                    ForcedSortName = source.ForcedSortName
+                },
+                null);
+        }
+
+        var reparented = await dbContext.BaseItems
+            .Where(e => e.ParentId.HasValue)
+            .WhereOneOrMany(staleIds, e => e.ParentId!.Value)
+            .ExecuteUpdateAsync(e => e.SetProperty(f => f.ParentId, newParentId), cancellationToken)
+            .ConfigureAwait(false);
+
+        await dbContext.BaseItems
+            .Where(e => e.TopParentId.HasValue)
+            .WhereOneOrMany(staleIds, e => e.TopParentId!.Value)
+            .ExecuteUpdateAsync(e => e.SetProperty(f => f.TopParentId, newParentId), cancellationToken)
+            .ConfigureAwait(false);
+
+        await MoveAncestorsAsync(dbContext, canonicalId, staleIds, cancellationToken).ConfigureAwait(false);
+        await MoveUserSettingsAsync(dbContext, canonicalId, sourceId, staleIds, cancellationToken).ConfigureAwait(false);
+
+        // Nothing points at them any more, and BaseItems cascades on ParentId, so this has to come last.
+        await dbContext.BaseItems
+            .WhereOneOrMany(staleIds, e => e.Id)
+            .ExecuteDeleteAsync(cancellationToken)
+            .ConfigureAwait(false);
+
+        _logger.LogInformation(
+            "Moved {Reparented} items and dropped {Stale} stale {ViewType} views in favour of {CanonicalId}",
+            reparented,
+            staleIds.Length,
+            viewType,
+            canonicalId);
+    }
+
+    private async Task<UserView> PickSourceAsync(
+        JellyfinDbContext dbContext,
+        IReadOnlyList<UserView> stale,
+        IReadOnlyList<Guid> staleIds,
+        CancellationToken cancellationToken)
+    {
+        var childCounts = await dbContext.BaseItems
+            .Where(e => e.ParentId.HasValue)
+            .WhereOneOrMany(staleIds, e => e.ParentId!.Value)
+            .GroupBy(e => e.ParentId!.Value)
+            .Select(g => new { ParentId = g.Key, Count = g.Count() })
+            .ToDictionaryAsync(e => e.ParentId, e => e.Count, cancellationToken)
+            .ConfigureAwait(false);
+
+        return stale
+            .OrderByDescending(view => childCounts.GetValueOrDefault(view.Id))
+            .ThenBy(view => view.DateCreated)
+            .First();
+    }
+
+    private static async Task MoveUserSettingsAsync(
+        JellyfinDbContext dbContext,
+        Guid canonicalId,
+        Guid sourceId,
+        IReadOnlyList<Guid> staleIds,
+        CancellationToken cancellationToken)
+    {
+        // Everything below is keyed by the view's id, and a view holding no children still holds the
+        // ordering it was given and whether it was hidden. Only the view that was promoted can hand
+        // those over - the rest would collide on the one row per user, item and client - so the others
+        // are dropped instead.
+        var dropped = staleIds.Where(id => !id.Equals(sourceId)).ToArray();
+
+        if (!sourceId.Equals(Guid.Empty))
+        {
+            var moved = new[] { sourceId };
+
+            await dbContext.DisplayPreferences
+                .WhereOneOrMany(moved, e => e.ItemId)
+                .ExecuteUpdateAsync(e => e.SetProperty(f => f.ItemId, canonicalId), cancellationToken)
+                .ConfigureAwait(false);
+
+            await dbContext.ItemDisplayPreferences
+                .WhereOneOrMany(moved, e => e.ItemId)
+                .ExecuteUpdateAsync(e => e.SetProperty(f => f.ItemId, canonicalId), cancellationToken)
+                .ConfigureAwait(false);
+
+            await dbContext.CustomItemDisplayPreferences
+                .WhereOneOrMany(moved, e => e.ItemId)
+                .ExecuteUpdateAsync(e => e.SetProperty(f => f.ItemId, canonicalId), cancellationToken)
+                .ConfigureAwait(false);
+        }
+
+        if (dropped.Length > 0)
+        {
+            await dbContext.DisplayPreferences.WhereOneOrMany(dropped, e => e.ItemId).ExecuteDeleteAsync(cancellationToken).ConfigureAwait(false);
+            await dbContext.ItemDisplayPreferences.WhereOneOrMany(dropped, e => e.ItemId).ExecuteDeleteAsync(cancellationToken).ConfigureAwait(false);
+            await dbContext.CustomItemDisplayPreferences.WhereOneOrMany(dropped, e => e.ItemId).ExecuteDeleteAsync(cancellationToken).ConfigureAwait(false);
+        }
+
+        var stale = staleIds.ToHashSet();
+        var preferences = await dbContext.Preferences
+            .Where(e => e.Kind == PreferenceKind.OrderedViews || e.Kind == PreferenceKind.MyMediaExcludes)
+            .ToListAsync(cancellationToken)
+            .ConfigureAwait(false);
+
+        var changed = false;
+
+        foreach (var preference in preferences)
+        {
+            var values = preference.Value.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
+            var rewritten = new List<string>(values.Length);
+            var seen = new HashSet<Guid>();
+            var touched = false;
+
+            foreach (var value in values)
+            {
+                // Clients write these in both the dashed and the plain form, so compare them parsed.
+                if (!Guid.TryParse(value, out var parsed))
+                {
+                    rewritten.Add(value);
+                    continue;
+                }
+
+                var isStale = stale.Contains(parsed);
+                if (isStale)
+                {
+                    parsed = canonicalId;
+                    touched = true;
+                }
+
+                // The same view can be listed twice once both of its ids point at the same place.
+                if (!seen.Add(parsed))
+                {
+                    continue;
+                }
+
+                rewritten.Add(isStale
+                    ? parsed.ToString(value.Contains('-', StringComparison.Ordinal) ? "D" : "N", CultureInfo.InvariantCulture)
+                    : value);
+            }
+
+            if (!touched)
+            {
+                continue;
+            }
+
+            preference.Value = string.Join(',', rewritten);
+            changed = true;
+        }
+
+        if (changed)
+        {
+            await dbContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
+        }
+    }
+
+    private static async Task MoveAncestorsAsync(
+        JellyfinDbContext dbContext,
+        Guid canonicalId,
+        IReadOnlyList<Guid> staleIds,
+        CancellationToken cancellationToken)
+    {
+        var items = await dbContext.AncestorIds
+            .WhereOneOrMany(staleIds, e => e.ParentItemId)
+            .Select(e => e.ItemId)
+            .Distinct()
+            .ToListAsync(cancellationToken)
+            .ConfigureAwait(false);
+
+        await dbContext.AncestorIds
+            .WhereOneOrMany(staleIds, e => e.ParentItemId)
+            .ExecuteDeleteAsync(cancellationToken)
+            .ConfigureAwait(false);
+
+        if (items.Count == 0)
+        {
+            return;
+        }
+
+        // The pair is the primary key, so anything already recorded against the canonical view stays put.
+        var existing = await dbContext.AncestorIds
+            .Where(e => e.ParentItemId.Equals(canonicalId))
+            .Select(e => e.ItemId)
+            .ToListAsync(cancellationToken)
+            .ConfigureAwait(false);
+
+        foreach (var itemId in items.Except(existing))
+        {
+            dbContext.AncestorIds.Add(new AncestorId
+            {
+                ItemId = itemId,
+                ParentItemId = canonicalId,
+                Item = null!,
+                ParentItem = null!
+            });
+        }
+
+        await dbContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
+    }
+}
@@ -173,10 +173,7 @@ namespace MediaBrowser.Controller.Entities.Audio

        public static string GetPath(string name, bool normalizeName)
        {
-            // Trim the period at the end because windows will have a hard time with that
-            var validName = normalizeName ?
-                FileSystem.GetValidFilename(name).Trim().TrimEnd('.') :
-                name;
+            var validName = normalizeName ? GetItemByNameFolderName(name) : name;

            return System.IO.Path.Combine(ConfigurationManager.ApplicationPaths.ArtistsPath, validName);
        }
@@ -80,10 +80,7 @@ namespace MediaBrowser.Controller.Entities.Audio

        public static string GetPath(string name, bool normalizeName)
        {
-            // Trim the period at the end because windows will have a hard time with that
-            var validName = normalizeName ?
-                FileSystem.GetValidFilename(name).Trim().TrimEnd('.') :
-                name;
+            var validName = normalizeName ? GetItemByNameFolderName(name) : name;

            return System.IO.Path.Combine(ConfigurationManager.ApplicationPaths.MusicGenrePath, validName);
        }
@@ -48,6 +48,10 @@ namespace MediaBrowser.Controller.Entities

        public const string ThemeSongFileName = "theme";

+        // Well below the 255 byte limit of the common Linux filesystems and the 255 character limit
+        // of Windows, so the files inside the folder still fit within MAX_PATH.
+        private const int MaxItemByNameFolderNameBytes = 128;
+
        /// <summary>
        /// The supported image extensions.
        /// </summary>
@@ -941,6 +945,43 @@ namespace MediaBrowser.Controller.Entities
            return GetSortName(Name, EnableAlphaNumericSorting, ConfigurationManager.Configuration);
        }

+        /// <summary>
+        /// Turns an item-by-name entity's name into a folder name every supported filesystem accepts.
+        /// </summary>
+        /// <param name="name">The entity's name.</param>
+        /// <returns>The folder name.</returns>
+        public static string GetItemByNameFolderName(string name)
+        {
+            // Trim the period at the end because windows will have a hard time with that
+            var validName = FileSystem.GetValidFilename(name).Trim().TrimEnd('.');
+
+            // Most Linux filesystems cap a path component at 255 bytes, so a name past that cannot be
+            // turned into a folder at all - and an entity with no folder can never be created, which
+            // leaves the credit behind it stuck: not refreshable, not deletable, retried on every scan.
+            // Only broken provider data gets this long, but it still has to resolve to something, so
+            // keep a readable prefix and let a hash of the whole name tell two of them apart.
+            if (Encoding.UTF8.GetByteCount(validName) <= MaxItemByNameFolderNameBytes)
+            {
+                return validName;
+            }
+
+            var suffix = "-" + validName.GetMD5().ToString("N", CultureInfo.InvariantCulture);
+            var budget = MaxItemByNameFolderNameBytes - suffix.Length;
+            var length = Math.Min(validName.Length, budget);
+            while (length > 0 && Encoding.UTF8.GetByteCount(validName.AsSpan(0, length)) > budget)
+            {
+                length--;
+            }
+
+            // Never cut a surrogate pair in half, the lone half is not a valid file name character.
+            if (length > 0 && char.IsHighSurrogate(validName[length - 1]))
+            {
+                length--;
+            }
+
+            return string.Concat(validName.AsSpan(0, length).TrimEnd().TrimEnd('.'), suffix);
+        }
+
        /// <summary>
        /// Cleans a raw name into its sortable form by applying the configured sort rules.
        /// </summary>
@@ -83,10 +83,7 @@ namespace MediaBrowser.Controller.Entities

        public static string GetPath(string name, bool normalizeName)
        {
-            // Trim the period at the end because windows will have a hard time with that
-            var validName = normalizeName ?
-                FileSystem.GetValidFilename(name).Trim().TrimEnd('.') :
-                name;
+            var validName = normalizeName ? GetItemByNameFolderName(name) : name;

            return System.IO.Path.Combine(ConfigurationManager.ApplicationPaths.GenrePath, validName);
        }
@@ -98,10 +98,7 @@ namespace MediaBrowser.Controller.Entities

        public static string GetPath(string name, bool normalizeName)
        {
-            // Trim the period at the end because windows will have a hard time with that
-            var validFilename = normalizeName ?
-                FileSystem.GetValidFilename(name).Trim().TrimEnd('.') :
-                name;
+            var validFilename = normalizeName ? GetItemByNameFolderName(name) : name;

            string subFolderPrefix = null;

@@ -78,10 +78,7 @@ namespace MediaBrowser.Controller.Entities

        public static string GetPath(string name, bool normalizeName)
        {
-            // Trim the period at the end because windows will have a hard time with that
-            var validName = normalizeName ?
-                FileSystem.GetValidFilename(name).Trim().TrimEnd('.') :
-                name;
+            var validName = normalizeName ? GetItemByNameFolderName(name) : name;

            return System.IO.Path.Combine(ConfigurationManager.ApplicationPaths.StudioPath, validName);
        }
@@ -4,6 +4,7 @@

 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Text.Json.Serialization;
 using System.Threading;
@@ -89,15 +90,14 @@ namespace MediaBrowser.Controller.Entities.TV

                if (!string.IsNullOrEmpty(groupingKey))
                {
-                    return AppendPreferredLanguage(groupingKey);
+                    return AddLibrariesToPresentationUniqueKey(groupingKey);
                }
            }

            return base.CreatePresentationUniqueKey();
        }

-        // The owning libraries are deliberately NOT part of the key.
-        private string AppendPreferredLanguage(string key)
+        private string AddLibrariesToPresentationUniqueKey(string key)
        {
            var lang = GetPreferredMetadataLanguage();
            if (!string.IsNullOrEmpty(lang))
@@ -105,7 +105,17 @@ namespace MediaBrowser.Controller.Entities.TV
                key += "-" + lang;
            }

-            return key;
+            var folders = LibraryManager.GetCollectionFolders(this)
+                .Select(i => i.Id.ToString("N", CultureInfo.InvariantCulture))
+                .Order(StringComparer.Ordinal)
+                .ToArray();
+
+            if (folders.Length == 0)
+            {
+                return key;
+            }
+
+            return key + "-" + string.Join('-', folders);
        }

        private string GetNameBasedGroupingKey()
@@ -125,20 +135,19 @@ namespace MediaBrowser.Controller.Entities.TV
        {
            var seriesKey = GetUniqueSeriesKey(this);

-            var result = LibraryManager.GetCount(new InternalItemsQuery(user)
+            var result = LibraryManager.GetItemIds(new InternalItemsQuery(user)
            {
                AncestorWithPresentationUniqueKey = null,
                SeriesPresentationUniqueKey = seriesKey,
                IncludeItemTypes = new[] { BaseItemKind.Season },
                IsVirtualItem = false,
-                Limit = 0,
                DtoOptions = new DtoOptions(false)
                {
                    EnableImages = false
                }
            });

-            return result;
+            return result.Count;
        }

        public override int GetRecursiveChildCount(User user)
@@ -85,10 +85,7 @@ namespace MediaBrowser.Controller.Entities

        public static string GetPath(string name, bool normalizeName)
        {
-            // Trim the period at the end because windows will have a hard time with that
-            var validName = normalizeName ?
-                FileSystem.GetValidFilename(name).Trim().TrimEnd('.') :
-                name;
+            var validName = normalizeName ? GetItemByNameFolderName(name) : name;

            return System.IO.Path.Combine(ConfigurationManager.ApplicationPaths.YearPath, validName);
        }
@@ -605,6 +605,12 @@ namespace MediaBrowser.Controller.Library
        /// <returns>List&lt;System.String&gt;.</returns>
        IReadOnlyList<string> GetPeopleNames(InternalPeopleQuery query);

+        /// <summary>
+        /// Deletes every credit that no item maps to any more.
+        /// </summary>
+        /// <returns>The number of credits that were deleted.</returns>
+        int DeleteOrphanedCredits();
+
        /// <summary>
        /// Gets the distinct people names per item for multiple items.
        /// </summary>
@@ -1318,7 +1318,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                    arg.Append(canvasArgs);
                }

-                arg.Append(" -i file:\"").Append(subtitlePath).Append('\"');
+                arg.Append(" -i file:\"").Append(subtitlePath.EscapeProcessArgument()).Append('\"');
            }

            if (state.AudioStream is not null && state.AudioStream.IsExternal)
@@ -1330,7 +1330,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                    arg.Append(' ').Append(seekAudioParam);
                }

-                arg.Append(" -i \"").Append(state.AudioStream.Path).Append('"');
+                arg.Append(" -i \"").Append(state.AudioStream.Path.EscapeProcessArgument()).Append('"');
            }

            // Disable auto inserted SW scaler for HW decoders in case of changed resolution.
@@ -33,6 +33,12 @@ public interface IPeopleRepository
    /// <returns>The list of people names matching the filter.</returns>
    IReadOnlyList<string> GetPeopleNames(InternalPeopleQuery filter);

+    /// <summary>
+    /// Deletes every credit that no item maps to any more.
+    /// </summary>
+    /// <returns>The number of credits that were deleted.</returns>
+    int DeleteOrphanedCredits();
+
    /// <summary>
    /// Gets the distinct people names per item for multiple items efficiently by querying from the mapping table.
    /// </summary>
@@ -16,11 +16,6 @@ namespace MediaBrowser.Controller.Providers
        private List<(string Url, ImageType Type)> _remoteImages;
        private List<PersonInfo> _people;

-        public MetadataResult()
-        {
-            ResultLanguage = "en";
-        }
-
        public List<LocalImageInfo> Images
        {
            get => _images ??= [];
@@ -43,6 +38,9 @@ namespace MediaBrowser.Controller.Providers

        public T Item { get; set; }

+        /// <summary>
+        /// Gets or sets the language the fetched metadata is in.
+        /// </summary>
        public string ResultLanguage { get; set; }

        public string Provider { get; set; }
@@ -28,6 +28,7 @@ namespace MediaBrowser.Controller.Session
        private readonly Lock _progressLock = new();
        private Timer _progressTimer;
        private PlaybackProgressInfo _lastProgressInfo;
+        private long? _lastPlaybackCheckInPositionTicks;

        private bool _disposed;

@@ -124,6 +125,22 @@ namespace MediaBrowser.Controller.Session
        /// <value>The last playback check in.</value>
        public DateTime LastPlaybackCheckIn { get; set; }

+        /// <summary>
+        /// Gets the position reported by the client at the last playback check-in.
+        /// </summary>
+        /// <value>The position ticks, or <see langword="null"/> if the client did not report a position.</value>
+        [JsonIgnore]
+        public long? LastPlaybackCheckInPositionTicks
+        {
+            get
+            {
+                lock (_progressLock)
+                {
+                    return _lastPlaybackCheckInPositionTicks;
+                }
+            }
+        }
+
        /// <summary>
        /// Gets or sets the last paused date.
        /// </summary>
@@ -372,6 +389,7 @@ namespace MediaBrowser.Controller.Session

            lock (_progressLock)
            {
+                _lastPlaybackCheckInPositionTicks = progressInfo.PositionTicks;
                _lastProgressInfo = progressInfo;

                if (_progressTimer is null)
@@ -14,7 +14,6 @@ using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.MediaEncoding;
-using MediaBrowser.MediaEncoding.Encoder;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
@@ -160,7 +159,7 @@ namespace MediaBrowser.MediaEncoding.Attachments
                        CultureInfo.InvariantCulture,
                        "-dump_attachment:{0} \"{1}\" ",
                        attachment.Index,
-                        EncodingUtils.NormalizePath(attachmentPath));
+                        attachmentPath.EscapeProcessArgument());
                    missingPaths.Add(attachmentPath);
                }

@@ -425,7 +424,7 @@ namespace MediaBrowser.MediaEncoding.Attachments
                "-dump_attachment:{1} \"{2}\" -i {0} {3}",
                inputPath,
                attachmentStreamIndex,
-                EncodingUtils.NormalizePath(outputPath),
+                outputPath.EscapeProcessArgument(),
                hasVideoOrAudioStream ? "-t 0 -f null null" : string.Empty);

            int exitCode;
@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
+using Jellyfin.Extensions;
 using MediaBrowser.Model.MediaInfo;

 namespace MediaBrowser.MediaEncoding.Encoder
@@ -42,7 +43,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
            // If there's more than one we'll need to use the concat command
            if (inputFiles.Count > 1)
            {
-                var files = string.Join('|', inputFiles.Select(NormalizePath));
+                var files = string.Join('|', inputFiles.Select(f => f.EscapeProcessArgument()));

                return string.Format(CultureInfo.InvariantCulture, "concat:\"{0}\"", files);
            }
@@ -64,21 +65,9 @@ namespace MediaBrowser.MediaEncoding.Encoder
                return string.Format(CultureInfo.InvariantCulture, "\"{0}\"", path);
            }

-            // Quotes are valid path characters in linux and they need to be escaped here with a leading \
-            path = NormalizePath(path);
+            path = path.EscapeProcessArgument();

            return string.Format(CultureInfo.InvariantCulture, "{1}:\"{0}\"", path, inputPrefix);
        }
-
-        /// <summary>
-        /// Normalizes the path.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>System.String.</returns>
-        public static string NormalizePath(string path)
-        {
-            // Quotes are valid path characters in linux and they need to be escaped here with a leading \
-            return path.Replace("\"", "\\\"", StringComparison.Ordinal);
-        }
    }
 }
@@ -12,6 +12,7 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using AsyncKeyedLock;
+using Jellyfin.Extensions;
 using MediaBrowser.Common;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Extensions;
@@ -453,7 +454,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                encodingParam = " -sub_charenc " + encodingParam;
            }

-            var args = string.Format(CultureInfo.InvariantCulture, "-y {0} -i \"{1}\" -c:s srt \"{2}\"", encodingParam, inputPath, outputPath);
+            var args = string.Format(CultureInfo.InvariantCulture, "-y {0} -i \"{1}\" -c:s srt \"{2}\"", encodingParam, inputPath.EscapeProcessArgument(), outputPath.EscapeProcessArgument());

            await ExtractSubtitlesForFile(
                inputPath,
@@ -631,7 +632,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                        streamIndex,
                        outputCodec,
                        outputFormatOption,
-                        outputPath);
+                        outputPath.EscapeProcessArgument());
                }

                await ExtractSubtitlesForFile(inputPath, args, outputPaths, cancellationToken).ConfigureAwait(false);
@@ -689,7 +690,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
                    streamIndex,
                    outputCodec,
                    outputFormatOption,
-                    outputPath);
+                    outputPath.EscapeProcessArgument());
            }

            if (outputPaths.Count > 0)
@@ -141,6 +141,7 @@ public class TranscodingProfile
    /// Gets or sets a value indicating whether breaking the video stream on non-keyframes is supported.
    /// </summary>
    [DefaultValue(false)]
+    [XmlIgnore]
    [XmlAttribute("breakOnNonKeyFrames")]
    [Obsolete("This is always false")]
    public bool? BreakOnNonKeyFrames { get; set; }
@@ -1,14 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 using System.Linq;
+using System.Text.RegularExpressions;

 namespace MediaBrowser.Model.Entities;

 /// <summary>
 /// Class ProviderIdsExtensions.
 /// </summary>
-public static class ProviderIdsExtensions
+public static partial class ProviderIdsExtensions
 {
    /// <summary>
    /// Case-insensitive dictionary of <see cref="MetadataProvider"/> string representation.
@@ -20,6 +22,27 @@ public static class ProviderIdsExtensions
                enumValue => enumValue.ToString(),
                StringComparer.OrdinalIgnoreCase);

+    /// <summary>
+    /// The known id formats, keyed by provider name.
+    /// </summary>
+    private static readonly Dictionary<string, Func<string, bool>> _providerIdValidators =
+        new(StringComparer.OrdinalIgnoreCase)
+        {
+            [MetadataProvider.Imdb.ToString()] = value => ImdbIdRegex().IsMatch(value),
+            [MetadataProvider.Tmdb.ToString()] = IsPositiveNumber,
+            [MetadataProvider.TmdbCollection.ToString()] = IsPositiveNumber,
+            [MetadataProvider.AudioDbArtist.ToString()] = IsPositiveNumber,
+            [MetadataProvider.AudioDbAlbum.ToString()] = IsPositiveNumber,
+
+            // Every MusicBrainz id is an MBID.
+            [MetadataProvider.MusicBrainzAlbum.ToString()] = IsGuid,
+            [MetadataProvider.MusicBrainzAlbumArtist.ToString()] = IsGuid,
+            [MetadataProvider.MusicBrainzArtist.ToString()] = IsGuid,
+            [MetadataProvider.MusicBrainzReleaseGroup.ToString()] = IsGuid,
+            [MetadataProvider.MusicBrainzRecording.ToString()] = IsGuid,
+            [MetadataProvider.MusicBrainzTrack.ToString()] = IsGuid
+        };
+
    /// <summary>
    /// Checks if this instance has an id for the given provider.
    /// </summary>
@@ -101,6 +124,26 @@ public static class ProviderIdsExtensions
        return instance.GetProviderId(provider.ToString());
    }

+    /// <summary>
+    /// Checks whether a value can be an id of the given provider.
+    /// </summary>
+    /// <param name="name">The provider name.</param>
+    /// <param name="value">The provider id.</param>
+    /// <returns><c>true</c> if the value has a plausible format for the provider; otherwise, <c>false</c>.</returns>
+    /// <remarks>
+    /// Providers regularly hand out an id belonging to a different service, e.g. an IMDb person id in the
+    /// TMDb field. Such an id is not just useless, it also makes the owning provider fail for the item.
+    /// </remarks>
+    public static bool IsValidProviderId(string? name, string? value)
+    {
+        if (string.IsNullOrWhiteSpace(name) || string.IsNullOrWhiteSpace(value))
+        {
+            return false;
+        }
+
+        return !_providerIdValidators.TryGetValue(name, out var isValid) || isValid(value);
+    }
+
    /// <summary>
    /// Sets a provider id.
    /// </summary>
@@ -121,6 +164,14 @@ public static class ProviderIdsExtensions
            return false;
        }

+        name = name.Trim();
+        value = value.Trim();
+
+        if (!IsValidProviderId(name, value))
+        {
+            return false;
+        }
+
        // Ensure it exists
        instance.ProviderIds ??= new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);

@@ -153,7 +204,6 @@ public static class ProviderIdsExtensions
    /// <param name="instance">The instance.</param>
    /// <param name="name">The name, this should not contain a '=' character.</param>
    /// <param name="value">The value.</param>
-    /// <remarks>Due to how deserialization from the database works the name cannot contain '='.</remarks>
    public static void SetProviderId(this IHasProviderIds instance, string name, string value)
    {
        ArgumentNullException.ThrowIfNull(instance);
@@ -166,17 +216,27 @@ public static class ProviderIdsExtensions
            throw new ArgumentException("Provider id name cannot contain '='", nameof(name));
        }

-        // Ensure it exists
-        instance.ProviderIds ??= new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        instance.TrySetProviderId(name, value);
+    }

-        // Match on internal MetadataProvider enum string values before adding arbitrary providers
-        if (_metadataProviderEnumDictionary.TryGetValue(name, out var enumValue))
+    /// <summary>
+    /// Replaces all provider ids, dropping the ones that cannot belong to the provider they are filed under.
+    /// </summary>
+    /// <param name="instance">The instance.</param>
+    /// <param name="providerIds">The provider ids to set.</param>
+    public static void SetProviderIds(this IHasProviderIds instance, IReadOnlyDictionary<string, string>? providerIds)
+    {
+        ArgumentNullException.ThrowIfNull(instance);
+
+        instance.ProviderIds = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+        if (providerIds is null)
        {
-            instance.ProviderIds[enumValue] = value;
+            return;
        }
-        else
+
+        foreach (var (name, value) in providerIds)
        {
-            instance.ProviderIds[name] = value;
+            instance.TrySetProviderId(name, value);
        }
    }

@@ -213,4 +273,15 @@ public static class ProviderIdsExtensions

        instance.ProviderIds?.Remove(provider.ToString());
    }
+
+    private static bool IsPositiveNumber(string value)
+        => int.TryParse(value, NumberStyles.None, CultureInfo.InvariantCulture, out var id) && id > 0;
+
+    private static bool IsGuid(string value)
+        => Guid.TryParse(value, CultureInfo.InvariantCulture, out _);
+
+    // An IMDb id is a type prefix (tt for titles, nm for people, co for companies, ...) followed by
+    // digits. The prefix is optional because a bare number has always been accepted for a title.
+    [GeneratedRegex(@"^(tt|nm|co|ev|ch|ni)?[0-9]+$", RegexOptions.IgnoreCase)]
+    private static partial Regex ImdbIdRegex();
 }
@@ -204,7 +204,7 @@ public class ComicBookInfoProvider : IComicProvider
    {
        try
        {
-            return CultureInfo.GetCultureInfo(language).DisplayName;
+            return CultureInfo.GetCultureInfo(language).TwoLetterISOLanguageName;
        }
        catch (CultureNotFoundException)
        {
@@ -52,7 +52,7 @@ public class ExternalComicInfoProvider : IComicProvider
        var metadataResult = new MetadataResult<Book> { Item = book, HasMetadata = true };

        ComicInfoReader.ReadPeopleMetadata(comicInfoXml, metadataResult);
-        ComicInfoReader.ReadCultureInfoInto(comicInfoXml, "ComicInfo/LanguageISO", cultureInfo => metadataResult.ResultLanguage = cultureInfo.ThreeLetterISOLanguageName);
+        ComicInfoReader.ReadCultureInfoInto(comicInfoXml, "ComicInfo/LanguageISO", cultureInfo => metadataResult.ResultLanguage = cultureInfo.TwoLetterISOLanguageName);

        return metadataResult;
    }
@@ -50,7 +50,7 @@ public class InternalComicInfoProvider : IComicProvider
        var metadataResult = new MetadataResult<Book> { Item = book, HasMetadata = true };

        ComicInfoReader.ReadPeopleMetadata(comicInfoXml, metadataResult);
-        ComicInfoReader.ReadCultureInfoInto(comicInfoXml, "ComicInfo/LanguageISO", cultureInfo => metadataResult.ResultLanguage = cultureInfo.ThreeLetterISOLanguageName);
+        ComicInfoReader.ReadCultureInfoInto(comicInfoXml, "ComicInfo/LanguageISO", cultureInfo => metadataResult.ResultLanguage = cultureInfo.TwoLetterISOLanguageName);

        return metadataResult;
    }
@@ -0,0 +1,44 @@
+using System;
+
+namespace MediaBrowser.Providers.Manager;
+
+/// <summary>
+/// Helpers for comparing the language of fetched metadata with the language that was requested.
+/// </summary>
+internal static class MetadataLanguageUtils
+{
+    /// <summary>
+    /// Gets the language subtag of a language tag, e.g. "es" for "es-ES".
+    /// </summary>
+    /// <param name="language">The language tag.</param>
+    /// <returns>The language subtag, lowercased, or <c>null</c> if none was given.</returns>
+    public static string? GetLanguageSubtag(string? language)
+    {
+        if (string.IsNullOrEmpty(language))
+        {
+            return null;
+        }
+
+        var separator = language.IndexOf('-', StringComparison.Ordinal);
+
+        return (separator == -1 ? language : language[..separator]).ToLowerInvariant();
+    }
+
+    /// <summary>
+    /// Determines whether a provider result can be considered to be in the requested language.
+    /// </summary>
+    /// <param name="resultLanguage">The language the provider reported for its result, if any.</param>
+    /// <param name="preferredLanguage">The language that was requested, if any.</param>
+    /// <returns><c>true</c> if the result is in the requested language or either language is unknown.</returns>
+    public static bool MatchesPreferredLanguage(string? resultLanguage, string? preferredLanguage)
+    {
+        // A provider that doesn't report a language cannot be judged, assume it honored the request
+        if (string.IsNullOrEmpty(resultLanguage) || string.IsNullOrEmpty(preferredLanguage))
+        {
+            return true;
+        }
+
+        // Compare on the language subtag only so that e.g. "es" matches "es-ES"
+        return string.Equals(GetLanguageSubtag(resultLanguage), GetLanguageSubtag(preferredLanguage), StringComparison.Ordinal);
+    }
+}
@@ -209,22 +209,33 @@ namespace MediaBrowser.Providers.Manager
                }
            }

-            if (hasRefreshedMetadata && hasRefreshedImages)
+            var attemptedFetch = refreshOptions.MetadataRefreshMode > MetadataRefreshMode.ValidationOnly
+                || refreshOptions.ImageRefreshMode > MetadataRefreshMode.ValidationOnly;
+
+            var refreshStampNeedsSaving = false;
+
+            if (hasRefreshedMetadata && hasRefreshedImages && attemptedFetch)
            {
                item.DateLastRefreshed = DateTime.UtcNow;
                updateType |= item.OnMetadataChanged();
+
+                // A full refresh queries every provider whether or not anything looks stale. When they all
+                // come back empty the stamp is the only thing that changed, and without it nothing records
+                // that the lookup happened, so the next pass repeats the same fruitless queries forever.
+                refreshStampNeedsSaving = refreshOptions.MetadataRefreshMode == MetadataRefreshMode.FullRefresh
+                    || refreshOptions.ImageRefreshMode == MetadataRefreshMode.FullRefresh;
            }

-            updateType = await SaveInternal(item, refreshOptions, updateType, isFirstRefresh, requiresRefresh, metadataResult, cancellationToken).ConfigureAwait(false);
+            updateType = await SaveInternal(item, refreshOptions, updateType, isFirstRefresh, requiresRefresh, refreshStampNeedsSaving, metadataResult, cancellationToken).ConfigureAwait(false);

            await AfterMetadataRefresh(itemOfType, refreshOptions, cancellationToken).ConfigureAwait(false);

            return updateType;

-            async Task<ItemUpdateType> SaveInternal(BaseItem item, MetadataRefreshOptions refreshOptions, ItemUpdateType updateType, bool isFirstRefresh, bool requiresRefresh, MetadataResult<TItemType> metadataResult, CancellationToken cancellationToken)
+            async Task<ItemUpdateType> SaveInternal(BaseItem item, MetadataRefreshOptions refreshOptions, ItemUpdateType updateType, bool isFirstRefresh, bool requiresRefresh, bool refreshStampNeedsSaving, MetadataResult<TItemType> metadataResult, CancellationToken cancellationToken)
            {
                // Save if changes were made, or it's never been saved before
-                if (refreshOptions.ForceSave || updateType > ItemUpdateType.None || isFirstRefresh || refreshOptions.ReplaceAllMetadata || requiresRefresh)
+                if (refreshOptions.ForceSave || updateType > ItemUpdateType.None || isFirstRefresh || refreshOptions.ReplaceAllMetadata || requiresRefresh || refreshStampNeedsSaving)
                {
                    if (item.IsFileProtocol)
                    {
@@ -260,21 +271,40 @@ namespace MediaBrowser.Providers.Manager
            switch (lookupInfo)
            {
                case EpisodeInfo episodeInfo:
-                    episodeInfo.SeriesProviderIds = result.ProviderIds;
+                    episodeInfo.SeriesProviderIds = GetValidProviderIds(result.ProviderIds);
                    episodeInfo.ProviderIds.Clear();
                    break;
                case SeasonInfo seasonInfo:
-                    seasonInfo.SeriesProviderIds = result.ProviderIds;
+                    seasonInfo.SeriesProviderIds = GetValidProviderIds(result.ProviderIds);
                    seasonInfo.ProviderIds.Clear();
                    break;
                default:
-                    lookupInfo.ProviderIds = result.ProviderIds;
+                    lookupInfo.SetProviderIds(result.ProviderIds);
                    lookupInfo.Name = result.Name;
                    lookupInfo.Year = result.ProductionYear;
                    break;
            }
        }

+        private static Dictionary<string, string> GetValidProviderIds(IReadOnlyDictionary<string, string> providerIds)
+        {
+            var validProviderIds = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+            if (providerIds is null)
+            {
+                return validProviderIds;
+            }
+
+            foreach (var (name, value) in providerIds)
+            {
+                if (ProviderIdsExtensions.IsValidProviderId(name, value))
+                {
+                    validProviderIds[name] = value;
+                }
+            }
+
+            return validProviderIds;
+        }
+
        protected async Task SaveItemAsync(MetadataResult<TItemType> result, ItemUpdateType reason, bool reattachUserData, CancellationToken cancellationToken)
        {
            await result.Item.UpdateToRepositoryAsync(reason, cancellationToken).ConfigureAwait(false);
@@ -835,6 +865,7 @@ namespace MediaBrowser.Providers.Manager
                }
            }

+            var hasRemoteMetadata = false;
            var isLocalLocked = temp.Item.IsLocked;
            if (!isLocalLocked && (options.ReplaceAllMetadata || options.MetadataRefreshMode > MetadataRefreshMode.ValidationOnly))
            {
@@ -849,6 +880,7 @@ namespace MediaBrowser.Providers.Manager

                var remoteResult = await ExecuteRemoteProviders(temp, logName, false, id, remoteProviders, cancellationToken).ConfigureAwait(false);

+                hasRemoteMetadata = remoteResult.UpdateType.HasFlag(ItemUpdateType.MetadataDownload);
                refreshResult.UpdateType |= remoteResult.UpdateType;
                refreshResult.ErrorMessage = remoteResult.ErrorMessage;
                refreshResult.Failures += remoteResult.Failures;
@@ -858,7 +890,12 @@ namespace MediaBrowser.Providers.Manager
            {
                if (refreshResult.UpdateType > ItemUpdateType.None)
                {
-                    if (!options.RemoveOldMetadata)
+                    // Erasing the old values is only safe when a remote provider returned something to
+                    // replace them with. If every one of them failed there is no replacement, and wiping the
+                    // item would turn a provider being temporarily unreachable into permanent data loss.
+                    // A single failure is not enough: Identify asks for the erasure precisely because the
+                    // previous match was wrong, and an unrelated provider throwing must not undo that.
+                    if (!options.RemoveOldMetadata || (refreshResult.Failures > 0 && !hasRemoteMetadata))
                    {
                        // Add existing metadata to provider result if it does not exist there
                        MergeData(metadata, temp, [], false, false);
@@ -913,6 +950,10 @@ namespace MediaBrowser.Providers.Manager
        private async Task<RefreshResult> ExecuteRemoteProviders(MetadataResult<TItemType> temp, string logName, bool replaceData, TIdType id, IEnumerable<IRemoteMetadataProvider<TItemType, TIdType>> providers, CancellationToken cancellationToken)
        {
            var refreshResult = new RefreshResult();
+            var preferredLanguage = id?.MetadataLanguage;
+
+            var overviewIsFallback = false;
+            var taglineIsFallback = false;

            if (id is not null)
            {
@@ -932,6 +973,28 @@ namespace MediaBrowser.Providers.Manager
                    {
                        result.Provider = provider.Name;

+                        if (MetadataLanguageUtils.MatchesPreferredLanguage(result.ResultLanguage, preferredLanguage))
+                        {
+                            if (overviewIsFallback && !string.IsNullOrEmpty(result.Item.Overview))
+                            {
+                                temp.Item.Overview = null;
+                                overviewIsFallback = false;
+                            }
+
+                            if (taglineIsFallback && !string.IsNullOrEmpty(result.Item.Tagline))
+                            {
+                                temp.Item.Tagline = null;
+                                taglineIsFallback = false;
+                            }
+                        }
+                        else
+                        {
+                            overviewIsFallback |= string.IsNullOrEmpty(temp.Item.Overview) && !string.IsNullOrEmpty(result.Item.Overview);
+                            taglineIsFallback |= string.IsNullOrEmpty(temp.Item.Tagline) && !string.IsNullOrEmpty(result.Item.Tagline);
+                        }
+
+                        LogInvalidProviderIds(result, providerName, logName);
+
                        MergeData(result, temp, [], replaceData, false);
                        MergeNewData(temp.Item, id);

@@ -957,6 +1020,58 @@ namespace MediaBrowser.Providers.Manager
            return refreshResult;
        }

+        /// <summary>
+        /// Reports the ids a provider returned that cannot belong to the provider they are filed under.
+        /// </summary>
+        /// <remarks>
+        /// The ids are dropped when merging, this names the provider that produced them so the source of a
+        /// recurring bad id can be found.
+        /// </remarks>
+        private void LogInvalidProviderIds(MetadataResult<TItemType> result, string providerName, string logName)
+        {
+            if (!Logger.IsEnabled(LogLevel.Debug))
+            {
+                return;
+            }
+
+            LogInvalidProviderIds(result.Item?.ProviderIds, providerName, logName, null);
+
+            if (result.People is null)
+            {
+                return;
+            }
+
+            foreach (var person in result.People)
+            {
+                LogInvalidProviderIds(person.ProviderIds, providerName, logName, person.Name);
+            }
+        }
+
+        private void LogInvalidProviderIds(IReadOnlyDictionary<string, string> providerIds, string providerName, string logName, string personName)
+        {
+            if (providerIds is null)
+            {
+                return;
+            }
+
+            foreach (var (key, value) in providerIds)
+            {
+                if (ProviderIdsExtensions.IsValidProviderId(key, value))
+                {
+                    continue;
+                }
+
+                if (personName is null)
+                {
+                    Logger.LogDebug("Discarding {Key} id '{Value}' returned by {Provider} for {Item}", key, value, providerName, logName);
+                }
+                else
+                {
+                    Logger.LogDebug("Discarding {Key} id '{Value}' returned by {Provider} for {Person} of {Item}", key, value, providerName, personName, logName);
+                }
+            }
+        }
+
        private void MergeNewData(TItemType source, TIdType lookupInfo)
        {
            // Copy new provider id's that may have been obtained
@@ -964,8 +1079,18 @@ namespace MediaBrowser.Providers.Manager
            {
                var key = providerId.Key;

-                // Don't replace existing Id's.
-                lookupInfo.ProviderIds.TryAdd(key, providerId.Value);
+                if (!ProviderIdsExtensions.IsValidProviderId(key, providerId.Value))
+                {
+                    continue;
+                }
+
+                // Don't replace existing Id's, unless the one already there is unusable - handing that
+                // one to the providers that have yet to run is what makes them fail.
+                if (!lookupInfo.ProviderIds.TryGetValue(key, out var existingId)
+                    || !ProviderIdsExtensions.IsValidProviderId(key, existingId))
+                {
+                    lookupInfo.ProviderIds[key] = providerId.Value;
+                }
            }
        }

@@ -1104,6 +1229,9 @@ namespace MediaBrowser.Providers.Manager

            if (!lockedFields.Contains(MetadataField.Cast))
            {
+                RemoveInvalidProviderIds(sourceResult.People);
+                RemoveInvalidProviderIds(targetResult.People);
+
                if (replaceData || targetResult.People is null || targetResult.People.Count == 0)
                {
                    targetResult.People = sourceResult.People;
@@ -1175,15 +1303,31 @@ namespace MediaBrowser.Providers.Manager
            {
                var key = id.Key;

-                // Don't replace existing Id's.
-                if (replaceData)
+                // An id that cannot belong to the provider it is filed under only breaks that provider on
+                // the next refresh, so never let one in - not even when replacing all metadata.
+                if (!ProviderIdsExtensions.IsValidProviderId(key, id.Value))
+                {
+                    continue;
+                }
+
+                // Don't replace existing Id's, unless the stored one is unusable - that one is the bad
+                // match the refresh is meant to repair.
+                if (replaceData
+                    || !target.ProviderIds.TryGetValue(key, out var existingId)
+                    || !ProviderIdsExtensions.IsValidProviderId(key, existingId))
                {
                    target.ProviderIds[key] = id.Value;
                }
-                else
-                {
-                    target.ProviderIds.TryAdd(key, id.Value);
-                }
+            }
+
+            // A bad id no provider offered a replacement for still has to go, otherwise the item keeps
+            // failing the same way on every refresh.
+            foreach (var key in target.ProviderIds
+                .Where(id => !ProviderIdsExtensions.IsValidProviderId(id.Key, id.Value))
+                .Select(id => id.Key)
+                .ToArray())
+            {
+                target.ProviderIds.Remove(key);
            }

            if (replaceData || !target.CriticRating.HasValue)
@@ -1251,6 +1395,32 @@ namespace MediaBrowser.Providers.Manager
            }
        }

+        private static void RemoveInvalidProviderIds(IReadOnlyList<PersonInfo> people)
+        {
+            if (people is null)
+            {
+                return;
+            }
+
+            foreach (var person in people)
+            {
+                if (person.ProviderIds is null || person.ProviderIds.Count == 0)
+                {
+                    continue;
+                }
+
+                var invalidKeys = person.ProviderIds
+                    .Where(id => !ProviderIdsExtensions.IsValidProviderId(id.Key, id.Value))
+                    .Select(id => id.Key)
+                    .ToArray();
+
+                foreach (var key in invalidKeys)
+                {
+                    person.ProviderIds.Remove(key);
+                }
+            }
+        }
+
        private static void MergePeople(IReadOnlyList<PersonInfo> source, IReadOnlyList<PersonInfo> target)
        {
            var sourceByName = source.ToLookup(p => p.Name.RemoveDiacritics(), StringComparer.OrdinalIgnoreCase);
@@ -23,11 +23,11 @@ namespace MediaBrowser.Providers.Music

        public static string? GetReleaseGroupId(this AlbumInfo info)
        {
-            var id = info.GetProviderId(MetadataProvider.MusicBrainzReleaseGroup);
+            var id = MusicBrainzId(MetadataProvider.MusicBrainzReleaseGroup, info.GetProviderId(MetadataProvider.MusicBrainzReleaseGroup));

            if (string.IsNullOrEmpty(id))
            {
-                return info.SongInfos.Select(i => i.GetProviderId(MetadataProvider.MusicBrainzReleaseGroup))
+                return info.SongInfos.Select(i => MusicBrainzId(MetadataProvider.MusicBrainzReleaseGroup, i.GetProviderId(MetadataProvider.MusicBrainzReleaseGroup)))
                    .FirstOrDefault(i => !string.IsNullOrEmpty(i));
            }

@@ -36,11 +36,11 @@ namespace MediaBrowser.Providers.Music

        public static string? GetReleaseId(this AlbumInfo info)
        {
-            var id = info.GetProviderId(MetadataProvider.MusicBrainzAlbum);
+            var id = MusicBrainzId(MetadataProvider.MusicBrainzAlbum, info.GetProviderId(MetadataProvider.MusicBrainzAlbum));

            if (string.IsNullOrEmpty(id))
            {
-                return info.SongInfos.Select(i => i.GetProviderId(MetadataProvider.MusicBrainzAlbum))
+                return info.SongInfos.Select(i => MusicBrainzId(MetadataProvider.MusicBrainzAlbum, i.GetProviderId(MetadataProvider.MusicBrainzAlbum)))
                    .FirstOrDefault(i => !string.IsNullOrEmpty(i));
            }

@@ -50,15 +50,17 @@ namespace MediaBrowser.Providers.Music
        public static string? GetMusicBrainzArtistId(this AlbumInfo info)
        {
            info.ProviderIds.TryGetValue(MetadataProvider.MusicBrainzAlbumArtist.ToString(), out string? id);
+            id = MusicBrainzId(MetadataProvider.MusicBrainzAlbumArtist, id);

            if (string.IsNullOrEmpty(id))
            {
                info.ArtistProviderIds.TryGetValue(MetadataProvider.MusicBrainzArtist.ToString(), out id);
+                id = MusicBrainzId(MetadataProvider.MusicBrainzArtist, id);
            }

            if (string.IsNullOrEmpty(id))
            {
-                return info.SongInfos.Select(i => i.GetProviderId(MetadataProvider.MusicBrainzAlbumArtist))
+                return info.SongInfos.Select(i => MusicBrainzId(MetadataProvider.MusicBrainzAlbumArtist, i.GetProviderId(MetadataProvider.MusicBrainzAlbumArtist)))
                    .FirstOrDefault(i => !string.IsNullOrEmpty(i));
            }

@@ -68,14 +70,21 @@ namespace MediaBrowser.Providers.Music
        public static string? GetMusicBrainzArtistId(this ArtistInfo info)
        {
            info.ProviderIds.TryGetValue(MetadataProvider.MusicBrainzArtist.ToString(), out var id);
+            id = MusicBrainzId(MetadataProvider.MusicBrainzArtist, id);

            if (string.IsNullOrEmpty(id))
            {
-                return info.SongInfos.Select(i => i.GetProviderId(MetadataProvider.MusicBrainzAlbumArtist))
+                return info.SongInfos.Select(i => MusicBrainzId(MetadataProvider.MusicBrainzAlbumArtist, i.GetProviderId(MetadataProvider.MusicBrainzAlbumArtist)))
                    .FirstOrDefault(i => !string.IsNullOrEmpty(i));
            }

            return id;
        }
+
+        /// <summary>
+        /// Returns the id if it can be an id of the given provider, otherwise <c>null</c>.
+        /// </summary>
+        private static string? MusicBrainzId(MetadataProvider provider, string? id)
+            => ProviderIdsExtensions.IsValidProviderId(provider.ToString(), id) ? id : null;
    }
 }
@@ -21,6 +21,7 @@ using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Providers;
+using MediaBrowser.Providers.Manager;
 using MediaBrowser.Providers.Music;

 namespace MediaBrowser.Providers.Plugins.AudioDb
@@ -77,7 +78,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
                    {
                        result.Item = new MusicAlbum();
                        result.HasMetadata = true;
-                        ProcessResult(result.Item, obj.album[0], info.MetadataLanguage);
+                        ProcessResult(result, obj.album[0], info.MetadataLanguage);
                    }
                }
            }
@@ -85,8 +86,10 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
            return result;
        }

-        private void ProcessResult(MusicAlbum item, Album result, string preferredLanguage)
+        private void ProcessResult(MetadataResult<MusicAlbum> metadataResult, Album result, string preferredLanguage)
        {
+            var item = metadataResult.Item;
+
            if (Plugin.Instance.Configuration.ReplaceAlbumName && !string.IsNullOrWhiteSpace(result.strAlbum))
            {
                item.Album = result.strAlbum;
@@ -113,43 +116,48 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
            item.SetProviderId(MetadataProvider.MusicBrainzAlbumArtist, result.strMusicBrainzArtistID);
            item.SetProviderId(MetadataProvider.MusicBrainzReleaseGroup, result.strMusicBrainzID);

-            string overview = null;
-
-            if (string.Equals(preferredLanguage, "de", StringComparison.OrdinalIgnoreCase))
-            {
-                overview = result.strDescriptionDE;
-            }
-            else if (string.Equals(preferredLanguage, "fr", StringComparison.OrdinalIgnoreCase))
-            {
-                overview = result.strDescriptionFR;
-            }
-            else if (string.Equals(preferredLanguage, "nl", StringComparison.OrdinalIgnoreCase))
-            {
-                overview = result.strDescriptionNL;
-            }
-            else if (string.Equals(preferredLanguage, "ru", StringComparison.OrdinalIgnoreCase))
-            {
-                overview = result.strDescriptionRU;
-            }
-            else if (string.Equals(preferredLanguage, "it", StringComparison.OrdinalIgnoreCase))
-            {
-                overview = result.strDescriptionIT;
-            }
-            else if ((preferredLanguage ?? string.Empty).StartsWith("pt", StringComparison.OrdinalIgnoreCase))
-            {
-                overview = result.strDescriptionPT;
-            }
+            var language = MetadataLanguageUtils.GetLanguageSubtag(preferredLanguage);
+            var overview = GetDescription(result, language);

            if (string.IsNullOrWhiteSpace(overview))
            {
                overview = string.IsNullOrWhiteSpace(result.strDescriptionEN)
                    ? result.strDescription
                    : result.strDescriptionEN;
+
+                // The description is not in the requested language, mark it as English so it does not
+                // block a provider further down the list that can serve the requested language
+                metadataResult.ResultLanguage = "en";
+            }
+            else
+            {
+                metadataResult.ResultLanguage = language;
            }

            item.Overview = (overview ?? string.Empty).StripHtml();
        }

+        private static string GetDescription(Album result, string language)
+            => language switch
+            {
+                "de" => result.strDescriptionDE,
+                "en" => result.strDescriptionEN,
+                "es" => result.strDescriptionES,
+                "fr" => result.strDescriptionFR,
+                "he" => result.strDescriptionIL,
+                "hu" => result.strDescriptionHU,
+                "it" => result.strDescriptionIT,
+                "ja" => result.strDescriptionJP,
+                "nl" => result.strDescriptionNL,
+                "no" or "nb" or "nn" => result.strDescriptionNO,
+                "pl" => result.strDescriptionPL,
+                "pt" => result.strDescriptionPT,
+                "ru" => result.strDescriptionRU,
+                "sv" => result.strDescriptionSE,
+                "zh" => result.strDescriptionCN,
+                _ => null
+            };
+
        internal async Task EnsureInfo(string musicBrainzReleaseGroupId, CancellationToken cancellationToken)
        {
            var xmlPath = GetAlbumInfoPath(_config.ApplicationPaths, musicBrainzReleaseGroupId);
@@ -22,6 +22,7 @@ using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Providers;
+using MediaBrowser.Providers.Manager;
 using MediaBrowser.Providers.Music;

 namespace MediaBrowser.Providers.Plugins.AudioDb
@@ -148,7 +149,7 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
            {
                result.Item = new MusicArtist();
                result.HasMetadata = true;
-                ProcessResult(result.Item, artist, info.MetadataLanguage);
+                ProcessResult(result, artist, info.MetadataLanguage);
            }

            return result;
@@ -193,8 +194,10 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
            return null;
        }

-        private void ProcessResult(MusicArtist item, Artist result, string preferredLanguage)
+        private void ProcessResult(MetadataResult<MusicArtist> metadataResult, Artist result, string preferredLanguage)
        {
+            var item = metadataResult.Item;
+
            if (!string.IsNullOrWhiteSpace(result.strWebsite))
            {
                item.HomePageUrl = result.strWebsite;
@@ -229,43 +232,48 @@ namespace MediaBrowser.Providers.Plugins.AudioDb
            item.SetProviderId(MetadataProvider.AudioDbArtist, result.idArtist);
            item.SetProviderId(MetadataProvider.MusicBrainzArtist, result.strMusicBrainzID);

-            string overview = null;
-
-            if (string.Equals(preferredLanguage, "de", StringComparison.OrdinalIgnoreCase))
-            {
-                overview = result.strBiographyDE;
-            }
-            else if (string.Equals(preferredLanguage, "fr", StringComparison.OrdinalIgnoreCase))
-            {
-                overview = result.strBiographyFR;
-            }
-            else if (string.Equals(preferredLanguage, "nl", StringComparison.OrdinalIgnoreCase))
-            {
-                overview = result.strBiographyNL;
-            }
-            else if (string.Equals(preferredLanguage, "ru", StringComparison.OrdinalIgnoreCase))
-            {
-                overview = result.strBiographyRU;
-            }
-            else if (string.Equals(preferredLanguage, "it", StringComparison.OrdinalIgnoreCase))
-            {
-                overview = result.strBiographyIT;
-            }
-            else if ((preferredLanguage ?? string.Empty).StartsWith("pt", StringComparison.OrdinalIgnoreCase))
-            {
-                overview = result.strBiographyPT;
-            }
+            var language = MetadataLanguageUtils.GetLanguageSubtag(preferredLanguage);
+            var overview = GetBiography(result, language);

            if (string.IsNullOrWhiteSpace(overview))
            {
                overview = string.IsNullOrWhiteSpace(result.strBiographyEN)
                    ? result.strBiography
                    : result.strBiographyEN;
+
+                // The biography is not in the requested language, mark it as English so it does not
+                // block a provider further down the list that can serve the requested language
+                metadataResult.ResultLanguage = "en";
+            }
+            else
+            {
+                metadataResult.ResultLanguage = language;
            }

            item.Overview = (overview ?? string.Empty).StripHtml();
        }

+        private static string GetBiography(Artist result, string language)
+            => language switch
+            {
+                "de" => result.strBiographyDE,
+                "en" => result.strBiographyEN,
+                "es" => result.strBiographyES,
+                "fr" => result.strBiographyFR,
+                "he" => result.strBiographyIL,
+                "hu" => result.strBiographyHU,
+                "it" => result.strBiographyIT,
+                "ja" => result.strBiographyJP,
+                "nl" => result.strBiographyNL,
+                "no" or "nb" or "nn" => result.strBiographyNO,
+                "pl" => result.strBiographyPL,
+                "pt" => result.strBiographyPT,
+                "ru" => result.strBiographyRU,
+                "sv" => result.strBiographySE,
+                "zh" => result.strBiographyCN,
+                _ => null
+            };
+
        internal async Task EnsureArtistInfo(string musicBrainzId, CancellationToken cancellationToken)
        {
            var xmlPath = GetArtistInfoPath(_config.ApplicationPaths, musicBrainzId);
@@ -14,6 +14,7 @@ using MediaBrowser.Providers.Music;
 using MetaBrainz.MusicBrainz;
 using MetaBrainz.MusicBrainz.Interfaces.Entities;
 using MetaBrainz.MusicBrainz.Interfaces.Searches;
+using Microsoft.Extensions.Logging;

 namespace MediaBrowser.Providers.Plugins.MusicBrainz;

@@ -22,6 +23,17 @@ namespace MediaBrowser.Providers.Plugins.MusicBrainz;
 /// </summary>
 public class MusicBrainzAlbumProvider : IRemoteMetadataProvider<MusicAlbum, AlbumInfo>, IHasOrder
 {
+    private readonly ILogger<MusicBrainzAlbumProvider> _logger;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MusicBrainzAlbumProvider"/> class.
+    /// </summary>
+    /// <param name="logger">The logger.</param>
+    public MusicBrainzAlbumProvider(ILogger<MusicBrainzAlbumProvider> logger)
+    {
+        _logger = logger;
+    }
+
    /// <inheritdoc />
    public string Name => "MusicBrainz";

@@ -32,21 +44,26 @@ public class MusicBrainzAlbumProvider : IRemoteMetadataProvider<MusicAlbum, Albu
    public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(AlbumInfo searchInfo, CancellationToken cancellationToken)
    {
        var query = MusicBrainz.Plugin.Instance!.MusicBrainzQuery;
-        var releaseId = searchInfo.GetReleaseId();
-        var releaseGroupId = searchInfo.GetReleaseGroupId();
+        var releaseId = MusicBrainzQueryExtensions.ParseMusicBrainzId(searchInfo.GetReleaseId(), "release", _logger);
+        var releaseGroupId = MusicBrainzQueryExtensions.ParseMusicBrainzId(searchInfo.GetReleaseGroupId(), "release group", _logger);

-        if (!string.IsNullOrEmpty(releaseId))
+        if (releaseId is not null)
        {
-            var releaseResult = await query.LookupReleaseAsync(new Guid(releaseId), Include.Artists | Include.ReleaseGroups, cancellationToken).ConfigureAwait(false);
-            return GetReleaseResult(releaseResult).SingleItemAsEnumerable();
+            var releaseResult = await query.LookupReleaseOrNullAsync(releaseId.Value, Include.Artists | Include.ReleaseGroups, _logger, cancellationToken).ConfigureAwait(false);
+            if (releaseResult is not null)
+            {
+                return GetReleaseResult(releaseResult).SingleItemAsEnumerable();
+            }
        }

-        if (!string.IsNullOrEmpty(releaseGroupId))
+        if (releaseGroupId is not null)
        {
-            var releaseGroupResult = await query.LookupReleaseGroupAsync(new Guid(releaseGroupId), Include.Releases, null, cancellationToken).ConfigureAwait(false);
-
-            // No need to pass the cancellation token to GetReleaseGroupResultAsync as we're already passing it to ToBlockingEnumerable
-            return GetReleaseGroupResultAsync(releaseGroupResult.Releases, CancellationToken.None).ToBlockingEnumerable(cancellationToken);
+            var releaseGroupResult = await query.LookupReleaseGroupOrNullAsync(releaseGroupId.Value, Include.Releases, _logger, cancellationToken).ConfigureAwait(false);
+            if (releaseGroupResult is not null)
+            {
+                // No need to pass the cancellation token to GetReleaseGroupResultAsync as we're already passing it to ToBlockingEnumerable
+                return GetReleaseGroupResultAsync(releaseGroupResult.Releases, CancellationToken.None).ToBlockingEnumerable(cancellationToken);
+            }
        }

        var artistMusicBrainzId = searchInfo.GetMusicBrainzArtistId();
@@ -102,8 +119,11 @@ public class MusicBrainzAlbumProvider : IRemoteMetadataProvider<MusicAlbum, Albu
        foreach (var result in releaseSearchResults)
        {
            // Fetch full release info, otherwise artists are missing
-            var fullResult = await query.LookupReleaseAsync(result.Id, Include.Artists | Include.ReleaseGroups, cancellationToken).ConfigureAwait(false);
-            yield return GetReleaseResult(fullResult);
+            var fullResult = await query.LookupReleaseOrNullAsync(result.Id, Include.Artists | Include.ReleaseGroups, _logger, cancellationToken).ConfigureAwait(false);
+            if (fullResult is not null)
+            {
+                yield return GetReleaseResult(fullResult);
+            }
        }
    }

@@ -156,8 +176,8 @@ public class MusicBrainzAlbumProvider : IRemoteMetadataProvider<MusicAlbum, Albu
    public async Task<MetadataResult<MusicAlbum>> GetMetadata(AlbumInfo info, CancellationToken cancellationToken)
    {
        var query = MusicBrainz.Plugin.Instance!.MusicBrainzQuery;
-        var releaseId = info.GetReleaseId();
-        var releaseGroupId = info.GetReleaseGroupId();
+        var releaseId = MusicBrainzQueryExtensions.ParseMusicBrainzId(info.GetReleaseId(), "release", _logger);
+        var releaseGroupId = MusicBrainzQueryExtensions.ParseMusicBrainzId(info.GetReleaseGroupId(), "release group", _logger);

        var result = new MetadataResult<MusicAlbum>
        {
@@ -165,15 +185,15 @@ public class MusicBrainzAlbumProvider : IRemoteMetadataProvider<MusicAlbum, Albu
        };

        // If there is a release group, but no release ID, try to match the release
-        if (string.IsNullOrWhiteSpace(releaseId) && !string.IsNullOrWhiteSpace(releaseGroupId))
+        if (releaseId is null && releaseGroupId is not null)
        {
            // TODO: Actually try to match the release. Simply taking the first result is stupid.
-            var releaseGroupLookup = await query.LookupReleaseGroupAsync(new Guid(releaseGroupId), Include.None, null, cancellationToken).ConfigureAwait(false);
-            releaseId = releaseGroupLookup.Releases?.Count > 0 ? releaseGroupLookup.Releases[0].Id.ToString() : null;
+            var releaseGroupLookup = await query.LookupReleaseGroupOrNullAsync(releaseGroupId.Value, Include.None, _logger, cancellationToken).ConfigureAwait(false);
+            releaseId = releaseGroupLookup?.Releases?.Count > 0 ? releaseGroupLookup.Releases[0].Id : null;
        }

        // If there is no release ID, lookup a release with the info we have
-        if (string.IsNullOrWhiteSpace(releaseId))
+        if (releaseId is null)
        {
            var artistMusicBrainzId = info.GetMusicBrainzArtistId();
            IRelease? releaseResult = null;
@@ -193,55 +213,61 @@ public class MusicBrainzAlbumProvider : IRemoteMetadataProvider<MusicAlbum, Albu

            if (releaseResult is not null)
            {
-                releaseId = releaseResult.Id.ToString();
+                releaseId = releaseResult.Id;

                if (releaseResult.ReleaseGroup?.Id is not null)
                {
-                    releaseGroupId = releaseResult.ReleaseGroup.Id.ToString();
+                    releaseGroupId = releaseResult.ReleaseGroup.Id;
                }
            }
        }

-        if (string.IsNullOrWhiteSpace(releaseId) && string.IsNullOrWhiteSpace(releaseGroupId))
+        if (releaseId is null && releaseGroupId is null)
        {
            return result;
        }

        // Fetch the full release (and its release group) so we can populate everything MusicBrainz returns.
        IRelease? release = null;
-        if (!string.IsNullOrWhiteSpace(releaseId))
+        if (releaseId is not null)
        {
-            release = await query.LookupReleaseAsync(
-                new Guid(releaseId),
+            release = await query.LookupReleaseOrNullAsync(
+                releaseId.Value,
                Include.Artists | Include.ReleaseGroups | Include.Labels | Include.Genres | Include.Tags,
+                _logger,
                cancellationToken).ConfigureAwait(false);

-            if (string.IsNullOrWhiteSpace(releaseGroupId) && release?.ReleaseGroup?.Id is not null)
+            if (releaseGroupId is null && release?.ReleaseGroup?.Id is not null)
            {
-                releaseGroupId = release.ReleaseGroup.Id.ToString();
+                releaseGroupId = release.ReleaseGroup.Id;
            }
        }

        IReleaseGroup? releaseGroup = null;
-        if (!string.IsNullOrWhiteSpace(releaseGroupId))
+        if (releaseGroupId is not null)
        {
-            releaseGroup = await query.LookupReleaseGroupAsync(
-                new Guid(releaseGroupId),
+            releaseGroup = await query.LookupReleaseGroupOrNullAsync(
+                releaseGroupId.Value,
                Include.Artists | Include.Genres | Include.Tags,
-                null,
+                _logger,
                cancellationToken).ConfigureAwait(false);
        }

+        if (release is null && releaseGroup is null)
+        {
+            return result;
+        }
+
        result.HasMetadata = true;

-        if (!string.IsNullOrEmpty(releaseId))
+        if (releaseId is not null)
        {
-            result.Item.SetProviderId(MetadataProvider.MusicBrainzAlbum, releaseId);
+            result.Item.SetProviderId(MetadataProvider.MusicBrainzAlbum, releaseId.Value.ToString());
        }

-        if (!string.IsNullOrEmpty(releaseGroupId))
+        if (releaseGroupId is not null)
        {
-            result.Item.SetProviderId(MetadataProvider.MusicBrainzReleaseGroup, releaseGroupId);
+            result.Item.SetProviderId(MetadataProvider.MusicBrainzReleaseGroup, releaseGroupId.Value.ToString());
        }

        Populate(result.Item, release, releaseGroup);
@@ -13,6 +13,7 @@ using MediaBrowser.Providers.Music;
 using MetaBrainz.MusicBrainz;
 using MetaBrainz.MusicBrainz.Interfaces.Entities;
 using MetaBrainz.MusicBrainz.Interfaces.Searches;
+using Microsoft.Extensions.Logging;

 namespace MediaBrowser.Providers.Plugins.MusicBrainz;

@@ -21,6 +22,17 @@ namespace MediaBrowser.Providers.Plugins.MusicBrainz;
 /// </summary>
 public class MusicBrainzArtistProvider : IRemoteMetadataProvider<MusicArtist, ArtistInfo>, IHasOrder
 {
+    private readonly ILogger<MusicBrainzArtistProvider> _logger;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MusicBrainzArtistProvider"/> class.
+    /// </summary>
+    /// <param name="logger">The logger.</param>
+    public MusicBrainzArtistProvider(ILogger<MusicBrainzArtistProvider> logger)
+    {
+        _logger = logger;
+    }
+
    /// <inheritdoc />
    public string Name => "MusicBrainz";

@@ -32,12 +44,15 @@ public class MusicBrainzArtistProvider : IRemoteMetadataProvider<MusicArtist, Ar
    public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(ArtistInfo searchInfo, CancellationToken cancellationToken)
    {
        var query = MusicBrainz.Plugin.Instance!.MusicBrainzQuery;
-        var artistId = searchInfo.GetMusicBrainzArtistId();
+        var artistId = MusicBrainzQueryExtensions.ParseMusicBrainzId(searchInfo.GetMusicBrainzArtistId(), "artist", _logger);

-        if (!string.IsNullOrWhiteSpace(artistId))
+        if (artistId is not null)
        {
-            var artistResult = await query.LookupArtistAsync(new Guid(artistId), Include.Aliases, null, null, cancellationToken).ConfigureAwait(false);
-            return GetResultFromResponse(artistResult).SingleItemAsEnumerable();
+            var artistResult = await query.LookupArtistOrNullAsync(artistId.Value, Include.Aliases, _logger, cancellationToken).ConfigureAwait(false);
+            if (artistResult is not null)
+            {
+                return GetResultFromResponse(artistResult).SingleItemAsEnumerable();
+            }
        }

        if (string.IsNullOrWhiteSpace(searchInfo.Name))
@@ -99,22 +114,22 @@ public class MusicBrainzArtistProvider : IRemoteMetadataProvider<MusicArtist, Ar
    {
        var result = new MetadataResult<MusicArtist> { Item = new MusicArtist() };

-        var musicBrainzId = info.GetMusicBrainzArtistId();
+        var musicBrainzId = MusicBrainzQueryExtensions.ParseMusicBrainzId(info.GetMusicBrainzArtistId(), "artist", _logger);

        // If we don't have an id yet, resolve one by name so we can look the artist up.
-        if (string.IsNullOrWhiteSpace(musicBrainzId))
+        if (musicBrainzId is null)
        {
            var searchResults = await GetSearchResults(info, cancellationToken).ConfigureAwait(false);
-            musicBrainzId = searchResults.FirstOrDefault()?.GetProviderId(MetadataProvider.MusicBrainzArtist);
+            musicBrainzId = MusicBrainzQueryExtensions.ParseMusicBrainzId(searchResults.FirstOrDefault()?.GetProviderId(MetadataProvider.MusicBrainzArtist), "artist", _logger);
        }

-        if (string.IsNullOrWhiteSpace(musicBrainzId))
+        if (musicBrainzId is null)
        {
            return result;
        }

        var query = Plugin.Instance!.MusicBrainzQuery;
-        var artist = await query.LookupArtistAsync(new Guid(musicBrainzId), Include.Genres | Include.Tags, null, null, cancellationToken).ConfigureAwait(false);
+        var artist = await query.LookupArtistOrNullAsync(musicBrainzId.Value, Include.Genres | Include.Tags, _logger, cancellationToken).ConfigureAwait(false);

        if (artist is null)
        {
@@ -0,0 +1,112 @@
+using System;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+using MetaBrainz.Common;
+using MetaBrainz.MusicBrainz;
+using MetaBrainz.MusicBrainz.Interfaces.Entities;
+using Microsoft.Extensions.Logging;
+
+namespace MediaBrowser.Providers.Plugins.MusicBrainz;
+
+/// <summary>
+/// Helpers for talking to MusicBrainz with identifiers that are not guaranteed to be valid.
+/// </summary>
+internal static class MusicBrainzQueryExtensions
+{
+    /// <summary>
+    /// Parses a MusicBrainz identifier, which may come from user-supplied tags or NFO files and is therefore not
+    /// guaranteed to be a valid GUID.
+    /// </summary>
+    /// <param name="id">The identifier to parse.</param>
+    /// <param name="entityType">The type of entity the identifier refers to, used for logging.</param>
+    /// <param name="logger">The logger.</param>
+    /// <returns>The parsed identifier, or <see langword="null"/> if it is missing or malformed.</returns>
+    public static Guid? ParseMusicBrainzId(string? id, string entityType, ILogger logger)
+    {
+        if (string.IsNullOrWhiteSpace(id))
+        {
+            return null;
+        }
+
+        if (!Guid.TryParse(id, out var parsedId))
+        {
+            logger.LogDebug("Ignoring malformed MusicBrainz {EntityType} id {Id}", entityType, id);
+            return null;
+        }
+
+        return parsedId;
+    }
+
+    /// <summary>
+    /// Looks up a release, treating an unknown identifier as missing data rather than an error.
+    /// </summary>
+    /// <param name="query">The MusicBrainz query client.</param>
+    /// <param name="releaseId">The release identifier.</param>
+    /// <param name="include">The additional data to include in the lookup.</param>
+    /// <param name="logger">The logger.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns>The release, or <see langword="null"/> if MusicBrainz does not have it.</returns>
+    public static Task<IRelease?> LookupReleaseOrNullAsync(this Query query, Guid releaseId, Include include, ILogger logger, CancellationToken cancellationToken)
+        => NotFoundAsNullAsync(
+            () => query.LookupReleaseAsync(releaseId, include, cancellationToken),
+            "release",
+            releaseId,
+            logger);
+
+    /// <summary>
+    /// Looks up a release group, treating an unknown identifier as missing data rather than an error.
+    /// </summary>
+    /// <param name="query">The MusicBrainz query client.</param>
+    /// <param name="releaseGroupId">The release group identifier.</param>
+    /// <param name="include">The additional data to include in the lookup.</param>
+    /// <param name="logger">The logger.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns>The release group, or <see langword="null"/> if MusicBrainz does not have it.</returns>
+    public static Task<IReleaseGroup?> LookupReleaseGroupOrNullAsync(this Query query, Guid releaseGroupId, Include include, ILogger logger, CancellationToken cancellationToken)
+        => NotFoundAsNullAsync(
+            () => query.LookupReleaseGroupAsync(releaseGroupId, include, null, cancellationToken),
+            "release group",
+            releaseGroupId,
+            logger);
+
+    /// <summary>
+    /// Looks up an artist, treating an unknown identifier as missing data rather than an error.
+    /// </summary>
+    /// <param name="query">The MusicBrainz query client.</param>
+    /// <param name="artistId">The artist identifier.</param>
+    /// <param name="include">The additional data to include in the lookup.</param>
+    /// <param name="logger">The logger.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns>The artist, or <see langword="null"/> if MusicBrainz does not have it.</returns>
+    public static Task<IArtist?> LookupArtistOrNullAsync(this Query query, Guid artistId, Include include, ILogger logger, CancellationToken cancellationToken)
+        => NotFoundAsNullAsync(
+            () => query.LookupArtistAsync(artistId, include, null, null, cancellationToken),
+            "artist",
+            artistId,
+            logger);
+
+    /// <summary>
+    /// Runs a lookup, mapping a "not found" response to <see langword="null"/>. Identifiers stored on a library item
+    /// can refer to entities that no longer exist in MusicBrainz, which is not an error worth failing a refresh over.
+    /// </summary>
+    /// <typeparam name="T">The type of entity being looked up.</typeparam>
+    /// <param name="lookup">The lookup to run.</param>
+    /// <param name="entityType">The type of entity being looked up, used for logging.</param>
+    /// <param name="id">The identifier being looked up, used for logging.</param>
+    /// <param name="logger">The logger.</param>
+    /// <returns>The entity, or <see langword="null"/> if MusicBrainz does not have it.</returns>
+    private static async Task<T?> NotFoundAsNullAsync<T>(Func<Task<T>> lookup, string entityType, Guid id, ILogger logger)
+        where T : class
+    {
+        try
+        {
+            return await lookup().ConfigureAwait(false);
+        }
+        catch (HttpError ex) when (ex.Status == HttpStatusCode.NotFound)
+        {
+            logger.LogDebug("MusicBrainz has no {EntityType} with id {Id}", entityType, id);
+            return null;
+        }
+    }
+}
@@ -44,7 +44,9 @@ namespace MediaBrowser.Providers.Plugins.Omdb
            var result = new MetadataResult<Episode>
            {
                Item = new Episode(),
-                QueriedById = true
+                QueriedById = true,
+                // OMDb is not localized, everything it returns is English
+                ResultLanguage = "en"
            };

            // Allowing this will dramatically increase scan times
@@ -218,7 +218,9 @@ namespace MediaBrowser.Providers.Plugins.Omdb
            var result = new MetadataResult<T>
            {
                Item = new T(),
-                QueriedById = true
+                QueriedById = true,
+                // OMDb is not localized, everything it returns is English
+                ResultLanguage = "en"
            };

            var imdbId = info.GetProviderId(MetadataProvider.Imdb);
@@ -27,6 +27,9 @@ namespace MediaBrowser.Providers.Plugins.Omdb
    /// <summary>Provider for OMDB service.</summary>
    public class OmdbProvider
    {
+        /// <summary>Generational suffixes that OMDb separates from the name with a comma.</summary>
+        private static readonly string[] NameSuffixes = ["Jr", "Jnr", "Sr", "Snr", "II", "III", "IV", "V"];
+
        private readonly IFileSystem _fileSystem;
        private readonly IServerConfigurationManager _configurationManager;
        private readonly IHttpClientFactory _httpClientFactory;
@@ -420,42 +423,96 @@ namespace MediaBrowser.Providers.Plugins.Omdb
                return;
            }

-            if (!string.IsNullOrWhiteSpace(result.Director))
-            {
-                var person = new PersonInfo
-                {
-                    Name = result.Director.Trim(),
-                    Type = PersonKind.Director
-                };
+            AddPeople(itemResult, result.Director, PersonKind.Director);
+            AddPeople(itemResult, result.Writer, PersonKind.Writer);
+            AddPeople(itemResult, result.Actors, PersonKind.Actor);
+        }

-                itemResult.AddPerson(person);
+        /// <summary>Adds the people from a comma separated OMDb credit list.</summary>
+        /// <typeparam name="T">The item type.</typeparam>
+        /// <param name="itemResult">The metadata result to add the people to.</param>
+        /// <param name="credits">The comma separated OMDb credit list.</param>
+        /// <param name="type">The kind of person each credit describes.</param>
+        internal static void AddPeople<T>(MetadataResult<T> itemResult, string credits, PersonKind type)
+            where T : BaseItem
+        {
+            if (string.IsNullOrWhiteSpace(credits))
+            {
+                return;
            }

-            if (!string.IsNullOrWhiteSpace(result.Writer))
-            {
-                var person = new PersonInfo
-                {
-                    Name = result.Writer.Trim(),
-                    Type = PersonKind.Writer
-                };
+            var names = new List<string>();

-                itemResult.AddPerson(person);
+            foreach (var credit in SplitCredits(credits))
+            {
+                // OMDb annotates the credited role in parentheses, e.g. "Mari Okada (screenplay)". The same
+                // person can be credited more than once this way, so strip it and let AddPerson deduplicate.
+                var name = credit;
+                var annotation = name.IndexOf('(', StringComparison.Ordinal);
+                if (annotation >= 0)
+                {
+                    name = name[..annotation];
+                }
+
+                name = name.Trim();
+                if (name.Length == 0)
+                {
+                    continue;
+                }
+
+                // A generational suffix is separated from the name it belongs to by the same comma the list
+                // uses, e.g. "Jack Salvatore, Jr.", so it has to be joined back instead of becoming a credit.
+                if (names.Count > 0 && IsNameSuffix(name))
+                {
+                    names[^1] = names[^1] + ", " + name;
+                    continue;
+                }
+
+                names.Add(name);
            }

-            if (!string.IsNullOrWhiteSpace(result.Actors))
+            foreach (var name in names)
            {
-                var actorList = result.Actors.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
-                foreach (var actor in actorList)
+                itemResult.AddPerson(new PersonInfo
                {
-                    var person = new PersonInfo
-                    {
-                        Name = actor,
-                        Type = PersonKind.Actor
-                    };
+                    Name = name,
+                    Type = type
+                });
+            }
+        }

-                    itemResult.AddPerson(person);
+        // Only the commas between credits, never one inside an annotation: "Jerry Siegel (created by:
+        // Superman, Superboy)" is one credit, and splitting it blindly invents a person called "Superboy)".
+        private static IEnumerable<string> SplitCredits(string credits)
+        {
+            var depth = 0;
+            var start = 0;
+
+            for (var i = 0; i < credits.Length; i++)
+            {
+                switch (credits[i])
+                {
+                    case '(':
+                        depth++;
+                        break;
+                    case ')':
+                        depth = Math.Max(0, depth - 1);
+                        break;
+                    case ',' when depth == 0:
+                        yield return credits[start..i];
+                        start = i + 1;
+                        break;
                }
            }
+
+            yield return credits[start..];
+        }
+
+        private static bool IsNameSuffix(string value)
+        {
+            var suffix = value.EndsWith('.') ? value[..^1] : value;
+
+            return NameSuffixes.Contains(suffix, StringComparer.OrdinalIgnoreCase);
        }

        private static bool IsConfiguredForEnglish(BaseItem item, string language)
@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Net.Http;
 using System.Threading;
@@ -56,7 +54,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.BoxSets
        /// <inheritdoc />
        public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, CancellationToken cancellationToken)
        {
-            var tmdbId = Convert.ToInt32(item.GetProviderId(MetadataProvider.Tmdb), CultureInfo.InvariantCulture);
+            item.TryGetTmdbId(out var tmdbId);

            if (tmdbId <= 0)
            {
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -42,7 +41,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.BoxSets
        /// <inheritdoc />
        public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(BoxSetInfo searchInfo, CancellationToken cancellationToken)
        {
-            var tmdbId = Convert.ToInt32(searchInfo.GetProviderId(MetadataProvider.Tmdb), CultureInfo.InvariantCulture);
+            searchInfo.TryGetTmdbId(out var tmdbId);
            var language = searchInfo.MetadataLanguage;

            if (tmdbId > 0)
@@ -97,7 +96,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.BoxSets
        /// <inheritdoc />
        public async Task<MetadataResult<BoxSet>> GetMetadata(BoxSetInfo info, CancellationToken cancellationToken)
        {
-            var tmdbId = Convert.ToInt32(info.GetProviderId(MetadataProvider.Tmdb), CultureInfo.InvariantCulture);
+            info.TryGetTmdbId(out var tmdbId);
            var language = info.MetadataLanguage;

            // We don't already have an Id, need to fetch it
@@ -115,7 +114,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.BoxSets
                }
            }

-            var result = new MetadataResult<BoxSet>();
+            var result = new MetadataResult<BoxSet>
+            {
+                ResultLanguage = language
+            };

            if (tmdbId > 0)
            {
@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Net.Http;
 using System.Threading;
@@ -61,7 +59,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
            var language = item.GetPreferredMetadataLanguage();
            var countryCode = item.GetPreferredMetadataCountryCode();

-            var movieTmdbId = Convert.ToInt32(item.GetProviderId(MetadataProvider.Tmdb), CultureInfo.InvariantCulture);
+            item.TryGetTmdbId(out var movieTmdbId);
            if (movieTmdbId <= 0)
            {
                var movieImdbId = item.GetProviderId(MetadataProvider.Imdb);
@@ -54,11 +54,11 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
        /// <inheritdoc />
        public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(MovieInfo searchInfo, CancellationToken cancellationToken)
        {
-            if (searchInfo.TryGetProviderId(MetadataProvider.Tmdb, out var id))
+            if (searchInfo.TryGetTmdbId(out var tmdbId))
            {
                var movie = await _tmdbClientManager
                    .GetMovieAsync(
-                        int.Parse(id, CultureInfo.InvariantCulture),
+                        tmdbId,
                        searchInfo.MetadataLanguage,
                        TmdbUtils.GetImageLanguagesParam(searchInfo.MetadataLanguage, searchInfo.MetadataCountryCode),
                        searchInfo.MetadataCountryCode,
@@ -90,7 +90,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
            }

            IReadOnlyList<SearchMovie>? movieResults = null;
-            if (searchInfo.TryGetProviderId(MetadataProvider.Imdb, out id))
+            if (searchInfo.TryGetProviderId(MetadataProvider.Imdb, out var id))
            {
                var result = await _tmdbClientManager.FindByExternalIdAsync(
                    id,
@@ -151,11 +151,13 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
        /// <inheritdoc />
        public async Task<MetadataResult<Movie>> GetMetadata(MovieInfo info, CancellationToken cancellationToken)
        {
-            var tmdbId = info.GetProviderId(MetadataProvider.Tmdb);
+            // A stored id that is not a TMDb id is treated as no id, so the search below can repair it
+            // rather than the lookup failing for as long as the bad id stays on the item.
+            info.TryGetTmdbId(out var tmdbId);
            var imdbId = info.GetProviderId(MetadataProvider.Imdb);
            var config = Plugin.Instance.Configuration;

-            if (string.IsNullOrEmpty(tmdbId) && string.IsNullOrEmpty(imdbId))
+            if (tmdbId <= 0 && string.IsNullOrEmpty(imdbId))
            {
                // ParseName is required here.
                // Caller provides the filename with extension stripped and NOT the parsed filename
@@ -166,26 +168,26 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies

                if (searchResults?.Count > 0)
                {
-                    tmdbId = searchResults[0].Id.ToString(CultureInfo.InvariantCulture);
+                    tmdbId = searchResults[0].Id;
                }
            }

-            if (string.IsNullOrEmpty(tmdbId) && !string.IsNullOrEmpty(imdbId))
+            if (tmdbId <= 0 && !string.IsNullOrEmpty(imdbId))
            {
                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);
+                    tmdbId = movieResultFromImdbId.MovieResults[0].Id;
                }
            }

-            if (string.IsNullOrEmpty(tmdbId))
+            if (tmdbId <= 0)
            {
                return new MetadataResult<Movie>();
            }

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

            if (movieResult is null)
@@ -208,7 +210,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
                Item = movie
            };

-            movie.SetProviderId(MetadataProvider.Tmdb, tmdbId);
+            movie.SetProviderId(MetadataProvider.Tmdb, tmdbId.ToString(CultureInfo.InvariantCulture));
            movie.TrySetProviderId(MetadataProvider.Imdb, movieResult.ImdbId);
            if (movieResult.BelongsToCollection is not null)
            {
@@ -1,5 +1,4 @@
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Net.Http;
 using System.Threading;
@@ -54,14 +53,14 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.People
        {
            var person = (Person)item;

-            if (!person.TryGetProviderId(MetadataProvider.Tmdb, out var personTmdbId))
+            if (!person.TryGetTmdbId(out var personTmdbId))
            {
                return Enumerable.Empty<RemoteImageInfo>();
            }

            var language = item.GetPreferredMetadataLanguage();
            var countryCode = item.GetPreferredMetadataCountryCode();
-            var personResult = await _tmdbClientManager.GetPersonAsync(int.Parse(personTmdbId, CultureInfo.InvariantCulture), language, countryCode, cancellationToken).ConfigureAwait(false);
+            var personResult = await _tmdbClientManager.GetPersonAsync(personTmdbId, language, countryCode, cancellationToken).ConfigureAwait(false);
            if (personResult?.Images?.Profiles is null)
            {
                return Enumerable.Empty<RemoteImageInfo>();
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Net.Http;
@@ -37,9 +36,9 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.People
        /// <inheritdoc />
        public async Task<IEnumerable<RemoteSearchResult>> GetSearchResults(PersonLookupInfo searchInfo, CancellationToken cancellationToken)
        {
-            if (searchInfo.TryGetProviderId(MetadataProvider.Tmdb, out var personTmdbId))
+            if (searchInfo.TryGetTmdbId(out var personTmdbId))
            {
-                var personResult = await _tmdbClientManager.GetPersonAsync(int.Parse(personTmdbId, CultureInfo.InvariantCulture), searchInfo.MetadataLanguage, searchInfo.MetadataCountryCode, cancellationToken).ConfigureAwait(false);
+                var personResult = await _tmdbClientManager.GetPersonAsync(personTmdbId, searchInfo.MetadataLanguage, searchInfo.MetadataCountryCode, cancellationToken).ConfigureAwait(false);

                if (personResult is not null)
                {
@@ -89,7 +88,9 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.People
        /// <inheritdoc />
        public async Task<MetadataResult<Person>> GetMetadata(PersonLookupInfo info, CancellationToken cancellationToken)
        {
-            var personTmdbId = Convert.ToInt32(info.GetProviderId(MetadataProvider.Tmdb), CultureInfo.InvariantCulture);
+            // A person can carry another provider's id under the TMDb key, which is no more usable here
+            // than no id at all, so both take the search path and get the stored id repaired.
+            info.TryGetTmdbId(out var personTmdbId);

            // We don't already have an Id, need to fetch it
            if (personTmdbId <= 0)
@@ -101,7 +102,10 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.People
                }
            }

-            var result = new MetadataResult<Person>();
+            var result = new MetadataResult<Person>
+            {
+                ResultLanguage = info.MetadataLanguage
+            };

            if (personTmdbId > 0)
            {
@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Net.Http;
 using System.Threading;
@@ -56,9 +54,9 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
            var episode = (Controller.Entities.TV.Episode)item;
            var series = episode.Series;

-            var seriesTmdbId = Convert.ToInt32(series?.GetProviderId(MetadataProvider.Tmdb), CultureInfo.InvariantCulture);
+            var seriesTmdbId = 0;

-            if (series is null || seriesTmdbId <= 0)
+            if (series?.TryGetTmdbId(out seriesTmdbId) != true)
            {
                return Enumerable.Empty<RemoteImageInfo>();
            }
@@ -91,8 +91,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV

            info.SeriesProviderIds.TryGetValue(MetadataProvider.Tmdb.ToString(), out string? tmdbId);

-            var seriesTmdbId = Convert.ToInt32(tmdbId, CultureInfo.InvariantCulture);
-            if (seriesTmdbId <= 0)
+            if (!TmdbUtils.TryParseTmdbId(tmdbId, out var seriesTmdbId))
            {
                return metadataResult;
            }
@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Net.Http;
 using System.Threading;
@@ -57,9 +55,9 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
            var season = (Season)item;
            var series = season?.Series;

-            var seriesTmdbId = Convert.ToInt32(series?.GetProviderId(MetadataProvider.Tmdb), CultureInfo.InvariantCulture);
+            var seriesTmdbId = 0;

-            if (seriesTmdbId <= 0 || season?.IndexNumber is null)
+            if (season?.IndexNumber is null || series?.TryGetTmdbId(out seriesTmdbId) != true)
            {
                return Enumerable.Empty<RemoteImageInfo>();
            }
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -41,20 +40,23 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
        /// <inheritdoc />
        public async Task<MetadataResult<Season>> GetMetadata(SeasonInfo info, CancellationToken cancellationToken)
        {
-            var result = new MetadataResult<Season>();
+            var result = new MetadataResult<Season>
+            {
+                ResultLanguage = info.MetadataLanguage
+            };
            var config = Plugin.Instance.Configuration;

            info.SeriesProviderIds.TryGetValue(MetadataProvider.Tmdb.ToString(), out string? seriesTmdbId);

            var seasonNumber = info.IndexNumber;

-            if (string.IsNullOrWhiteSpace(seriesTmdbId) || !seasonNumber.HasValue)
+            if (!seasonNumber.HasValue || !TmdbUtils.TryParseTmdbId(seriesTmdbId, out var seriesId))
            {
                return result;
            }

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

            if (seasonResult is null)
@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Net.Http;
 using System.Threading;
@@ -57,9 +55,7 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.TV
        /// <inheritdoc />
        public async Task<IEnumerable<RemoteImageInfo>> GetImages(BaseItem item, CancellationToken cancellationToken)
        {
-            var tmdbId = item.GetProviderId(MetadataProvider.Tmdb);
-
-            if (string.IsNullOrEmpty(tmdbId))
+            if (!item.TryGetTmdbId(out var tmdbId))
            {
                return Enumerable.Empty<RemoteImageInfo>();
            }
@@ -68,7 +64,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, null, cancellationToken)
+                .GetSeriesAsync(tmdbId, null, null, null, cancellationToken)
                .ConfigureAwait(false);

            if (series?.Images is null)
--- a/Show More
+++ b/Show More