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
307 changed files with 24771 additions and 2402 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@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
+      uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
      with:
        languages: ${{ matrix.language }}
        queries: +security-extended

    - name: Autobuild
-      uses: github/codeql-action/autobuild@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
+      uses: github/codeql-action/autobuild@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7

    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
+      uses: github/codeql-action/analyze@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd # v4.37.7
@@ -35,7 +35,7 @@ jobs:
          --verbosity minimal

      - name: Merge code coverage results
-        uses: danielpalme/ReportGenerator-GitHub-Action@049f7ec958c672fd31d5cc1cb01622dc8d2e23ab # v5.5.10
+        uses: danielpalme/ReportGenerator-GitHub-Action@d3ebf1f760f7d8ab92cc44d9bcfee7ad73722a31 # v5.5.11
        with:
          reports: "**/coverage.cobertura.xml"
          targetdir: "merged/"
@@ -16,7 +16,7 @@ jobs:
    runs-on: ubuntu-latest
    if: ${{ contains(github.repository, 'jellyfin/') }}
    steps:
-      - uses: actions/stale@1e223db275d687790206a7acac4d1a11bd6fe629 # v10.4.0
+      - uses: actions/stale@4391f3da665fdf50b6810c1a66712fb9ba21aa93 # v11.0.0
        with:
          repo-token: ${{ secrets.JF_BOT_TOKEN }}
          ascending: true
@@ -15,7 +15,7 @@ jobs:
    runs-on: ubuntu-latest
    if: ${{ contains(github.repository, 'jellyfin/') }}
    steps:
-      - uses: actions/stale@1e223db275d687790206a7acac4d1a11bd6fe629 # v10.4.0
+      - uses: actions/stale@4391f3da665fdf50b6810c1a66712fb9ba21aa93 # v11.0.0
        with:
          repo-token: ${{ secrets.JF_BOT_TOKEN }}
          ascending: true
@@ -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)
@@ -172,6 +173,7 @@
 - [whooo](https://github.com/whooo)
 - [WiiPlayer2](https://github.com/WiiPlayer2)
 - [WillWill56](https://github.com/WillWill56)
+ - [WizardOfYendor1](https://github.com/WizardOfYendor1)
 - [wtayl0r](https://github.com/wtayl0r)
 - [Wuerfelbecher](https://github.com/Wuerfelbecher)
 - [Wunax](https://github.com/Wunax)
@@ -233,6 +235,11 @@
 - [MSalman5230](https://github.com/MSalman5230)
 - [dwandw](https://github.com/dwandw)
 - [Lampan-git](https://github.com/Lampan-git)
+ - [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

@@ -243,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)
@@ -17,7 +17,7 @@
    <PackageVersion Include="Diacritics" Version="4.1.8" />
    <PackageVersion Include="DiscUtils.Udf" Version="0.16.13" />
    <PackageVersion Include="DotNet.Glob" Version="3.1.3" />
-    <PackageVersion Include="FsCheck.Xunit.v3" Version="3.3.3" />
+    <PackageVersion Include="FsCheck.Xunit.v3" Version="3.3.4" />
    <PackageVersion Include="HarfBuzzSharp.NativeAssets.Linux" Version="8.3.1.5" />
    <PackageVersion Include="ICU4N.Transliterator" Version="60.1.0-alpha.356" />
    <PackageVersion Include="IDisposableAnalyzers" Version="4.0.8" />
@@ -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" />
@@ -68,7 +68,7 @@
    <PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
    <PackageVersion Include="Serilog.Sinks.Graylog" Version="3.1.1" />
    <PackageVersion Include="SerilogAnalyzer" Version="0.15.0" />
-    <PackageVersion Include="SharpCompress" Version="0.50.0" />
+    <PackageVersion Include="SharpCompress" Version="0.50.4" />
    <PackageVersion Include="SharpFuzz" Version="2.3.0" />
    <PackageVersion Include="SkiaSharp" Version="3.119.4" />
    <PackageVersion Include="SkiaSharp.HarfBuzz" Version="3.119.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" />
@@ -57,7 +57,6 @@ namespace Emby.Naming.Common
                ".nrg",
                ".nsv",
                ".nuv",
-                ".ogg",
                ".ogm",
                ".ogv",
                ".pva",
@@ -152,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>.+)",
@@ -362,7 +361,10 @@ namespace Emby.Naming.Common
                // Not a Kodi rule as well, but the expression below also causes false positives,
                // so we make sure this one gets tested first.
                // "Foo Bar 889"
-                new EpisodeExpression(@".*[\\\/](?![Ee]pisode)(?<seriesname>[\w\s]+?)\s(?<epnumber>[0-9]{1,4})(-(?<endingepnumber>[0-9]{2,4}))*[^\\\/x]*$")
+                // Names carrying an SxxEyy marker are excluded because the Kodi expression above already covers them.
+                // Without that guard this expression reads digits out of the title instead, turning
+                // "S01E01 1-23-45 [Bluray-1080p]" into episodes 1 through 45.
+                new EpisodeExpression(@".*[\\\/](?![Ee]pisode)(?![^\\\/]*[Ss][0-9]+[][ ._-]*[Ee][0-9]+)(?<seriesname>[\w\s]+?)\s(?<epnumber>[0-9]{1,4})(-(?<endingepnumber>[0-9]{2,4}))*[^\\\/x]*$")
                {
                    IsNamed = true
                },
@@ -52,13 +52,18 @@ namespace Emby.Naming.Video
            while (path.Length > 0)
            {
                var index = path.IndexOfAny(delimiters);
+                ReadOnlySpan<char> currentSlice;
                if (index == -1)
                {
-                    index = path.Length - 1;
+                    // No delimiter left, the last token is the remainder of the path
+                    currentSlice = path;
+                    path = default;
+                }
+                else
+                {
+                    currentSlice = path[..index];
+                    path = path[(index + 1)..];
                }
-
-                var currentSlice = path[..index];
-                path = path[(index + 1)..];

                if (!foundPrefix)
                {
@@ -987,8 +987,9 @@ namespace Emby.Server.Implementations
        /// <inheritdoc/>
        public string GetLocalApiUrl(string hostname, string scheme = null, int? port = null)
        {
-            // If the smartAPI doesn't start with http then treat it as a host or ip.
-            if (hostname.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+            // If the smartAPI isn't already a complete URL then treat it as a host or ip.
+            if (hostname.StartsWith("http://", StringComparison.OrdinalIgnoreCase)
+                || hostname.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
            {
                return hostname.TrimEnd('/');
            }
@@ -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);

@@ -242,6 +242,29 @@ namespace Emby.Server.Implementations.Dto
                artistsBatch = _libraryManager.GetArtists(artistNames.ToArray());
            }

+            // Batch-fetch people across all items to avoid one GetPeople query per item.
+            IReadOnlyDictionary<Guid, IReadOnlyList<PersonInfo>>? peopleBatch = null;
+            if (options.ContainsField(ItemFields.People))
+            {
+                var peopleItemIds = accessibleItems.Where(i => i.SupportsPeople).Select(i => i.Id).ToList();
+                if (peopleItemIds.Count > 0)
+                {
+                    peopleBatch = _libraryManager.GetPeopleByItems(peopleItemIds);
+                }
+            }
+
+            // Batch-detect which videos own alternate versions to avoid the per-item alternate-version
+            // queries in MediaSourceCount. Videos absent from this set have a single media source.
+            IReadOnlySet<Guid>? alternateVersionItemIds = null;
+            if (options.ContainsField(ItemFields.MediaSourceCount))
+            {
+                var versionItemIds = accessibleItems.OfType<Video>().Select(i => i.Id).ToList();
+                if (versionItemIds.Count > 0)
+                {
+                    alternateVersionItemIds = _libraryManager.GetItemIdsWithAlternateVersions(versionItemIds);
+                }
+            }
+
            for (int index = 0; index < accessibleItems.Count; index++)
            {
                var item = accessibleItems[index];
@@ -255,7 +278,9 @@ namespace Emby.Server.Implementations.Dto
                    childCountBatch,
                    playedCountBatch,
                    artistsBatch,
-                    resumeDataBatch?.GetValueOrDefault(item.Id));
+                    resumeDataBatch?.GetValueOrDefault(item.Id),
+                    peopleBatch,
+                    alternateVersionItemIds);

                if (item is LiveTvChannel tvChannel)
                {
@@ -317,7 +342,9 @@ namespace Emby.Server.Implementations.Dto
            Dictionary<Guid, int>? childCountBatch = null,
            Dictionary<Guid, (int Played, int Total)>? playedCountBatch = null,
            IReadOnlyDictionary<string, MusicArtist[]>? artistsBatch = null,
-            VersionResumeData? resumeData = null)
+            VersionResumeData? resumeData = null,
+            IReadOnlyDictionary<Guid, IReadOnlyList<PersonInfo>>? peopleBatch = null,
+            IReadOnlySet<Guid>? alternateVersionItemIds = null)
        {
            var dto = new BaseItemDto
            {
@@ -331,7 +358,15 @@ namespace Emby.Server.Implementations.Dto

            if (options.ContainsField(ItemFields.People))
            {
-                AttachPeople(dto, item, user);
+                IReadOnlyList<PersonInfo>? prefetchedPeople = null;
+                if (peopleBatch is not null)
+                {
+                    // The batch omits items with no people, so a miss means "no people",
+                    // not "not fetched". Use an empty list to skip the per-item query.
+                    prefetchedPeople = peopleBatch.GetValueOrDefault(item.Id) ?? [];
+                }
+
+                AttachPeople(dto, item, user, prefetchedPeople);
            }

            if (options.ContainsField(ItemFields.PrimaryImageAspectRatio))
@@ -378,7 +413,7 @@ namespace Emby.Server.Implementations.Dto
                AttachStudios(dto, item);
            }

-            AttachBasicFields(dto, item, owner, options, artistsBatch, user);
+            AttachBasicFields(dto, item, owner, options, artistsBatch, user, alternateVersionItemIds);

            if (options.ContainsField(ItemFields.CanDelete))
            {
@@ -742,12 +777,18 @@ namespace Emby.Server.Implementations.Dto
        /// <param name="dto">The dto.</param>
        /// <param name="item">The item.</param>
        /// <param name="user">The requesting user.</param>
-        private void AttachPeople(BaseItemDto dto, BaseItem item, User? user = null)
+        /// <param name="prefetchedPeople">People fetched in batch by the caller; when null the people are queried per item.</param>
+        private void AttachPeople(BaseItemDto dto, BaseItem item, User? user = null, IReadOnlyList<PersonInfo>? prefetchedPeople = null)
        {
+            // When rendering a page of items the caller batch-fetches people for every item up
+            // front and passes them in, avoiding one GetPeople query per item. Fall back to the
+            // per-item query for the single item path where no batch is available.
+            var source = prefetchedPeople ?? _libraryManager.GetPeople(item);
+
            // Ordering by person type to ensure actors and artists are at the front.
            // This is taking advantage of the fact that they both begin with A
            // This should be improved in the future
-            var people = _libraryManager.GetPeople(item).OrderBy(i => i.SortOrder ?? int.MaxValue)
+            var people = source.OrderBy(i => i.SortOrder ?? int.MaxValue)
                .ThenBy(i =>
                {
                    if (i.IsType(PersonKind.Actor))
@@ -957,7 +998,8 @@ namespace Emby.Server.Implementations.Dto
        /// <param name="options">The options.</param>
        /// <param name="artistsBatch">Optional pre-fetched artist lookup shared across a batch of items.</param>
        /// <param name="user">The user, for per-user values such as the accessible media source count.</param>
-        private void AttachBasicFields(BaseItemDto dto, BaseItem item, BaseItem? owner, DtoOptions options, IReadOnlyDictionary<string, MusicArtist[]>? artistsBatch = null, User? user = null)
+        /// <param name="alternateVersionItemIds">Optional pre-fetched set of item IDs that own alternate versions, shared across a batch of items.</param>
+        private void AttachBasicFields(BaseItemDto dto, BaseItem item, BaseItem? owner, DtoOptions options, IReadOnlyDictionary<string, MusicArtist[]>? artistsBatch = null, User? user = null, IReadOnlySet<Guid>? alternateVersionItemIds = null)
        {
            if (options.ContainsField(ItemFields.DateCreated))
            {
@@ -1088,7 +1130,7 @@ namespace Emby.Server.Implementations.Dto
                dto.ParentId = item.DisplayParentId;
            }

-            AddInheritedImages(dto, item, options, owner);
+            AddInheritedImages(dto, item, options, owner, artistsBatch);

            if (options.ContainsField(ItemFields.Path))
            {
@@ -1271,15 +1313,27 @@ namespace Emby.Server.Implementations.Dto

                if (options.ContainsField(ItemFields.MediaSourceCount))
                {
-                    // Match the per-user filtering of the media sources: versions the user cannot
-                    // access are not selectable, so they must not count towards the badge either.
-                    var mediaSourceCount = user is null
-                        || (!video.PrimaryVersionId.HasValue && video.LinkedAlternateVersions.Length == 0 && !video.HasLocalAlternateVersions)
-                            ? video.MediaSourceCount
-                            : video.GetAllVersions().Count(v => v.Id.Equals(video.Id) || v.IsVisibleStandalone(user));
-                    if (mediaSourceCount != 1)
+                    // A video with no primary version and no alternate versions always has a single
+                    // media source. Only compute the count for videos that might have more: a primary
+                    // version, or membership in the batch's set of items that own alternate versions.
+                    // Without the batch we can't rule it out, so fall back to computing (the single-item
+                    // path). Everything else is the common case and keeps the default count of one.
+                    var mayHaveAlternateVersions = alternateVersionItemIds is null
+                        || video.PrimaryVersionId.HasValue
+                        || alternateVersionItemIds.Contains(video.Id);
+
+                    if (mayHaveAlternateVersions)
                    {
-                        dto.MediaSourceCount = mediaSourceCount;
+                        // Match the per-user filtering of the media sources: versions the user cannot
+                        // access are not selectable, so they must not count towards the badge either.
+                        var mediaSourceCount = user is null
+                            || (!video.PrimaryVersionId.HasValue && video.LinkedAlternateVersions.Length == 0 && !video.HasLocalAlternateVersions)
+                                ? video.MediaSourceCount
+                                : video.GetAllVersions().Count(v => v.Id.Equals(video.Id) || v.IsVisibleStandalone(user));
+                        if (mediaSourceCount != 1)
+                        {
+                            dto.MediaSourceCount = mediaSourceCount;
+                        }
                    }
                }

@@ -1519,11 +1573,11 @@ namespace Emby.Server.Implementations.Dto
            }
        }

-        private BaseItem? GetImageDisplayParent(BaseItem currentItem, BaseItem originalItem)
+        private BaseItem? GetImageDisplayParent(BaseItem currentItem, BaseItem originalItem, IReadOnlyDictionary<string, MusicArtist[]>? artistsBatch)
        {
            if (currentItem is MusicAlbum musicAlbum)
            {
-                var artist = musicAlbum.GetMusicArtist(new DtoOptions(false));
+                var artist = GetBatchedAlbumArtist(musicAlbum, artistsBatch) ?? musicAlbum.GetMusicArtist(new DtoOptions(false));
                if (artist is not null)
                {
                    return artist;
@@ -1540,7 +1594,20 @@ namespace Emby.Server.Implementations.Dto
            return parent;
        }

-        private void AddInheritedImages(BaseItemDto dto, BaseItem item, DtoOptions options, BaseItem? owner)
+        private static MusicArtist? GetBatchedAlbumArtist(MusicAlbum album, IReadOnlyDictionary<string, MusicArtist[]>? artistsBatch)
+        {
+            if (artistsBatch is null)
+            {
+                return null;
+            }
+
+            var name = album.AlbumArtists.Count > 0 ? album.AlbumArtists[0] : null;
+            return !string.IsNullOrEmpty(name) && artistsBatch.TryGetValue(name, out var artists) && artists.Length > 0
+                ? artists[0]
+                : null;
+        }
+
+        private void AddInheritedImages(BaseItemDto dto, BaseItem item, DtoOptions options, BaseItem? owner, IReadOnlyDictionary<string, MusicArtist[]>? artistsBatch)
        {
            if (item is UserView { ViewType: CollectionType.playlists } playlistsView
                && options.GetImageLimit(ImageType.Primary) > 0
@@ -1585,7 +1652,7 @@ namespace Emby.Server.Implementations.Dto
                || (!(imageTags is not null && imageTags.ContainsKey(ImageType.Thumb)) && thumbLimit > 0)
                || parent is Series)
            {
-                parent ??= isFirst ? GetImageDisplayParent(item, item) ?? owner : parent;
+                parent ??= isFirst ? GetImageDisplayParent(item, item, artistsBatch) ?? owner : parent;
                if (parent is null)
                {
                    break;
@@ -1644,7 +1711,7 @@ namespace Emby.Server.Implementations.Dto
                    break;
                }

-                parent = GetImageDisplayParent(parent, item);
+                parent = GetImageDisplayParent(parent, item, artistsBatch);
            }
        }

@@ -45,6 +45,7 @@ using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Globalization;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Library;
 using MediaBrowser.Model.Querying;
@@ -86,6 +87,7 @@ namespace Emby.Server.Implementations.Library
        private readonly IPeopleRepository _peopleRepository;
        private readonly ExtraResolver _extraResolver;
        private readonly IPathManager _pathManager;
+        private readonly ILocalizationManager _localization;
        private readonly FastConcurrentLru<Guid, BaseItem> _cache;
        private readonly DotIgnoreIgnoreRule _dotIgnoreIgnoreRule;
        private readonly IMediaStreamRepository _mediaStreamRepository;
@@ -132,6 +134,7 @@ namespace Emby.Server.Implementations.Library
        /// <param name="peopleRepository">The people repository.</param>
        /// <param name="pathManager">The path manager.</param>
        /// <param name="dotIgnoreIgnoreRule">The .ignore rule handler.</param>
+        /// <param name="localization">The localization manager.</param>
        /// <param name="mediaStreamRepository">The media stream repository.</param>
        /// <param name="externalDataManagerFactory">The external data manager (lazy, to break the DI cycle through ChapterManager).</param>
        public LibraryManager(
@@ -157,6 +160,7 @@ namespace Emby.Server.Implementations.Library
            IPeopleRepository peopleRepository,
            IPathManager pathManager,
            DotIgnoreIgnoreRule dotIgnoreIgnoreRule,
+            ILocalizationManager localization,
            IMediaStreamRepository mediaStreamRepository,
            Lazy<IExternalDataManager> externalDataManagerFactory)
        {
@@ -184,6 +188,7 @@ namespace Emby.Server.Implementations.Library
            _peopleRepository = peopleRepository;
            _pathManager = pathManager;
            _dotIgnoreIgnoreRule = dotIgnoreIgnoreRule;
+            _localization = localization;
            _extraResolver = new ExtraResolver(loggerFactory.CreateLogger<ExtraResolver>(), namingOptions, directoryService);

            _configurationManager.ConfigurationUpdated += ConfigurationUpdated;
@@ -407,6 +412,13 @@ namespace Emby.Server.Implementations.Library
            }

            _persistenceService.DeleteItem([.. pathMaps.Select(f => f.Item.Id)]);
+
+            // Evict the deleted items from the cache and announce each removal.
+            foreach (var (item, _, _) in pathMaps)
+            {
+                _cache.TryRemove(item.Id, out _);
+                ReportItemRemoved(item, item.GetOwner() ?? item.GetParent());
+            }
        }

        public void DeleteItem(BaseItem item, DeleteOptions options, BaseItem parent, bool notifyParentItem)
@@ -606,6 +618,12 @@ namespace Emby.Server.Implementations.Library
                folder.UserData = null;
            }

+            // Announce the descendants before the item itself.
+            foreach (var child in children)
+            {
+                ReportItemRemoved(child, item);
+            }
+
            ReportItemRemoved(item, parent);
        }

@@ -1896,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)
@@ -1949,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
@@ -1978,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)
@@ -2229,6 +2255,12 @@ namespace Emby.Server.Implementations.Library
            return [];
        }

+        /// <inheritdoc />
+        public IReadOnlySet<Guid> GetItemIdsWithAlternateVersions(IReadOnlyList<Guid> itemIds)
+        {
+            return _linkedChildrenService.GetItemIdsWithAlternateVersions(itemIds);
+        }
+
        /// <inheritdoc />
        public void UpsertLinkedChild(Guid parentId, Guid childId, MediaBrowser.Controller.Entities.LinkedChildType childType)
        {
@@ -2315,9 +2347,13 @@ namespace Emby.Server.Implementations.Library
        {
            var comparer = Comparers.FirstOrDefault(c => name == c.Type);

-            // If it requires a user, create a new one, and assign the user
            if (comparer is IUserBaseItemComparer)
            {
+                if (user is null)
+                {
+                    throw new ArgumentException($"Sort key '{name}' requires a user, but none was provided.");
+                }
+
                var userComparer = (IUserBaseItemComparer)Activator.CreateInstance(comparer.GetType())!; // only null for Nullable<T> instances

                userComparer.User = user;
@@ -2367,6 +2403,7 @@ namespace Emby.Server.Implementations.Library
                            {
                                altVideo.OwnerId = video.Id;
                                altVideo.SetPrimaryVersionId(video.Id);
+                                altVideo.IsInMixedFolder = video.IsInMixedFolder;
                                // ResolveAlternateVersion only sees the alternate's primary file.
                                // If the alternate is itself a stack (e.g. 1080p part1 + part2),
                                // detect its parts from sibling files so its AdditionalParts persist.
@@ -2490,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;
                }

@@ -2552,6 +2595,8 @@ namespace Emby.Server.Implementations.Library
                item.DateLastSaved = DateTime.UtcNow;
            }

+            ForgetDroppedLocalAlternateVersions(items);
+
            // Resolve and add any local alternate version items that don't exist yet
            // This ensures they exist in the database when LinkedChildren are processed
            var allItems = new List<BaseItem>(items);
@@ -2580,6 +2625,7 @@ namespace Emby.Server.Implementations.Library
                            {
                                altVideo.OwnerId = video.Id;
                                altVideo.SetPrimaryVersionId(video.Id);
+                                altVideo.IsInMixedFolder = video.IsInMixedFolder;
                                // ResolveAlternateVersion only sees the alternate's primary file.
                                // If the alternate is itself a stack (e.g. 1080p part1 + part2),
                                // detect its parts from sibling files so its AdditionalParts persist.
@@ -2640,6 +2686,30 @@ namespace Emby.Server.Implementations.Library
        public Task UpdateItemAsync(BaseItem item, BaseItem parent, ItemUpdateType updateReason, CancellationToken cancellationToken)
            => UpdateItemsAsync([item], parent, updateReason, cancellationToken);

+        /// <summary>
+        /// Forgets the cached local alternate versions of the supplied items that they no longer list.
+        /// </summary>
+        /// <param name="items">The items about to be saved.</param>
+        private void ForgetDroppedLocalAlternateVersions(IReadOnlyList<BaseItem> items)
+        {
+            foreach (var video in items.OfType<Video>())
+            {
+                var videoType = video.GetType();
+                var keptIds = video.LocalAlternateVersions
+                    .Where(path => !string.IsNullOrEmpty(path))
+                    .Select(path => GetNewItemId(path, videoType))
+                    .ToHashSet();
+
+                foreach (var versionId in GetLocalAlternateVersionIds(video))
+                {
+                    if (!keptIds.Contains(versionId))
+                    {
+                        _cache.TryRemove(versionId, out _);
+                    }
+                }
+            }
+        }
+
        /// <inheritdoc />
        public async Task ReattachUserDataAsync(BaseItem item, CancellationToken cancellationToken)
        {
@@ -2863,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;

@@ -2887,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)
            {
@@ -2907,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));

@@ -2937,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;
@@ -3038,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;
@@ -3072,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();
            }

@@ -3195,11 +3281,11 @@ namespace Emby.Server.Implementations.Library
                    }
                }

-                if (!episode.ProductionYear.HasValue)
+                if (episode.ProductionYear is null)
                {
                    episode.ProductionYear = episodeInfo.Year;

-                    if (episode.ProductionYear.HasValue)
+                    if (episode.ProductionYear is not null)
                    {
                        changed = true;
                    }
@@ -3276,9 +3362,11 @@ namespace Emby.Server.Implementations.Library
            var ownerVideoInfo = VideoResolver.Resolve(owner.Path, isFolder, _namingOptions, libraryRoot: owner.ContainingFolderPath);
            if (ownerVideoInfo is null)
            {
-                yield break;
+                return [];
            }

+            var candidates = new List<ExtraCandidate>();
+
            var count = filtered.Count;
            for (var i = 0; i < count; i++)
            {
@@ -3292,35 +3380,50 @@ namespace Emby.Server.Implementations.Library

                    foreach (var file in filesInSubFolderList)
                    {
-                        if (!_extraResolver.TryGetExtraTypeForOwner(file.FullName, ownerVideoInfo, out var extraType))
+                        if (!_extraResolver.TryGetExtraTypeForOwner(file.FullName, ownerVideoInfo, out var extraType, out var extraRule))
                        {
                            continue;
                        }

-                        var extra = GetExtra(file, extraType.Value, subFolderIsMixedFolder);
-                        if (extra is not null)
-                        {
-                            yield return extra;
-                        }
+                        AddCandidate(file, extraType.Value, extraRule, subFolderIsMixedFolder);
                    }
                }
-                else if (!current.IsDirectory && _extraResolver.TryGetExtraTypeForOwner(current.FullName, ownerVideoInfo, out var extraType))
+                else if (!current.IsDirectory && _extraResolver.TryGetExtraTypeForOwner(current.FullName, ownerVideoInfo, out var extraType, out var extraRule))
                {
-                    var extra = GetExtra(current, extraType.Value, false);
-                    if (extra is not null)
-                    {
-                        yield return extra;
-                    }
+                    AddCandidate(current, extraType.Value, extraRule, false);
                }
            }

-            BaseItem? GetExtra(FileSystemMetadata file, ExtraType extraType, bool isInMixedFolder)
+            var extras = new List<BaseItem>();
+            var typeCounters = new Dictionary<ExtraType, int>();
+
+            // Order by path so that the numbering handed out below does not depend on the
+            // order the file system happened to list the folder in
+            foreach (var candidate in candidates.OrderBy(c => c.Extra.Path, StringComparer.Ordinal))
+            {
+                var extra = PrepareExtra(candidate);
+                if (extra is not null)
+                {
+                    extras.Add(extra);
+                }
+            }
+
+            return extras;
+
+            void AddCandidate(FileSystemMetadata file, ExtraType extraType, ExtraRule extraRule, bool isInMixedFolder)
            {
                var extra = ResolvePath(_fileSystem.GetFileInfo(file.FullName), directoryService, _extraResolver.GetResolversForExtraType(extraType));
-                if (extra is not Video && extra is not Audio)
+                if (extra is Video or Audio)
                {
-                    return null;
+                    candidates.Add(new ExtraCandidate(extra, extraType, extraRule, isInMixedFolder));
                }
+            }
+
+            BaseItem? PrepareExtra(ExtraCandidate candidate)
+            {
+                var resolved = candidate.Extra;
+                var extra = resolved;
+                var name = GetExtraName(candidate, ownerVideoInfo, typeCounters);

                // Try to retrieve it from the db. If we don't find it, use the resolved version
                var itemById = GetItemById(extra.Id);
@@ -3329,10 +3432,18 @@ namespace Emby.Server.Implementations.Library
                    extra = itemById;
                }

-                // Only update extra type if it is more specific then the currently known extra type
-                if (extra.ExtraType is null or ExtraType.Unknown || extraType != ExtraType.Unknown)
+                // An extra is named after its file, so the file is the source of truth. Items created
+                // by older versions, or renamed by a metadata provider, are corrected here;
+                // RefreshExtras persists the change.
+                if (!string.IsNullOrEmpty(name) && extra.LockedFields?.Contains(MetadataField.Name) != true)
                {
-                    extra.ExtraType = extraType;
+                    extra.Name = name;
+                }
+
+                // Only update extra type if it is more specific then the currently known extra type
+                if (extra.ExtraType is null or ExtraType.Unknown || candidate.ExtraType != ExtraType.Unknown)
+                {
+                    extra.ExtraType = candidate.ExtraType;
                }

                // Only return items that are actual extras (have ExtraType set)
@@ -3340,7 +3451,7 @@ namespace Emby.Server.Implementations.Library
                // so that RefreshExtras can detect when they need updating and set ForceSave.
                if (extra.ExtraType is not null)
                {
-                    extra.IsInMixedFolder = isInMixedFolder;
+                    extra.IsInMixedFolder = candidate.IsInMixedFolder;
                    return extra;
                }

@@ -3348,6 +3459,57 @@ namespace Emby.Server.Implementations.Library
            }
        }

+        /// <summary>
+        /// Gets the name to give an extra.
+        /// </summary>
+        /// <param name="candidate">The resolved extra.</param>
+        /// <param name="ownerVideoInfo">The naming info of the owner.</param>
+        /// <param name="typeCounters">Number of extras named after their type so far, per type.</param>
+        /// <returns>The name.</returns>
+        private string GetExtraName(ExtraCandidate candidate, VideoFileInfo ownerVideoInfo, Dictionary<ExtraType, int> typeCounters)
+        {
+            var isNamedAfterOwner = candidate.ExtraRule.RuleType switch
+            {
+                ExtraRuleType.Filename => true,
+                ExtraRuleType.Suffix => string.Equals(candidate.Extra.Name, ownerVideoInfo.Name, StringComparison.OrdinalIgnoreCase),
+                _ => false
+            };
+
+            if (!isNamedAfterOwner)
+            {
+                return candidate.Extra.Name;
+            }
+
+            typeCounters.TryGetValue(candidate.ExtraType, out var seen);
+            typeCounters[candidate.ExtraType] = seen + 1;
+
+            var typeName = _localization.GetServerLocalizedString(GetExtraTypeNameKey(candidate.ExtraType));
+
+            return seen == 0
+                ? typeName
+                : string.Format(
+                    CultureInfo.InvariantCulture,
+                    _localization.GetServerLocalizedString("NameExtraNumbered"),
+                    typeName,
+                    seen + 1);
+        }
+
+        private static string GetExtraTypeNameKey(ExtraType extraType) => extraType switch
+        {
+            ExtraType.Clip => "NameExtraClip",
+            ExtraType.Trailer => "NameExtraTrailer",
+            ExtraType.BehindTheScenes => "NameExtraBehindTheScenes",
+            ExtraType.DeletedScene => "NameExtraDeletedScene",
+            ExtraType.Interview => "NameExtraInterview",
+            ExtraType.Scene => "NameExtraScene",
+            ExtraType.Sample => "NameExtraSample",
+            ExtraType.ThemeSong => "NameExtraThemeSong",
+            ExtraType.ThemeVideo => "NameExtraThemeVideo",
+            ExtraType.Featurette => "NameExtraFeaturette",
+            ExtraType.Short => "NameExtraShort",
+            _ => "NameExtraUnknown"
+        };
+
        public string GetPathAfterNetworkSubstitution(string path, BaseItem? ownerItem)
        {
            foreach (var map in _configurationManager.Configuration.PathSubstitutions)
@@ -3418,12 +3580,24 @@ 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)
        {
            return _peopleRepository.GetPeopleNamesByItems(itemIds, personTypes);
        }

+        /// <inheritdoc/>
+        public IReadOnlyDictionary<Guid, IReadOnlyList<PersonInfo>> GetPeopleByItems(IReadOnlyList<Guid> itemIds)
+        {
+            return _peopleRepository.GetPeopleByItems(itemIds);
+        }
+
        public void UpdatePeople(BaseItem item, List<PersonInfo> people)
        {
            UpdatePeopleAsync(item, people, CancellationToken.None).GetAwaiter().GetResult();
@@ -3457,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)
                {
@@ -3479,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)
@@ -3898,5 +4091,7 @@ namespace Emby.Server.Implementations.Library
            SetTopParentOrAncestorIds(query);
            return _itemRepository.GetMediaStreamLanguages(query, mediaStreamType);
        }
+
+        private sealed record ExtraCandidate(BaseItem Extra, ExtraType ExtraType, ExtraRule ExtraRule, bool IsInMixedFolder);
    }
 }
@@ -32,8 +32,8 @@ namespace Emby.Server.Implementations.Library.Resolvers
            : base(logger, namingOptions, directoryService)
        {
            _namingOptions = namingOptions;
-            _trailerResolvers = new IItemResolver[] { new GenericVideoResolver<Trailer>(logger, namingOptions, directoryService) };
-            _videoResolvers = new IItemResolver[] { this };
+            _trailerResolvers = [new GenericVideoResolver<Trailer>(logger, namingOptions, directoryService, parseName: true)];
+            _videoResolvers = [this];
        }

        protected override Video Resolve(ItemResolveArgs args)
@@ -54,12 +54,13 @@ namespace Emby.Server.Implementations.Library.Resolvers
            _ => _videoResolvers
        };

-        public bool TryGetExtraTypeForOwner(string path, VideoFileInfo ownerVideoFileInfo, [NotNullWhen(true)] out ExtraType? extraType, string? libraryRoot = "")
+        public bool TryGetExtraTypeForOwner(string path, VideoFileInfo ownerVideoFileInfo, [NotNullWhen(true)] out ExtraType? extraType, [NotNullWhen(true)] out ExtraRule? extraRule, string? libraryRoot = "")
        {
            var extraResult = GetExtraInfo(path, _namingOptions, libraryRoot);
-            if (extraResult.ExtraType is null)
+            if (extraResult.ExtraType is null || extraResult.Rule is null)
            {
                extraType = null;
+                extraRule = null;
                return false;
            }

@@ -88,6 +89,7 @@ namespace Emby.Server.Implementations.Library.Resolvers
            }

            extraType = extraResult.ExtraType;
+            extraRule = extraResult.Rule;
            return isValid;
        }

@@ -2,6 +2,7 @@

 using Emby.Naming.Common;
 using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Providers;
 using Microsoft.Extensions.Logging;

@@ -14,15 +15,25 @@ namespace Emby.Server.Implementations.Library.Resolvers
    public class GenericVideoResolver<T> : BaseVideoResolver<T>
        where T : Video, new()
    {
+        private readonly bool _parseName;
+
        /// <summary>
        /// Initializes a new instance of the <see cref="GenericVideoResolver{T}"/> class.
        /// </summary>
        /// <param name="logger">The logger.</param>
        /// <param name="namingOptions">The naming options.</param>
        /// <param name="directoryService">The directory service.</param>
-        public GenericVideoResolver(ILogger logger, NamingOptions namingOptions, IDirectoryService directoryService)
+        /// <param name="parseName">Whether to parse the file name for metadata such as the year.</param>
+        public GenericVideoResolver(ILogger logger, NamingOptions namingOptions, IDirectoryService directoryService, bool parseName = false)
            : base(logger, namingOptions, directoryService)
        {
+            _parseName = parseName;
+        }
+
+        /// <inheritdoc />
+        protected override T Resolve(ItemResolveArgs args)
+        {
+            return ResolveVideo<T>(args, _parseName);
        }
    }
 }
@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using Emby.Server.Implementations.Playlists;
 using Jellyfin.Data.Enums;
 using Jellyfin.Extensions;
 using MediaBrowser.Controller.Library;
@@ -46,6 +47,19 @@ namespace Emby.Server.Implementations.Library.Resolvers
                    };
                }

+                // Anything directly inside the internal playlists folder is a playlist, even when its
+                // playlist.xml is missing: failing to resolve here makes the library scan treat the
+                // playlist as deleted from disk and remove it, taking its items with it.
+                if (args.Parent is PlaylistsFolder)
+                {
+                    return new Playlist
+                    {
+                        Path = args.Path,
+                        Name = filename,
+                        OpenAccess = true
+                    };
+                }
+
                // It's a directory-based playlist if the directory contains a playlist file
                IEnumerable<string> filePaths;
                try
@@ -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);
                }
@@ -92,49 +92,46 @@ public class SearchManager : ISearchManager
        await Task.WhenAll(externalTask, internalTask).ConfigureAwait(false);

        var externalResults = await externalTask.ConfigureAwait(false);
-        var fromExternal = externalResults.Count > 0;
-        IReadOnlyList<SearchResult> results;
-        if (fromExternal)
-        {
-            results = externalResults;
-        }
-        else
-        {
-            results = await internalTask.ConfigureAwait(false);
-            if (_internalProviders.Length > 0)
-            {
-                _logger.LogDebug("No results from external providers, using internal provider results");
-            }
-        }

        // Internal providers apply user-access filtering inline in their queries. External
        // providers don't know about user permissions, so they may return IDs from hidden
-        // libraries or items the user is otherwise blocked from. Run the post-filter only
-        // when results came from externals to close that gap. The Items controller's second
-        // roundtrip via folder.GetItems applies most of these again, but it does not restrict
-        // by TopParentIds when ItemIds is set.
-        if (fromExternal && results.Count > 0 && query.UserId.HasValue && !query.UserId.Value.IsEmpty())
+        // libraries or items the user is otherwise blocked from. Filter them here to close
+        // that gap. The Items controller's second roundtrip via folder.GetItems applies most
+        // of these again, but it does not restrict by TopParentIds when ItemIds is set.
+        if (externalResults.Count > 0 && query.UserId.HasValue && !query.UserId.Value.IsEmpty())
        {
            var user = _userManager.GetUserById(query.UserId.Value);
            if (user is not null)
            {
-                results = await FilterByUserAccessAsync(results, user, cancellationToken).ConfigureAwait(false);
+                externalResults = await FilterByUserAccessAsync(externalResults, user, query, cancellationToken).ConfigureAwait(false);
            }
        }

-        return results;
+        if (externalResults.Count > 0)
+        {
+            return externalResults;
+        }
+
+        var internalResults = await internalTask.ConfigureAwait(false);
+        if (_internalProviders.Length > 0)
+        {
+            _logger.LogDebug("No results from external providers, using internal provider results");
+        }
+
+        return internalResults;
    }

    private async Task<IReadOnlyList<SearchResult>> FilterByUserAccessAsync(
        IReadOnlyList<SearchResult> candidates,
        User user,
+        SearchProviderQuery query,
        CancellationToken cancellationToken)
    {
-        // SetUser populates parental rating + blocked/allowed tags. ConfigureUserAccess populates
-        // TopParentIds for the user's accessible libraries — we call it before assigning ItemIds
-        // because LibraryManager.AddUserToQuery skips TopParentIds when ItemIds is non-empty.
-        var accessFilter = new InternalItemsQuery(user);
-        _libraryManager.ConfigureUserAccess(accessFilter, user);
+        // SetUser populates parental rating + blocked/allowed tags, Build populates TopParentIds
+        // for the user's accessible libraries. The candidate ids are applied to the query below
+        // rather than to the filter because LibraryManager.AddUserToQuery skips TopParentIds when
+        // ItemIds is non-empty.
+        var accessFilter = SearchQueryAccessFilter.Build(user, query, _libraryManager);

        Guid[] candidateIds = [.. candidates.Select(c => c.ItemId)];

@@ -0,0 +1,38 @@
+using Jellyfin.Database.Implementations.Entities;
+using Jellyfin.Extensions;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+
+namespace Emby.Server.Implementations.Library.Search;
+
+/// <summary>
+/// Builds the access filter that decides which items a search may return for a user.
+/// </summary>
+internal static class SearchQueryAccessFilter
+{
+    /// <summary>
+    /// Builds an access filter carrying the search's library access and type filters.
+    /// </summary>
+    /// <param name="user">The user the search runs for.</param>
+    /// <param name="query">The search query.</param>
+    /// <param name="libraryManager">The library manager.</param>
+    /// <returns>The access filter.</returns>
+    public static InternalItemsQuery Build(User user, SearchProviderQuery query, ILibraryManager libraryManager)
+    {
+        // The type filters have to travel with the access filter: a by-name item belongs to no
+        // library, so it carries no TopParentId to match, and the library filter only knows to
+        // exempt it when the query says those types are wanted. A search scoped to a parent gets
+        // no exemption because a by-name item has no parent to descend from either.
+        var accessFilter = new InternalItemsQuery(user)
+        {
+            IncludeItemTypes = query.IncludeItemTypes,
+            ExcludeItemTypes = query.ExcludeItemTypes,
+            IncludeItemsByName = !query.ParentId.HasValue || query.ParentId.Value.IsEmpty()
+        };
+
+        // ConfigureUserAccess populates TopParentIds for the libraries the user may open.
+        libraryManager.ConfigureUserAccess(accessFilter, user);
+
+        return accessFilter;
+    }
+}
@@ -114,7 +114,7 @@ public class SqlSearchProvider : IInternalSearchProvider
            dbQuery = ApplyTypeFilter(dbQuery, query.IncludeItemTypes, query.ExcludeItemTypes);
            dbQuery = ApplyMediaTypeFilter(dbQuery, query.MediaTypes);
            dbQuery = ApplyParentFilter(dbQuery, query.ParentId);
-            dbQuery = ApplyUserAccessFilter(dbContext, dbQuery, query.UserId);
+            dbQuery = ApplyUserAccessFilter(dbContext, dbQuery, query);

            // Compute the score in SQL: the ternary translates to a CASE WHEN. CleanName is
            // the pre-normalized (lowercase, diacritic-stripped) form, so we score against it
@@ -196,8 +196,9 @@ public class SqlSearchProvider : IInternalSearchProvider
    private IQueryable<BaseItemEntity> ApplyUserAccessFilter(
        JellyfinDbContext dbContext,
        IQueryable<BaseItemEntity> query,
-        Guid? userId)
+        SearchProviderQuery searchQuery)
    {
+        var userId = searchQuery.UserId;
        if (!userId.HasValue || userId.Value.IsEmpty())
        {
            return query;
@@ -209,8 +210,7 @@ public class SqlSearchProvider : IInternalSearchProvider
            return query;
        }

-        var accessFilter = new InternalItemsQuery(user);
-        _libraryManager.ConfigureUserAccess(accessFilter, user);
+        var accessFilter = SearchQueryAccessFilter.Build(user, searchQuery, _libraryManager);
        return _queryHelpers.ApplyAccessFiltering(dbContext, query, accessFilter);
    }

@@ -183,6 +183,7 @@ public class SimilarItemsManager : ISimilarItemsManager
                    // Collect references in batches and resolve against local library.
                    // Stop fetching once we have enough resolved local items.
                    const int BatchSize = 20;
+                    const int MaxRemoteReferenceFetchLimit = 500;
                    var remaining = requestedLimit - allResults.Count;
                    var collectedReferences = new List<SimilarItemReference>();
                    var pendingBatch = new List<SimilarItemReference>();
@@ -199,7 +200,7 @@ public class SimilarItemsManager : ISimilarItemsManager
                            remaining -= resolvedItems.Count;
                            pendingBatch.Clear();

-                            if (remaining <= 0)
+                            if (remaining <= 0 || collectedReferences.Count >= MaxRemoteReferenceFetchLimit)
                            {
                                break;
                            }
@@ -352,6 +352,7 @@ namespace Emby.Server.Implementations.Library
        /// <inheritdoc />
        public UserItemData? GetUserData(User user, BaseItem item)
        {
+            ArgumentNullException.ThrowIfNull(user);
            var row = ResolveUserDataRow(item, item.UserData?.Where(e => e.UserId.Equals(user.Id)));
            return row is not null ? Map(row) : new UserItemData()
            {
@@ -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);
@@ -0,0 +1,64 @@
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Model.Entities;
+using Microsoft.Extensions.Logging;
+
+namespace Emby.Server.Implementations.Library.Validators;
+
+/// <summary>
+/// Ensures top-level library folders have a primary poster after scans.
+/// Poster extraction is attempted before library scanning. When a library is
+/// empty at that point, no poster can be extracted. This post-scan task reruns
+/// metadata extraction for top-level folders that are still missing images.
+/// </summary>
+public class CollectionPosterVerifyPostScanTask : ILibraryPostScanTask
+{
+    private readonly ILibraryManager _libraryManager;
+    private readonly ILogger<CollectionPosterVerifyPostScanTask> _logger;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CollectionPosterVerifyPostScanTask" /> class.
+    /// </summary>
+    /// <param name="libraryManager">The library manager.</param>
+    /// <param name="logger">The logger.</param>
+    public CollectionPosterVerifyPostScanTask(
+        ILibraryManager libraryManager,
+        ILogger<CollectionPosterVerifyPostScanTask> logger)
+    {
+        _libraryManager = libraryManager;
+        _logger = logger;
+    }
+
+    /// <summary>
+    /// Runs the specified progress.
+    /// </summary>
+    /// <param name="progress">The progress.</param>
+    /// <param name="cancellationToken">The cancellation token.</param>
+    /// <returns>Task.</returns>
+    public async Task Run(IProgress<double> progress, CancellationToken cancellationToken)
+    {
+        var libraries = _libraryManager.GetUserRootFolder().Children.OfType<CollectionFolder>().ToList();
+        var totalLibraries = libraries.Count;
+        var processedLibraries = 0;
+
+        foreach (var library in libraries)
+        {
+            cancellationToken.ThrowIfCancellationRequested();
+
+            if (!library.HasImage(ImageType.Primary))
+            {
+                _logger.LogDebug("Library {LibraryName} is missing a primary image. Refreshing metadata.", library.Name);
+                await library.RefreshMetadata(cancellationToken).ConfigureAwait(false);
+            }
+
+            processedLibraries++;
+            progress.Report((double)processedLibraries / totalLibraries * 100);
+        }
+
+        progress.Report(100);
+    }
+}
@@ -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);
    }
 }
@@ -100,7 +100,7 @@
    "TaskAudioNormalization": "تطبيع الصوت",
    "TaskAudioNormalizationDescription": "يفحص الملفات لجمع بيانات تطبيع الصوت.",
    "TaskDownloadMissingLyrics": "تنزيل الكلمات المفقودة",
-    "TaskDownloadMissingLyricsDescription": "ينزّل الكلمات للأغاني.",
+    "TaskDownloadMissingLyricsDescription": "تحميل كلمات الأغاني",
    "TaskExtractMediaSegments": "فحص مقاطع المحتوى",
    "TaskExtractMediaSegmentsDescription": "يستخرج أو يحصل على مقاطع المحتوى من الملحقات المفعّلة لمقاطع المحتوى (MediaSegment).",
    "TaskMoveTrickplayImages": "نقل موقع صور معاينات التنقل",
@@ -108,5 +108,18 @@
    "CleanupUserDataTask": "مهمة تنظيف بيانات المستخدم",
    "CleanupUserDataTaskDescription": "ينظف جميع بيانات المستخدم (مثل حالة المشاهدة وحالة المفضلة وغيرها) للمحتوى الذي لم يعد موجوداً لمدة 90 يوماً على الأقل.",
    "Original": "فريد",
-    "LyricDownloadFailureFromForItem": "فشل تحميل الكلمات من {0} إلى {1}"
+    "LyricDownloadFailureFromForItem": "فشل تحميل الكلمات من {0} إلى {1}",
+    "NameExtraBehindTheScenes": "خلف المشاهد",
+    "NameExtraClip": "مقطع",
+    "NameExtraDeletedScene": "المشهد المحذوف",
+    "NameExtraInterview": "مقابلة",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "عيّنة",
+    "NameExtraScene": "مشهد",
+    "NameExtraShort": "قصير",
+    "NameExtraThemeSong": "الاغنية السمة",
+    "NameExtraThemeVideo": "الفيديو السمة",
+    "NameExtraFeaturette": "فيلم قصير إضافي",
+    "NameExtraTrailer": "إعلان ترويجي",
+    "NameExtraUnknown": "إضافي"
 }
@@ -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": "Оригинал"
 }
@@ -108,5 +108,18 @@
    "CleanupUserDataTaskDescription": "Neteja totes les dades d'usuari (estat de la visualització, estat dels preferits, etc.) del contingut multimèdia que no ha estat present durant almenys 90 dies.",
    "CleanupUserDataTask": "Tasca de neteja de dades d'usuari",
    "Original": "Original",
-    "LyricDownloadFailureFromForItem": "No s'han pogut descarregar les lletres des de {0} per a {1}"
+    "LyricDownloadFailureFromForItem": "No s'han pogut descarregar les lletres des de {0} per a {1}",
+    "NameExtraBehindTheScenes": "Rere les càmeres",
+    "NameExtraClip": "Tall",
+    "NameExtraDeletedScene": "Escena eliminada",
+    "NameExtraFeaturette": "Migmetratge",
+    "NameExtraInterview": "Entrevista",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "Mostra",
+    "NameExtraScene": "Escena",
+    "NameExtraShort": "Curt",
+    "NameExtraThemeSong": "Tema musical",
+    "NameExtraThemeVideo": "Vídeo temàtic",
+    "NameExtraTrailer": "Tràiler",
+    "NameExtraUnknown": "Extra"
 }
@@ -108,5 +108,18 @@
    "CleanupUserDataTaskDescription": "Odstraní všechna uživatelská data (stav zhlédnutí, oblíbené atd.) z médií, které již neexistují více než 90 dní.",
    "CleanupUserDataTask": "Pročistit uživatelská data",
    "Original": "Originál",
-    "LyricDownloadFailureFromForItem": "Nepodařilo se stáhnout texty pro {1} ze služby {0}"
+    "LyricDownloadFailureFromForItem": "Nepodařilo se stáhnout texty pro {1} ze služby {0}",
+    "NameExtraBehindTheScenes": "Zákulisí",
+    "NameExtraClip": "Klip",
+    "NameExtraDeletedScene": "Vymazaná scéna",
+    "NameExtraFeaturette": "Featurette",
+    "NameExtraInterview": "Rozhovor",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "Ukázka",
+    "NameExtraScene": "Scéna",
+    "NameExtraShort": "Krátké",
+    "NameExtraThemeSong": "Úvodní píseň",
+    "NameExtraThemeVideo": "Úvodní video",
+    "NameExtraTrailer": "Upoutávka",
+    "NameExtraUnknown": "Extra"
 }
@@ -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.",
@@ -108,5 +108,18 @@
    "CleanupUserDataTask": "Brugerdata oprydningsopgave",
    "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"
+    "Original": "Original",
+    "NameExtraBehindTheScenes": "Bag scenerne",
+    "NameExtraClip": "Klip",
+    "NameExtraDeletedScene": "Slettet scene",
+    "NameExtraFeaturette": "Featurette",
+    "NameExtraInterview": "Interview",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "Smagsprøve",
+    "NameExtraScene": "Scene",
+    "NameExtraShort": "Kort",
+    "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}",
@@ -108,5 +108,18 @@
    "CleanupUserDataTask": "Aufgabe zur Bereinigung von Benutzerdaten",
    "CleanupUserDataTaskDescription": "Löscht alle Benutzerdaten (Abspielstatus, Favoritenstatus, usw.) von Medien, die seit mindestens 90 Tagen nicht mehr vorhanden sind.",
    "Original": "Original",
-    "LyricDownloadFailureFromForItem": "Fehler beim Download der Songtexte von {0} für {1}"
+    "LyricDownloadFailureFromForItem": "Fehler beim Download der Songtexte von {0} für {1}",
+    "NameExtraBehindTheScenes": "Behind The Scenes",
+    "NameExtraDeletedScene": "Entfernte Szene",
+    "NameExtraInterview": "Interview",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "Ausschnitt",
+    "NameExtraScene": "Szene",
+    "NameExtraShort": "Kurzfilm",
+    "NameExtraThemeSong": "Titellied",
+    "NameExtraThemeVideo": "Titelvideo",
+    "NameExtraTrailer": "Trailer",
+    "NameExtraUnknown": "Extra",
+    "NameExtraClip": "Clip",
+    "NameExtraFeaturette": "Hinter den Kulissen"
 }
@@ -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"
 }
@@ -28,6 +28,19 @@
    "Movies": "Movies",
    "Music": "Music",
    "MusicVideos": "Music Videos",
+    "NameExtraBehindTheScenes": "Behind The Scenes",
+    "NameExtraClip": "Clip",
+    "NameExtraDeletedScene": "Deleted Scene",
+    "NameExtraFeaturette": "Featurette",
+    "NameExtraInterview": "Interview",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "Sample",
+    "NameExtraScene": "Scene",
+    "NameExtraShort": "Short",
+    "NameExtraThemeSong": "Theme Song",
+    "NameExtraThemeVideo": "Theme Video",
+    "NameExtraTrailer": "Trailer",
+    "NameExtraUnknown": "Extra",
    "NameInstallFailed": "{0} installation failed",
    "NameSeasonNumber": "Season {0}",
    "NameSeasonUnknown": "Season Unknown",
@@ -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"
 }
@@ -108,5 +108,18 @@
    "CleanupUserDataTaskDescription": "Limpia todos los datos del usuario (estado de visualización, estado de los favoritos, etc.) que no están presentes en la biblioteca por al menos 90 días.",
    "CleanupUserDataTask": "Tarea de limpieza de datos de usuarios",
    "LyricDownloadFailureFromForItem": "No se pudo descargar la letra desde {0} para {1}",
-    "Original": "Original"
+    "Original": "Original",
+    "NameExtraBehindTheScenes": "Detrás de cámaras",
+    "NameExtraClip": "Clip",
+    "NameExtraDeletedScene": "Escena eliminada",
+    "NameExtraFeaturette": "Minidocumental",
+    "NameExtraInterview": "Entrevista",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "Muestra",
+    "NameExtraScene": "Escena",
+    "NameExtraShort": "Cortometraje",
+    "NameExtraThemeSong": "Música de presentación",
+    "NameExtraThemeVideo": "Video de presentación",
+    "NameExtraTrailer": "Tráiler",
+    "NameExtraUnknown": "Extra"
 }
@@ -106,5 +106,20 @@
    "TaskMoveTrickplayImages": "Migrar la ubicación de la imagen de Trickplay",
    "TaskMoveTrickplayImagesDescription": "Mueve archivos de trickplay existentes según la configuración de la biblioteca.",
    "CleanupUserDataTask": "Tarea de limpieza de los datos del usuario",
-    "CleanupUserDataTaskDescription": "Limpia toda la información de usuario (Estado de última vez visto, favoritos, etc) del archivo media que no está presente por los últimos 90 días."
+    "CleanupUserDataTaskDescription": "Limpia toda la información de usuario (Estado de última vez visto, favoritos, etc) del archivo media que no está presente por los últimos 90 días.",
+    "LyricDownloadFailureFromForItem": "No se pudo descargar la letra desde {0} para {1}",
+    "NameExtraBehindTheScenes": "Detrás de cámaras",
+    "NameExtraClip": "Clip",
+    "NameExtraDeletedScene": "Escena eliminada",
+    "NameExtraFeaturette": "Minidocumental",
+    "NameExtraInterview": "Entrevista",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "Muestra",
+    "NameExtraScene": "Escena",
+    "NameExtraShort": "Cortometraje",
+    "NameExtraThemeSong": "Música de presentación",
+    "NameExtraThemeVideo": "Video de presentación",
+    "NameExtraTrailer": "Tráiler",
+    "NameExtraUnknown": "Extra",
+    "Original": "Original"
 }
@@ -108,5 +108,18 @@
    "CleanupUserDataTask": "Tarea de limpieza de datos del usuario",
    "CleanupUserDataTaskDescription": "Limpia todos los datos del usuario (estado de visualización, favoritos, etc.) de los medios que ya no están disponibles desde hace al menos 90 días.",
    "Original": "Original",
-    "LyricDownloadFailureFromForItem": "No se pudieron descargar las letras desde {0} para {1}"
+    "LyricDownloadFailureFromForItem": "No se pudieron descargar las letras desde {0} para {1}",
+    "NameExtraBehindTheScenes": "Detrás de Cámaras",
+    "NameExtraClip": "Clip",
+    "NameExtraDeletedScene": "Escena eliminada",
+    "NameExtraFeaturette": "Reportaje especial",
+    "NameExtraInterview": "Entrevista",
+    "NameExtraSample": "Muestra",
+    "NameExtraScene": "Escena",
+    "NameExtraShort": "Cortometraje",
+    "NameExtraThemeSong": "Tema principal",
+    "NameExtraThemeVideo": "Vídeo del tema principal",
+    "NameExtraTrailer": "Tráiler",
+    "NameExtraUnknown": "Extra",
+    "NameExtraNumbered": "{0} {1}"
 }
@@ -108,5 +108,18 @@
    "CleanupUserDataTask": "Tarea de limpieza de datos de usuario",
    "CleanupUserDataTaskDescription": "Limpia todos los datos de usuario (estado de visualización, favoritos, etc.) que no están presentes en la biblioteca por al menos 90 días.",
    "LyricDownloadFailureFromForItem": "No se pudo descargar las letras de {0} para {1}",
-    "Original": "Original"
+    "Original": "Original",
+    "NameExtraUnknown": "Extra",
+    "NameExtraBehindTheScenes": "Detrás de cámaras",
+    "NameExtraClip": "Clip",
+    "NameExtraDeletedScene": "Escena eliminada",
+    "NameExtraFeaturette": "Minidocumental",
+    "NameExtraInterview": "Entrevista",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "Muestra",
+    "NameExtraScene": "Escena",
+    "NameExtraShort": "Cortometraje",
+    "NameExtraThemeSong": "Música de presentación",
+    "NameExtraThemeVideo": "Video de presentación",
+    "NameExtraTrailer": "Tráiler"
 }
@@ -108,5 +108,18 @@
    "CleanupUserDataTask": "Puhasta kasutajaandmed",
    "CleanupUserDataTaskDescription": "Puhastab kõik kasutajaandmed (vaatamise olek, lemmikute olek jne) meediast, mida pole enam vähemalt 90 päeva saadaval olnud.",
    "LyricDownloadFailureFromForItem": "Laulusõnade hankimine teenusest {0} loole {1} nurjus",
-    "Original": "Algne"
+    "Original": "Algne",
+    "NameExtraBehindTheScenes": "Kulisside taga",
+    "NameExtraDeletedScene": "Väljajäetud stseen",
+    "NameExtraFeaturette": "Lisalõik",
+    "NameExtraInterview": "Intervjuu",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "Näidis",
+    "NameExtraScene": "Stseen",
+    "NameExtraShort": "Lühifilm",
+    "NameExtraThemeSong": "Tunnusmeloodia",
+    "NameExtraThemeVideo": "Tunnusvideo",
+    "NameExtraTrailer": "Treiler",
+    "NameExtraUnknown": "Lisamaterjal",
+    "NameExtraClip": "Videoklipp"
 }
@@ -108,5 +108,18 @@
    "CleanupUserDataTaskDescription": "Gutxienez 90 egunez dagoeneko existitzen ez den multimediatik erabiltzaile-datu guztiak (ikusteko egoera, gogokoen egoera, etab.) garbitzen ditu.",
    "CleanupUserDataTask": "Erabiltzaileen datuak garbitzeko zeregina",
    "LyricDownloadFailureFromForItem": "Ezin izan dira {1}-ren letrak deskargatu {0}-tik",
-    "Original": "Jatorrizkoa"
+    "Original": "Jatorrizkoa",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "Lagina",
+    "NameExtraScene": "Eszena",
+    "NameExtraShort": "Laburra",
+    "NameExtraThemeSong": "Gai-abestia",
+    "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": "Listafólk",
-    "Collections": "Søvn",
+    "Artists": "Tónlistafólk",
+    "Collections": "Samlingar",
    "Default": "Forsett",
    "External": "Ytri",
    "Genres": "Greinar",
@@ -29,9 +29,9 @@
    "NotificationOptionPluginUpdateInstalled": "Ískoytisforrit dagført",
    "NotificationOptionUserLockedOut": "Brúkari útihýstur",
    "Photos": "Ljósmyndir",
-    "PluginInstalledWithName": "{0} var innlagt",
-    "PluginUninstalledWithName": "{0} var strikað",
-    "PluginUpdatedWithName": "{0} varð dagført",
+    "PluginInstalledWithName": "{0} innlagt",
+    "PluginUninstalledWithName": "{0} strikað",
+    "PluginUpdatedWithName": "{0} dagført",
    "Shows": "Røðir",
    "SubtitleDownloadFailureFromForItem": "Miseydnaðist at niðurtakað undirtekstir til {1} frá {0}",
    "TvShows": "Sjónvarpsrøðir",
@@ -48,5 +48,78 @@
    "TaskDownloadMissingLyricsDescription": "Niðurtekur sangtekstir",
    "Movies": "Filmar",
    "MixedContent": "Blandað innihald",
-    "Music": "Tónleikur"
+    "Music": "Tónleikur",
+    "UserStartedPlayingItemWithValues": "{0} spælur {1} á {2}",
+    "HeaderContinueWatching": "Hald áfram at hyggja",
+    "MusicVideos": "Sjónbandaløg",
+    "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": "Umfar {0}",
+    "NameSeasonUnknown": "Ókent umfar",
+    "ScheduledTaskFailedWithName": "{0} miseydnaðist",
+    "Undefined": "Óskilmarkað",
+    "TasksMaintenanceCategory": "Viðlíkahald",
+    "TaskCleanLogs": "Reinsa gerðalistaskjáttu",
+    "UserOnlineFromDevice": "{0} er íbundin frá {1}",
+    "HeaderNextUp": "Næst á skránni",
+    "NotificationOptionPluginError": "Brek í ískoytisforriti",
+    "NotificationOptionInstallationFailed": "Innleggingarbrek",
+    "NotificationOptionServerRestartRequired": "Tørvur er á ambætaraendurbyrjan",
+    "TasksApplicationCategory": "Nýtsluskipan",
+    "NotificationOptionApplicationUpdateAvailable": "Skipanardagføring er tøk",
+    "NotificationOptionApplicationUpdateInstalled": "Skipanardagføring varð innløgd",
+    "UserStoppedPlayingItemWithValues": "{0} er liðugur at spæla {1} á {2}",
+    "HomeVideos": "Heimaupptøkur",
+    "StartupEmbyServerIsLoading": "Jellyfin-ambætarin er undir byrjanarinnlesing. Vinaliga royn aftur um eitt bil.",
+    "UserOfflineFromDevice": "{0} breyt av á {1}",
+    "UserPasswordChangedWithName": "Loyniorðið hjá brúkaranum {0} er broytt",
+    "TasksChannelsCategory": "Alnetsrásir",
+    "TaskCleanActivityLog": "Reinsa virksemisskrá",
+    "TaskCleanActivityLogDescription": "Strikar skrásetingar eldri enn ásetta aldur.",
+    "TaskCleanCache": "Reinsa kovaskjáttu",
+    "TaskCleanCacheDescription": "Strikar kovafílar ið kervið ikki hevur tørv á longur.",
+    "TaskCleanTranscode": "Reinsa umkotuskjáttu",
+    "TaskDownloadMissingLyrics": "Niðurtak vantandi sangtekstir",
+    "TaskDownloadMissingSubtitles": "Niðurtak vantandi undirtekstir",
+    "CleanupUserDataTaskDescription": "Strikar allar brúkaradátur, so sum spælistøðu, yndislistastøðu o.s.fr., fyri miðlar ið ikki hava verið tøkir í í minsta lagi 90 dagar.",
+    "CleanupUserDataTask": "Koyrsla ið reinsar brúkaradátur",
+    "TaskRefreshPeople": "Dagfør persónsupplýsingar",
+    "TaskRefreshPeopleDescription": "Dagførur metadátur um leikarar og leikstjórar í tínum margmiðlasavni.",
+    "TaskRefreshChannelsDescription": "Dagførur upplýsingar um alnetsrásir.",
+    "TaskDownloadMissingSubtitlesDescription": "Leitar á alnótini eftir vantandi undirtekstum grundað á metadátauppsetan.",
+    "NotificationOptionTaskFailed": "Brek undir fyriskipaðari koyrslu",
+    "TaskRefreshLibraryDescription": "Skannar títt miðlasavn fyri nýggjum fílum og dagførur metadátur.",
+    "TaskKeyframeExtractor": "Lyklamyndaúttøka",
+    "TaskKeyframeExtractorDescription": "Úttekur lyklamyndir frá kykmynda-fílum til tess at byggja nágreiniligari HLS-spælilistar. Koyrslan kann taka langa tíð.",
+    "TaskOptimizeDatabaseDescription": "Trýstur dátugrunninin saman og loysur tóma goymslu. Koyrslan kann bøta um avrikið, eftir skanning ella aðrar broytingar í savninum ið elva til dátugrunnsbroytingar.",
+    "TaskRefreshChapterImagesDescription": "Ger smámyndir fyri kykmyndir ið hava kapitlar.",
+    "TaskRefreshChapterImages": "Kapitlamyndaúttøkur",
+    "NotificationOptionVideoPlayback": "Kykmyndaspæl byrjað",
+    "NotificationOptionVideoPlaybackStopped": "Kykmyndaspæl steðgað",
+    "NotificationOptionAudioPlayback": "Ljóðspæl byrjað",
+    "NotificationOptionAudioPlaybackStopped": "Ljóðspæl steðgað",
+    "TaskExtractMediaSegments": "Leita eftir margmiðlabrotum",
+    "TaskExtractMediaSegmentsDescription": "Framleiður upplýsingar um brot í margmiðlum, við hjálp frá MediaSegment-virktum ískoytisforritum.",
+    "NotificationOptionCameraImageUploaded": "Ljósmynd uppsend",
+    "NameExtraShort": "Stuttfilmur",
+    "NameExtraThemeSong": "Eyðkennislag",
+    "NameExtraTrailer": "Forfilmur",
+    "NameExtraInterview": "Samrøða",
+    "NameExtraBehindTheScenes": "Aftanfyri leiktjøldini",
+    "NameExtraClip": "Klipp",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraFeaturette": "Stuttur heimildarfilmur",
+    "TaskAudioNormalization": "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)"
 }
@@ -108,5 +108,18 @@
    "CleanupUserDataTaskDescription": "Nettoie toutes les données utilisateur (état de la montre, statut favori, etc.) des supports qui ne sont plus présents depuis au moins 90 jours.",
    "CleanupUserDataTask": "Tâche de nettoyage des données utilisateur",
    "LyricDownloadFailureFromForItem": "Le téléchargement des paroles a échoué de {0} pour {1}",
-    "Original": "Original"
+    "Original": "Original",
+    "NameExtraBehindTheScenes": "Dans Les Coulisses",
+    "NameExtraClip": "Clip",
+    "NameExtraDeletedScene": "Scène supprimée",
+    "NameExtraFeaturette": "Court-métrage",
+    "NameExtraInterview": "Entrevue",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "Échantillon",
+    "NameExtraScene": "Scène",
+    "NameExtraShort": "Court-métrage",
+    "NameExtraThemeSong": "Chanson thème",
+    "NameExtraThemeVideo": "Générique",
+    "NameExtraTrailer": "Bande-annonce",
+    "NameExtraUnknown": "Extra"
 }
@@ -108,5 +108,18 @@
    "CleanupUserDataTaskDescription": "Nettoie toutes les données utilisateur (état de la montre, statut favori, etc.) des supports qui ne sont plus présents depuis au moins 90 jours.",
    "CleanupUserDataTask": "Tâche de nettoyage des données utilisateur",
    "LyricDownloadFailureFromForItem": "Le téléchargement des paroles à échoué de {0} pour {1}",
-    "Original": "Original"
+    "Original": "Original",
+    "NameExtraBehindTheScenes": "Dans Les Coulisses",
+    "NameExtraClip": "Clip",
+    "NameExtraDeletedScene": "Scène supprimée",
+    "NameExtraFeaturette": "Court-métrage",
+    "NameExtraInterview": "Entrevue",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "Échantillon",
+    "NameExtraScene": "Scène",
+    "NameExtraShort": "Court-métrage",
+    "NameExtraThemeSong": "Thème musical",
+    "NameExtraThemeVideo": "Générique",
+    "NameExtraTrailer": "Bande-annonce",
+    "NameExtraUnknown": "Extra"
 }
@@ -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": "סצנה"
 }
@@ -105,5 +105,21 @@
    "TaskExtractMediaSegmentsDescription": "मीडियासेगमेंट सक्षम प्लगइन्स से मीडिया सेगमेंट निकालता है या प्राप्त करता है।",
    "TaskMoveTrickplayImages": "ट्रिकप्ले छवि स्थान माइग्रेट करें",
    "TaskMoveTrickplayImagesDescription": "लाइब्रेरी सेटिंग्स के अनुसार मौजूदा ट्रिकप्ले फ़ाइलों को स्थानांतरित करता है।",
-    "CleanupUserDataTask": "यूज़र डेटा सफाई कार्य"
+    "CleanupUserDataTask": "यूज़र डेटा सफाई कार्य",
+    "Original": "असली",
+    "LyricDownloadFailureFromForItem": "{0} के लिए {1} से बोल (Lyrics) डाउनलोड करने में विफल रहा",
+    "NameExtraBehindTheScenes": "परदे के पीछे",
+    "NameExtraClip": "क्लिप",
+    "NameExtraDeletedScene": "हटाया गया दृश्य",
+    "NameExtraFeaturette": "फीचरेट",
+    "NameExtraInterview": "साक्षात्कार",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "नमूना",
+    "NameExtraScene": "दृश्य",
+    "NameExtraShort": "शॉर्ट",
+    "NameExtraThemeSong": "थीम सॉन्ग",
+    "NameExtraThemeVideo": "थीम वीडियो",
+    "NameExtraTrailer": "ट्रेलर",
+    "NameExtraUnknown": "अतिरिक्त",
+    "CleanupUserDataTaskDescription": "कम से कम 90 दिनों से अनुपस्थित मीडिया से सभी उपयोगकर्ता डेटा (देखने की स्थिति, पसंदीदा स्थिति आदि) को साफ़ करता है।"
 }
@@ -108,5 +108,18 @@
    "CleanupUserDataTaskDescription": "Legalább 90 napja nem elérhető médiákhoz kapcsolódó összes felhasználói adat (pl. megtekintési állapot, kedvencek) törlése.",
    "CleanupUserDataTask": "Felhasználói adatok tisztítása feladat",
    "Original": "Eredeti",
-    "LyricDownloadFailureFromForItem": "Dalszöveg letöltése {0}-tól {1}-hez sikertelen"
+    "LyricDownloadFailureFromForItem": "Dalszöveg letöltése {0}-tól {1}-hez sikertelen",
+    "NameExtraBehindTheScenes": "Színfalak mögött",
+    "NameExtraClip": "Klip",
+    "NameExtraDeletedScene": "Törölt jelenet",
+    "NameExtraFeaturette": "Kísérő film",
+    "NameExtraInterview": "Interjú",
+    "NameExtraSample": "Minta",
+    "NameExtraScene": "Jelenet",
+    "NameExtraShort": "Rövidfilm",
+    "NameExtraThemeSong": "Főcímdal",
+    "NameExtraThemeVideo": "Főcímvideó",
+    "NameExtraTrailer": "Előzetes",
+    "NameExtraUnknown": "Extra",
+    "NameExtraNumbered": "{0} {1}"
 }
@@ -24,5 +24,10 @@
    "TaskDownloadMissingSubtitles": "Ներբեռնել պակասող ենթագրերը",
    "AppDeviceValues": "Հավելված` {0}, Սարք `{1}",
    "ChapterNameValue": "Գլուխ {0}",
-    "Collections": "Հավաքածուներ"
+    "Collections": "Հավաքածուներ",
+    "Artists": "Երաժիշտներ",
+    "Default": "Լռելյայն",
+    "Favorites": "Ընտրյալ",
+    "Forced": "Ստիպուած",
+    "Genres": "Ոճ"
 }
@@ -62,7 +62,7 @@
    "UserDownloadingItemWithValues": "{0} hleður niður {1}",
    "SubtitleDownloadFailureFromForItem": "Tókst ekki að hala niður skjátextum frá {0} til {1}",
    "Shows": "Þættir",
-    "TaskRefreshChannelsDescription": "Endurhlaða upplýsingum netrása.",
+    "TaskRefreshChannelsDescription": "Endurhleður upplýsingum netrása.",
    "TaskRefreshChannels": "Endurhlaða Rásir",
    "TaskCleanTranscodeDescription": "Eyða umkóðuðum skrám sem eru meira en einum degi eldri.",
    "TaskCleanTranscode": "Hreinsa Umkóðunarmöppu",
@@ -80,7 +80,7 @@
    "TasksMaintenanceCategory": "Viðhald",
    "Default": "Sjálfgefið",
    "TaskCleanActivityLog": "Hreinsa athafnaskrá",
-    "TaskRefreshPeople": "Endurnýja fólk",
+    "TaskRefreshPeople": "Endurnýja upplýsingar um fólk",
    "TaskDownloadMissingSubtitles": "Sækja texta sem vantar",
    "TaskOptimizeDatabase": "Fínstilla gagnagrunn",
    "Undefined": "Óskilgreint",
@@ -95,8 +95,8 @@
    "TaskCleanActivityLogDescription": "Eyðir virkniskráningarfærslum sem hafa náð settum hámarksaldri.",
    "Forced": "Þvingað",
    "External": "Útvær",
-    "TaskRefreshTrickplayImagesDescription": "Býr til hraðspilunarmyndir fyrir myndbönd í virkum söfnum.",
-    "TaskRefreshTrickplayImages": "Búa til hraðspilunarmyndir",
+    "TaskRefreshTrickplayImagesDescription": "Býr til hraðspilunarmyndir (Trickplay) fyrir myndbönd í virkum söfnum.",
+    "TaskRefreshTrickplayImages": "Búa til hraðspilunarmyndir (Trickplay)",
    "TaskAudioNormalization": "Hljóðstöðlun",
    "TaskAudioNormalizationDescription": "Leitar að hljóðstöðlunargögnum í skrám.",
    "TaskDownloadMissingLyricsDescription": "Sækja söngtexta fyrir lög",
@@ -108,5 +108,18 @@
    "Original": "Upprunaleg",
    "TaskExtractMediaSegmentsDescription": "Sækir myndbúta úr viðbótum þar sem MediaSegment er virkt.",
    "TaskMoveTrickplayImages": "Flytja geymslustað fyrir Trickplay-myndir",
-    "TaskMoveTrickplayImagesDescription": "Flytur fyrirliggjandi Trickplay-skrár í samræmi við stillingar safnsins."
+    "TaskMoveTrickplayImagesDescription": "Flytur fyrirliggjandi Trickplay-skrár í samræmi við stillingar safnsins.",
+    "NameExtraBehindTheScenes": "Bak við tjöldin",
+    "NameExtraClip": "Brot",
+    "NameExtraDeletedScene": "Eydd atriði",
+    "NameExtraFeaturette": "Stutt heimildarmynd",
+    "NameExtraInterview": "Viðtal",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "Sýnishorn",
+    "NameExtraScene": "Sena",
+    "NameExtraShort": "Stuttmynd",
+    "NameExtraThemeSong": "Þema lag",
+    "NameExtraThemeVideo": "Þema myndband",
+    "NameExtraTrailer": "Stikla",
+    "NameExtraUnknown": "Aukaefni"
 }
@@ -108,5 +108,18 @@
    "CleanupUserDataTask": "Task di pulizia dei dati utente",
    "CleanupUserDataTaskDescription": "Pulisce tutti i dati utente (stato di visione, status preferiti, ecc.) dai contenuti non più presenti da almeno 90 giorni.",
    "Original": "Originale",
-    "LyricDownloadFailureFromForItem": "Scaricamento dei testi non riuscito da {0} per {1}"
+    "LyricDownloadFailureFromForItem": "Scaricamento dei testi non riuscito da {0} per {1}",
+    "NameExtraBehindTheScenes": "Dietro le scene",
+    "NameExtraClip": "Filmato",
+    "NameExtraDeletedScene": "Scena eliminata",
+    "NameExtraInterview": "Intervista",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraScene": "Scena",
+    "NameExtraSample": "Campione",
+    "NameExtraShort": "Corto",
+    "NameExtraThemeSong": "Sigla musicale",
+    "NameExtraTrailer": "Trailer",
+    "NameExtraFeaturette": "Caratteristica",
+    "NameExtraThemeVideo": "Video tematico",
+    "NameExtraUnknown": "Extra"
 }
@@ -108,5 +108,8 @@
    "CleanupUserDataTask": "사용자 데이터 정리 작업",
    "CleanupUserDataTaskDescription": "최소 90일 이상 존재하지 않는 미디어에 대한 사용자 데이터(시청 상태, 즐겨찾기 등)를 정리합니다.",
    "LyricDownloadFailureFromForItem": "{1}에 대한 가사를 {0}에서 다운로드하지 못했습니다",
-    "Original": "원본"
+    "Original": "원본",
+    "NameExtraClip": "클립",
+    "NameExtraDeletedScene": "삭제된 장면",
+    "NameExtraInterview": "인터뷰"
 }
@@ -104,5 +104,9 @@
    "TaskKeyframeExtractorDescription": "Extrahéiert Schlësselbiller aus Videodateien, fir méi präzis HLS-Playlisten ze erstellen. Dës Aufgab kann eng längere Zäit daueren.",
    "TaskRefreshChannelsDescription": "Aktualiséiert Informatiounen iwwer Internetkanäl.",
    "TaskExtractMediaSegmentsDescription": "Extrahéiert oder kritt Mediesegmenter aus Plugins, déi MediaSegment ënnerstëtzen.",
-    "TaskOptimizeDatabaseDescription": "Kompriméiert d’Datebank a schneit de fräie Speicherplatz zou. Dës Aufgab no engem Bibliothéik-Scan oder anere Ännerungen, déi Datebankmodifikatioune mat sech bréngen, auszeféieren, kann d’Performance verbesseren."
+    "TaskOptimizeDatabaseDescription": "Kompriméiert d’Datebank a schneit de fräie Speicherplatz zou. Dës Aufgab no engem Bibliothéik-Scan oder anere Ännerungen, déi Datebankmodifikatioune mat sech bréngen, auszeféieren, kann d’Performance verbesseren.",
+    "LyricDownloadFailureFromForItem": "Feeler beim Download vun de Songtexter vun {0} fir {1}",
+    "Original": "Original",
+    "CleanupUserDataTask": "Aufgab fir Berengege vu Benotzerdaten",
+    "CleanupUserDataTaskDescription": "Läscht all Benotzerdaten (Ofspillstatus, Favoritestatus, asw.) vu Medien, déi zënter mindestens 90 Deeg net méi besteeënd sinn."
 }
@@ -3,15 +3,15 @@
    "Artists": "Atlikėjai",
    "AuthenticationSucceededWithUserName": "{0} sėkmingai autentifikuota",
    "Books": "Knygos",
-    "ChapterNameValue": "Scena{0}",
-    "Collections": "Rinkiniai",
+    "ChapterNameValue": "Skyrius{0}",
+    "Collections": "Kolekcijos",
    "FailedLoginAttemptWithUserName": "Nesėkmingas {0} bandymas prisijungti",
    "Favorites": "Mėgstami",
-    "Folders": "Katalogai",
+    "Folders": "Aplankai",
    "Genres": "Žanrai",
    "HeaderContinueWatching": "Žiūrėti toliau",
-    "HeaderFavoriteEpisodes": "Mėgstamiausios serijos",
-    "HeaderFavoriteShows": "Mėgstamiausios TV Laidos",
+    "HeaderFavoriteEpisodes": "Mėgstami Epizodai",
+    "HeaderFavoriteShows": "Mėgstamos TV Laidos",
    "HeaderLiveTV": "Tiesioginė TV",
    "HeaderNextUp": "Toliau",
    "HomeVideos": "Namų vaizdo įrašai",
@@ -26,14 +26,14 @@
    "NameInstallFailed": "{0} diegimo klaida",
    "NameSeasonNumber": "Sezonas {0}",
    "NameSeasonUnknown": "Sezonas neatpažintas",
-    "NewVersionIsAvailable": "Nauja \"Jellyfin Server\" versija yra prieinama atsisiuntimui.",
+    "NewVersionIsAvailable": "Nauja Jellyfin Server versija yra prieinama atsisiuntimui.",
    "NotificationOptionApplicationUpdateAvailable": "Galimi programos atnaujinimai",
    "NotificationOptionApplicationUpdateInstalled": "Programos atnaujinimai įdiegti",
    "NotificationOptionAudioPlayback": "Garso atkūrimas pradėtas",
    "NotificationOptionAudioPlaybackStopped": "Garso atkūrimas sustabdytas",
-    "NotificationOptionCameraImageUploaded": "Kameros vaizdai įkelti",
+    "NotificationOptionCameraImageUploaded": "Kameros atvaizdai įkelti",
    "NotificationOptionInstallationFailed": "Diegimo klaida",
-    "NotificationOptionNewLibraryContent": "Naujas turinys įkeltas",
+    "NotificationOptionNewLibraryContent": "Pridėtas naujas turinys",
    "NotificationOptionPluginError": "Įskiepio klaida",
    "NotificationOptionPluginInstalled": "Įskiepis įdiegtas",
    "NotificationOptionPluginUninstalled": "Įskiepis išdiegtas",
@@ -51,7 +51,7 @@
    "Shows": "Laidos",
    "StartupEmbyServerIsLoading": "Jellyfin Server kraunasi. Netrukus pabandykite dar kartą.",
    "SubtitleDownloadFailureFromForItem": "{1} subtitrai buvo nesėkmingai parsiųsti iš {0}",
-    "TvShows": "TV laidos",
+    "TvShows": "TV Laidos",
    "UserCreatedWithName": "Buvo sukurtas {0} naudotojas",
    "UserDeletedWithName": "Naudotojas {0} ištrintas",
    "UserDownloadingItemWithValues": "{0} siunčiasi {1}",
@@ -59,14 +59,14 @@
    "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",
    "TaskDownloadMissingSubtitlesDescription": "Ieško trūkstamų subtitrų internete remiantis metaduomenų konfigūracija.",
-    "TaskCleanTranscodeDescription": "Ištrina dienos senumo perkodavimo failus.",
-    "TaskCleanTranscode": "Išvalyti perkodavimo katalogą",
+    "TaskCleanTranscodeDescription": "Ištrina dienos senumo transkodavimo failus.",
+    "TaskCleanTranscode": "Išvalyti transkodavimo katalogą",
    "TaskRefreshLibraryDescription": "Skenuoja medijos biblioteką, ieškodamas naujų failų, ir atnaujina metaduomenis.",
    "TaskRefreshLibrary": "Skenuoti medijos biblioteką",
    "TaskDownloadMissingSubtitles": "Atsisiųsti trūkstamus subtitrus",
@@ -76,8 +76,8 @@
    "TaskRefreshPeople": "Atnaujinti žmones",
    "TaskCleanLogsDescription": "Ištrina žurnalo failus kurie yra senesni nei {0} dienos.",
    "TaskCleanLogs": "Išvalyti žurnalą",
-    "TaskRefreshChapterImagesDescription": "Sukuria vaizdo įrašų, kuriuose yra skyrių, miniatiūras.",
-    "TaskRefreshChapterImages": "Ištraukti skyrių vaizdus",
+    "TaskRefreshChapterImagesDescription": "Sukuria miniatiūras vaizdo įrašams, kuriuose yra skyriai.",
+    "TaskRefreshChapterImages": "Ištraukti skyrių atvaizdus",
    "TaskCleanCache": "Išvalyti talpyklą",
    "TaskCleanCacheDescription": "Ištrina talpyklos failus, kurių daugiau nereikia sistemai.",
    "TasksChannelsCategory": "Internetiniai kanalai",
@@ -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.",
@@ -96,15 +96,30 @@
    "External": "Išorinis",
    "HearingImpaired": "Su klausos sutrikimais",
    "TaskRefreshTrickplayImages": "Generuoti Trickplay atvaizdus",
-    "TaskRefreshTrickplayImagesDescription": "Sukuria trickplay peržiūras vaizdo įrašams įgalintose bibliotekose.",
+    "TaskRefreshTrickplayImagesDescription": "Sukuria vaizdo įrašų, esančių įgalintose bibliotekose, Trickplay peržiūras.",
    "TaskAudioNormalization": "Garso normalizavimas",
    "TaskAudioNormalizationDescription": "Skenuoja failus, ieškant garso normalizavimo duomenų.",
    "TaskExtractMediaSegments": "Medijos segmentų nuskaitymas",
    "TaskDownloadMissingLyrics": "Parsisiųsti trūkstamus dainų tekstus",
    "TaskExtractMediaSegmentsDescription": "Ištraukia arba gauna medijos segmentus iš MediaSegment ijungtų įskiepių.",
-    "TaskMoveTrickplayImages": "Pakeisti Trickplay vaizdų vietą",
-    "TaskMoveTrickplayImagesDescription": "Perkelia egzistuojančius trickplay failus pagal bibliotekos nustatymus.",
+    "TaskMoveTrickplayImages": "Pakeisti Trickplay atvaizdų vietą",
+    "TaskMoveTrickplayImagesDescription": "Perkelia egzistuojančius Trickplay failus pagal bibliotekos nustatymus.",
    "TaskDownloadMissingLyricsDescription": "Parsisiųsti dainų žodžius",
    "CleanupUserDataTask": "Naudotojo duomenų valymo užduotis",
-    "CleanupUserDataTaskDescription": "Iš medijos, kurios nebėra bent 90 dienų, išvalo visus naudotojo duomenis (žiūrėjimo būseną, mėgstamiausią būseną ir t. t.)."
+    "CleanupUserDataTaskDescription": "Iš medijos, kurios nebėra bent 90 dienų, išvalo visus naudotojo duomenis (žiūrėjimo būseną, mėgstamą būseną ir t. t.).",
+    "LyricDownloadFailureFromForItem": "Nepavyko atsisiųsti dainos žodžių iš {0}, skirto {1}",
+    "NameExtraBehindTheScenes": "Užkulisiuose",
+    "NameExtraClip": "Klipas",
+    "NameExtraDeletedScene": "Ištrinta scena",
+    "NameExtraInterview": "Interviu",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "Pavyzdys",
+    "NameExtraScene": "Scena",
+    "NameExtraThemeSong": "Teminė daina",
+    "NameExtraThemeVideo": "Teminis vaizdo įrašas",
+    "NameExtraTrailer": "Anonsas",
+    "NameExtraUnknown": "Papildomas",
+    "Original": "Originalus",
+    "NameExtraFeaturette": "Trumpametražis filmas",
+    "NameExtraShort": "Trumpas filmukas"
 }
@@ -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"
 }
@@ -108,5 +108,18 @@
    "CleanupUserDataTask": "Opruimtaak gebruikersdata",
    "Genres": "Genres",
    "Original": "Oorspronkelijk",
-    "LyricDownloadFailureFromForItem": "Downloaden van liedteksten voor {1} van {0} mislukt"
+    "LyricDownloadFailureFromForItem": "Downloaden van liedteksten voor {1} van {0} mislukt",
+    "NameExtraBehindTheScenes": "Achter de schermen",
+    "NameExtraClip": "Clip",
+    "NameExtraDeletedScene": "Geschrapte scène",
+    "NameExtraFeaturette": "Featurette",
+    "NameExtraInterview": "Vraaggesprek",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "Voorbeeldfragment",
+    "NameExtraScene": "Scène",
+    "NameExtraShort": "Korte film",
+    "NameExtraThemeSong": "Themamuziek",
+    "NameExtraThemeVideo": "Themavideo",
+    "NameExtraTrailer": "Trailer",
+    "NameExtraUnknown": "Extra inhoud"
 }
@@ -1,3 +1,27 @@
 {
-    "AppDeviceValues": "Aplicacion: {0}, Periferic: {1}"
+    "AppDeviceValues": "Aplicacion: {0}, Periferic: {1}",
+    "Books": "Libres",
+    "Artists": "Artistas",
+    "Collections": "Collecciones",
+    "ChapterNameValue": "Capitol {0}",
+    "External": "Extèrn",
+    "Folders": "Dorsièrs",
+    "Favorites": "Favorits",
+    "HeaderContinueWatching": "Contunhar de regardar",
+    "HeaderFavoriteEpisodes": "Episòdis Favorits",
+    "AuthenticationSucceededWithUserName": "{0} autentificat amb succès",
+    "HeaderFavoriteShows": "Serias Favoritas",
+    "HeaderLiveTV": "TV en dirècte",
+    "HeaderNextUp": "Seguent",
+    "HearingImpaired": "Amb de deficiéncias auditivas",
+    "Movies": "Filmes",
+    "Music": "Musica",
+    "Latest": "Darrièr",
+    "Forced": "Forçat",
+    "Default": "Defaut",
+    "Genres": "Genres",
+    "HomeVideos": "Vidèos d'Acuèlh",
+    "Inherit": "Eiretar",
+    "LabelIpAddressValue": "Adreça IP: {0}",
+    "LabelRunningTimeValue": "Temps d'execucion : {0}"
 }
@@ -108,5 +108,18 @@
    "CleanupUserDataTaskDescription": "Usuwa wszystkie dane użytkownika (stan oglądanych, status ulubionych itp.) z mediów, które nie są dostępne od co najmniej 90 dni.",
    "CleanupUserDataTask": "Zadanie czyszczenia danych użytkownika",
    "Original": "Oryginalny",
-    "LyricDownloadFailureFromForItem": "Błąd podczas pobierania tekstu piosenki z {0} dla {1}"
+    "LyricDownloadFailureFromForItem": "Błąd podczas pobierania tekstu piosenki z {0} dla {1}",
+    "NameExtraBehindTheScenes": "Za kulisami",
+    "NameExtraClip": "Urywek",
+    "NameExtraDeletedScene": "Usunięta scena",
+    "NameExtraFeaturette": "Film średniometrażowy",
+    "NameExtraInterview": "Wywiad",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "Fragment",
+    "NameExtraScene": "Scena",
+    "NameExtraShort": "Film krótkometrażowy",
+    "NameExtraThemeSong": "Czołówka",
+    "NameExtraThemeVideo": "Wideo wprowadzające",
+    "NameExtraTrailer": "Zwiastun",
+    "NameExtraUnknown": "Dodatek"
 }
@@ -108,5 +108,18 @@
    "CleanupUserDataTask": "Tarefa de limpeza de dados do usuário",
    "CleanupUserDataTaskDescription": "Limpa todos os dados do usuário (estado de visualização, status de favorito, etc.) de mídias que não estão presentes por pelo menos 90 dias.",
    "LyricDownloadFailureFromForItem": "Download das Letras falharam em {0} para o item {1}",
-    "Original": "Original"
+    "Original": "Original",
+    "NameExtraBehindTheScenes": "Nos Bastidores",
+    "NameExtraClip": "Clipe",
+    "NameExtraDeletedScene": "cena Extra",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "Trecho",
+    "NameExtraScene": "Cena",
+    "NameExtraShort": "Curta-metragem",
+    "NameExtraThemeSong": "Música Tema",
+    "NameExtraThemeVideo": "Vídeo de Abertura",
+    "NameExtraTrailer": "Trailer",
+    "NameExtraUnknown": "Extra",
+    "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,112 +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.",
+    "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 da imagem do 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": "Excerto",
+    "NameExtraDeletedScene": "Cena eliminada",
+    "NameExtraFeaturette": "Minidocumentário",
+    "NameExtraInterview": "Entrevista",
+    "NameExtraSample": "Amostra",
+    "NameExtraShort": "Curta-metragem",
+    "NameExtraThemeSong": "Tema musical",
+    "NameExtraThemeVideo": "Vídeo temático",
+    "NameExtraScene": "Cena",
+    "NameExtraUnknown": "Extra",
+    "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ă"
 }
@@ -108,5 +108,18 @@
    "CleanupUserDataTask": "Задача очистки пользовательских данных",
    "CleanupUserDataTaskDescription": "Очищает все пользовательские данные (состояние просмотра, статус избранного и т.д.) с медиа, отсутствующих по меньшей мере в течение 90 дней.",
    "Original": "Оригинальный",
-    "LyricDownloadFailureFromForItem": "Не получилось скачать текст песни с {0} для {1}"
+    "LyricDownloadFailureFromForItem": "Не получилось скачать текст песни с {0} для {1}",
+    "NameExtraBehindTheScenes": "За кадром",
+    "NameExtraClip": "Отрывок",
+    "NameExtraDeletedScene": "Удалённая сцена",
+    "NameExtraFeaturette": "Короткометражка",
+    "NameExtraInterview": "Интервью",
+    "NameExtraSample": "Образец",
+    "NameExtraScene": "Сцена",
+    "NameExtraThemeSong": "Заглавная песня",
+    "NameExtraThemeVideo": "Заглавное видео",
+    "NameExtraTrailer": "Трейлер",
+    "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 @@
    "CleanupUserDataTask": "Prečistiť používateľské dáta",
    "CleanupUserDataTaskDescription": "Vyčistí všetky dáta používateľa (stav sledovania, stav obľúbených atď.) z médií, ktoré už neexistujú aspoň 90 dní.",
    "LyricDownloadFailureFromForItem": "Text piesne sa nepodarilo stiahnuť z {0} pre {1}",
-    "Original": "Originál"
+    "Original": "Originál",
+    "NameExtraBehindTheScenes": "Zo zákulisia",
+    "NameExtraClip": "Klip",
+    "NameExtraDeletedScene": "Vystrihnutá scéna",
+    "NameExtraFeaturette": "Bonus",
+    "NameExtraInterview": "Rozhovor",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "Ukážka",
+    "NameExtraScene": "Scéna",
+    "NameExtraShort": "Krátky film",
+    "NameExtraThemeSong": "Úvodná pieseň",
+    "NameExtraThemeVideo": "Úvodné video",
+    "NameExtraTrailer": "Trailer",
+    "NameExtraUnknown": "Extra"
 }
@@ -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": "Додатак"
 }
@@ -108,5 +108,18 @@
    "CleanupUserDataTaskDescription": "Tar bort all användardata (såsom vad du sett, favoriter med mera) för media som inte funnits på enheten på minst 90 dagar.",
    "CleanupUserDataTask": "Uppgift för rensning av användardata",
    "Original": "Original",
-    "LyricDownloadFailureFromForItem": "Misslyckades att ladda ner låttexter från {0} för {1}"
+    "LyricDownloadFailureFromForItem": "Misslyckades att ladda ner låttexter från {0} för {1}",
+    "NameExtraBehindTheScenes": "Bakom kulisserna",
+    "NameExtraDeletedScene": "Borttagen scen",
+    "NameExtraInterview": "Intervju",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraScene": "Scen",
+    "NameExtraShort": "Kortfilm",
+    "NameExtraThemeSong": "Signaturmelodi",
+    "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}"
 }
@@ -106,5 +106,7 @@
    "TaskExtractMediaSegmentsDescription": "แยกหรือดึงส่วนของสื่อจากปลั๊กอินที่เปิดใช้งาน MediaSegment",
    "TaskMoveTrickplayImages": "ย้ายตำแหน่งเก็บภาพตัวอย่าง Trickplay",
    "CleanupUserDataTask": "ส่วนงานล้างข้อมูลผู้ใช้",
-    "CleanupUserDataTaskDescription": "ล้างข้อมูลผู้ใช้ทั้งหมด (สถานะการรับชม สถานะรายการโปรด ฯลฯ) จากสื่อที่ไม่ได้ใช้งานแล้วอย่างน้อย 90 วัน"
+    "CleanupUserDataTaskDescription": "ล้างข้อมูลผู้ใช้ทั้งหมด (สถานะการรับชม สถานะรายการโปรด ฯลฯ) จากสื่อที่ไม่ได้ใช้งานแล้วอย่างน้อย 90 วัน",
+    "LyricDownloadFailureFromForItem": "ไม่สามารถดาวน์โหลดเนื้อเพลงจาก {0} สำหรับ {1}",
+    "Original": "ต้นฉบับ"
 }
@@ -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",
@@ -108,5 +108,18 @@
    "CleanupUserDataTask": "Kullanıcı verisi temizleme görevi",
    "CleanupUserDataTaskDescription": "En az 90 gün boyunca artık mevcut olmayan medyadaki tüm kullanıcı verilerini (İzleme durumu, favori durumu vb.) temizler.",
    "LyricDownloadFailureFromForItem": "{1} şarkı sözleri {0} adresinden indirilemedi",
-    "Original": "Orijinal"
+    "Original": "Orijinal",
+    "NameExtraBehindTheScenes": "Kamera Arkası",
+    "NameExtraClip": "Klip",
+    "NameExtraDeletedScene": "Silinmiş Sahne",
+    "NameExtraFeaturette": "Kısa film",
+    "NameExtraInterview": "Röportaj",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "Örnek",
+    "NameExtraScene": "Sahne",
+    "NameExtraShort": "Kısa",
+    "NameExtraThemeSong": "Tanıtım Müziği",
+    "NameExtraThemeVideo": "Tanıtım Videosu",
+    "NameExtraTrailer": "Fragman",
+    "NameExtraUnknown": "Fazladan"
 }
@@ -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": "Тематичне вiдео",
+    "NameExtraTrailer": "Трейлер",
+    "NameExtraUnknown": "Додатково"
 }
@@ -32,7 +32,7 @@
    "TasksLibraryCategory": "Thư Viện",
    "TasksMaintenanceCategory": "Bảo Trì",
    "VersionNumber": "Phiên Bản {0}",
-    "UserStoppedPlayingItemWithValues": "{0} đã kết thúc phát {1} trên {2}",
+    "UserStoppedPlayingItemWithValues": "{0} đã phát xong {1} trên {2}",
    "UserStartedPlayingItemWithValues": "{0} đang phát {1} trên {2}",
    "UserPasswordChangedWithName": "Mật khẩu đã được thay đổi cho người dùng {0}",
    "UserOnlineFromDevice": "{0} trực tuyến từ {1}",
@@ -79,7 +79,7 @@
    "HeaderNextUp": "Tiếp Theo",
    "HeaderFavoriteShows": "Chương Trình Yêu Thích",
    "HeaderFavoriteEpisodes": "Tập Phim Yêu Thích",
-    "FailedLoginAttemptWithUserName": "Nỗ lực đăng nhập không thành công từ {0}",
+    "FailedLoginAttemptWithUserName": "Cố gắng đăng nhập thất bại từ {0}",
    "ChapterNameValue": "Phân Cảnh {0}",
    "Books": "Sách",
    "AuthenticationSucceededWithUserName": "{0} xác thực thành công",
@@ -95,18 +95,31 @@
    "TaskKeyframeExtractorDescription": "Trích xuất khung hình chính từ các tệp video để tạo danh sách phát HLS chính xác hơn. Tác vụ này có thể chạy trong một thời gian dài.",
    "External": "Bên ngoài",
    "HearingImpaired": "Khiếm Thính",
-    "TaskRefreshTrickplayImages": "Tạo Ảnh Xem Trước Trickplay",
-    "TaskRefreshTrickplayImagesDescription": "Tạo bản xem trước trịckplay cho video trong thư viện đã bật.",
+    "TaskRefreshTrickplayImages": "Tạo Ảnh Tua Nhanh (Trickplay)",
+    "TaskRefreshTrickplayImagesDescription": "Tạo ảnh tua nhanh (trịckplay) xem thử cho các video trong các thư viện được kích hoạt.",
    "TaskAudioNormalization": "Chuẩn Hóa Âm Thanh",
    "TaskAudioNormalizationDescription": "Quét tập tin để tìm dữ liệu chuẩn hóa âm thanh.",
    "TaskDownloadMissingLyricsDescription": "Tải xuống lời cho bài hát",
    "TaskDownloadMissingLyrics": "Tải xuống lời bị thiếu",
    "TaskExtractMediaSegmentsDescription": "Trích xuất hoặc lấy các phân đoạn phương tiện từ các plugin hỗ trợ MediaSegment.",
-    "TaskMoveTrickplayImages": "Di chuyển vị trí hình ảnh Trickplay",
-    "TaskMoveTrickplayImagesDescription": "Di chuyển các tập tin trickplay hiện có theo cài đặt thư viện.",
+    "TaskMoveTrickplayImages": "Di Chuyển Vị Trí Ảnh Tua Nhanh (Trickplay)",
+    "TaskMoveTrickplayImagesDescription": "Di chuyển các tệp ảnh tua nhanh (trickplay) hiện có theo cài đặt thư viện.",
    "TaskExtractMediaSegments": "Quét Phân Đoạn Phương Tiện",
    "CleanupUserDataTask": "Tác vụ dọn dẹp dữ liệu người dùng",
    "CleanupUserDataTaskDescription": "Làm sạch tất cả dữ liệu người dùng (trạng thái xem, trạng thái yêu thích, v.v.) từ phương tiện không còn có mặt trong ít nhất 90 ngày.",
    "Original": "Gốc",
-    "LyricDownloadFailureFromForItem": "Lời bài hát không tải xuống được từ {0} cho {1}"
+    "LyricDownloadFailureFromForItem": "Lời bài hát không tải xuống được từ {0} cho {1}",
+    "NameExtraBehindTheScenes": "Hậu Trường",
+    "NameExtraDeletedScene": "Cảnh Bị Xóa",
+    "NameExtraInterview": "Phỏng vấn",
+    "NameExtraNumbered": "{0} {1}",
+    "NameExtraSample": "Mẫu",
+    "NameExtraScene": "Cảnh",
+    "NameExtraShort": "Ngắn",
+    "NameExtraThemeSong": "Bài Hát Chủ Đề",
+    "NameExtraThemeVideo": "Video Chủ Đề",
+    "NameExtraFeaturette": "Nội dung phụ",
+    "NameExtraClip": "Clip ngắn",
+    "NameExtraTrailer": "Đoạn giới thiệu",
+    "NameExtraUnknown": "Nội dung bổ sung"
 }
@@ -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": "额外内容"
 }
@@ -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": "額外內容"
 }
@@ -219,28 +219,15 @@ namespace Emby.Server.Implementations.Playlists
            var playlist = _libraryManager.GetItemById(playlistId) as Playlist
                ?? throw new ArgumentException("No Playlist exists with Id " + playlistId);

-            // Retrieve all the items to be added to the playlist
+            // Retrieve all the items to be added to the playlist.
            var newItems = GetPlaylistItems(newItemIds, user, options)
                .Where(i => i.SupportsAddingToPlaylist);

-            // Filter out duplicate items
-            var existingIds = playlist.LinkedChildren.Select(c => c.ItemId).ToHashSet();
-            newItems = newItems
-                .Where(i => !existingIds.Contains(i.Id))
-                .Distinct();
-
            // Create a list of the new linked children to add to the playlist
            var childrenToAdd = newItems
                .Select(LinkedChild.Create)
                .ToList();

-            // Log duplicates that have been ignored, if any
-            int numDuplicates = newItemIds.Count - childrenToAdd.Count;
-            if (numDuplicates > 0)
-            {
-                _logger.LogWarning("Ignored adding {DuplicateCount} duplicate items to playlist {PlaylistName}.", numDuplicates, playlist.Name);
-            }
-
            // Do nothing else if there are no items to add to the playlist
            if (childrenToAdd.Count == 0)
            {
@@ -255,6 +255,14 @@ namespace Emby.Server.Implementations.Plugins
            }

            _plugins.Add(plugin);
+
+            // Updating a disabled plugin must not enable it again.
+            if (plugin.Manifest.Status == PluginStatus.Disabled)
+            {
+                ProcessAlternative(plugin);
+                return;
+            }
+
            EnablePlugin(plugin);
        }

@@ -632,9 +640,10 @@ namespace Emby.Server.Implementations.Plugins
                return;
            }

-            var predecessor = _plugins.OrderByDescending(p => p.Version)
-                .FirstOrDefault(p => p.Id.Equals(plugin.Id) && p.IsEnabledAndSupported && p.Version != plugin.Version);
-            if (predecessor is not null)
+            var successor = _plugins.FirstOrDefault(p => p.Id.Equals(plugin.Id)
+                && p.Version > plugin.Version
+                && (p.IsEnabledAndSupported || p.Manifest.Status == PluginStatus.Disabled));
+            if (successor is not null)
            {
                return;
            }
@@ -763,6 +772,8 @@ namespace Emby.Server.Implementations.Plugins
                var entry = versions[x];
                if (!string.Equals(lastName, entry.Name, StringComparison.OrdinalIgnoreCase))
                {
+                    lastName = string.Empty;
+
                    if (!TryGetPluginDlls(entry, out var allowedDlls))
                    {
                        _logger.LogError("One or more assembly paths was invalid. Marking plugin {Plugin} as \"Malfunctioned\".", entry.Name);
@@ -772,15 +783,18 @@ namespace Emby.Server.Implementations.Plugins

                    entry.DllFiles = allowedDlls;

+                    // Only clean up older versions when this version will actually be loaded.
                    if (entry.IsEnabledAndSupported)
                    {
                        lastName = entry.Name;
-                        continue;
                    }
+
+                    continue;
                }

                if (string.IsNullOrEmpty(lastName))
                {
+                    // Unnamed plugin, so there is nothing to match older versions against.
                    continue;
                }

@@ -891,9 +905,9 @@ namespace Emby.Server.Implementations.Plugins

            if (previousVersion is null)
            {
-                // This value is memory only - so that the web will show restart required.
-                plugin.Manifest.Status = PluginStatus.Restart;
-                plugin.Manifest.AutoUpdate = false;
+                // Memory only, so that the web will show restart required. The manifest must keep
+                // holding the persisted state, or a later save would write the wrong state to disk.
+                plugin.RestartRequired = true;
                return;
            }

@@ -906,9 +920,7 @@ namespace Emby.Server.Implementations.Plugins
                _logger.LogError("Unable to supercede version {Version} of {Name}", previousVersion.Version, previousVersion.Name);
            }

-            // This value is memory only - so that the web will show restart required.
-            plugin.Manifest.Status = PluginStatus.Restart;
-            plugin.Manifest.AutoUpdate = false;
+            plugin.RestartRequired = true;
        }
    }
 }
@@ -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);
@@ -641,8 +641,7 @@ namespace Emby.Server.Implementations.Session
            if (playingSessions.Count > 0)
            {
                var idle = playingSessions
-                    .Where(i => (DateTime.UtcNow - i.LastPlaybackCheckIn).TotalMinutes > 5)
-                    .ToList();
+                    .Where(i => (DateTime.UtcNow - i.LastPlaybackCheckIn).TotalMinutes > 5);

                foreach (var session in idle)
                {
@@ -656,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)
@@ -223,7 +223,7 @@ namespace Emby.Server.Implementations.Session

            if (inactive.Count > 0)
            {
-                _logger.LogInformation("Sending ForceKeepAlive message to {0} inactive WebSockets.", inactive.Count);
+                _logger.LogDebug("Sending ForceKeepAlive message to {0} inactive WebSockets.", inactive.Count);
            }

            foreach (var webSocket in inactive)
@@ -3,34 +3,14 @@

 using System;
 using Jellyfin.Data.Enums;
-using Jellyfin.Database.Implementations.Entities;
 using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Querying;

 namespace Emby.Server.Implementations.Sorting
 {
-    public class DateLastMediaAddedComparer : IUserBaseItemComparer
+    public class DateLastMediaAddedComparer : IBaseItemComparer
    {
-        /// <summary>
-        /// Gets or sets the user.
-        /// </summary>
-        /// <value>The user.</value>
-        public User User { get; set; }
-
-        /// <summary>
-        /// Gets or sets the user manager.
-        /// </summary>
-        /// <value>The user manager.</value>
-        public IUserManager UserManager { get; set; }
-
-        /// <summary>
-        /// Gets or sets the user data manager.
-        /// </summary>
-        /// <value>The user data manager.</value>
-        public IUserDataManager UserDataManager { get; set; }
-
        /// <summary>
        /// Gets the name.
        /// </summary>
@@ -45,7 +45,7 @@ namespace Emby.Server.Implementations.Sorting
                return x.PremiereDate.Value;
            }

-            if (x.ProductionYear.HasValue)
+            if (x.ProductionYear is not null)
            {
                try
                {
@@ -39,7 +39,7 @@ namespace Emby.Server.Implementations.Sorting
                return 0;
            }

-            if (x.ProductionYear.HasValue)
+            if (x.ProductionYear is not null)
            {
                return x.ProductionYear.Value;
            }
@@ -500,8 +500,9 @@ namespace Emby.Server.Implementations.Updates
            var plugins = _pluginManager.Plugins;
            foreach (var plugin in plugins)
            {
-                // Don't auto update when plugin marked not to, or when it's disabled.
-                if (plugin.Manifest?.AutoUpdate == false || plugin.Manifest?.Status == PluginStatus.Disabled)
+                // Don't auto update when plugin marked not to, or when it's disabled or pending removal.
+                if (plugin.Manifest?.AutoUpdate == false
+                    || plugin.Manifest?.Status is PluginStatus.Disabled or PluginStatus.Deleted)
                {
                    continue;
                }
@@ -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;
@@ -1456,22 +1455,16 @@ public class DynamicHlsController : BaseJellyfinApiController

        var segmentExtension = EncodingHelper.GetSegmentFileExtension(state.Request.SegmentContainer);

-        TranscodingJob? job;
-
-        if (System.IO.File.Exists(segmentPath))
-        {
-            job = _transcodeManager.OnTranscodeBeginRequest(playlistPath, TranscodingJobType);
-            _logger.LogDebug("returning {0} [it exists, try 1]", segmentPath);
-            return await GetSegmentResult(state, playlistPath, segmentPath, segmentExtension, segmentId, job, cancellationToken).ConfigureAwait(false);
-        }
-
+        // Keep segment selection and transcoding replacement under the same playlist lock.
+        // An out-of-order request must not replace a job while another request is using its output.
        using (await _transcodeManager.LockAsync(playlistPath, cancellationToken).ConfigureAwait(false))
        {
+            TranscodingJob? job;
            var startTranscoding = false;
            if (System.IO.File.Exists(segmentPath))
            {
                job = _transcodeManager.OnTranscodeBeginRequest(playlistPath, TranscodingJobType);
-                _logger.LogDebug("returning {0} [it exists, try 2]", segmentPath);
+                _logger.LogDebug("returning {0} [it exists]", segmentPath);
                return await GetSegmentResult(state, playlistPath, segmentPath, segmentExtension, segmentId, job, cancellationToken).ConfigureAwait(false);
            }

@@ -1505,6 +1498,9 @@ public class DynamicHlsController : BaseJellyfinApiController
                // If the playlist doesn't already exist, startup ffmpeg
                try
                {
+                    var currentJob = _transcodeManager.GetTranscodingJob(playlistPath, TranscodingJobType);
+                    await WaitForActiveTranscodingRequests(currentJob, cancellationToken).ConfigureAwait(false);
+
                    await _transcodeManager.KillTranscodingJobs(streamingRequest.DeviceId, streamingRequest.PlaySessionId, p => false)
                        .ConfigureAwait(false);

@@ -1540,11 +1536,19 @@ public class DynamicHlsController : BaseJellyfinApiController
                    await job.TranscodingThrottler.UnpauseTranscoding().ConfigureAwait(false);
                }
            }
-        }

-        _logger.LogDebug("returning {0} [general case]", segmentPath);
-        job ??= _transcodeManager.OnTranscodeBeginRequest(playlistPath, TranscodingJobType);
-        return await GetSegmentResult(state, playlistPath, segmentPath, segmentExtension, segmentId, job, cancellationToken).ConfigureAwait(false);
+            _logger.LogDebug("returning {0} [general case]", segmentPath);
+            job ??= _transcodeManager.OnTranscodeBeginRequest(playlistPath, TranscodingJobType);
+            return await GetSegmentResult(state, playlistPath, segmentPath, segmentExtension, segmentId, job, cancellationToken).ConfigureAwait(false);
+        }
+    }
+
+    internal static async Task WaitForActiveTranscodingRequests(TranscodingJob? job, CancellationToken cancellationToken)
+    {
+        while (job?.ActiveRequestCount > 0)
+        {
+            await Task.Delay(100, cancellationToken).ConfigureAwait(false);
+        }
    }

    private static double[] GetSegmentLengths(StreamState state)
@@ -1607,8 +1611,9 @@ public class DynamicHlsController : BaseJellyfinApiController

            if (state.VideoStream is not null && state.IsOutputVideo)
            {
-                // fMP4 needs this flag to write the audio packet DTS/PTS including the initial delay into MOOF::TRAF::TFDT
-                hlsArguments += $" {(useLegacySegmentOption ? "-hls_ts_options" : "-hls_segment_options")} movflags=+frag_discont";
+                // fMP4 needs frag_discont to write the audio packet DTS/PTS including the initial delay into MOOF::TRAF::TFDT
+                // HLS does not use SIDX, and skipping it avoids FFmpeg rewriting open-GOP boundary packet PTS
+                hlsArguments += $" {(useLegacySegmentOption ? "-hls_ts_options" : "-hls_segment_options")} movflags=+frag_discont+skip_sidx";
            }

            segmentFormat = "fmp4" + outputFmp4HeaderArg;
@@ -1646,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)
@@ -84,7 +84,7 @@ public class MediaInfoController : BaseJellyfinApiController
            return NotFound();
        }

-        return await _mediaInfoHelper.GetPlaybackInfo(item, user).ConfigureAwait(false);
+        return await _mediaInfoHelper.GetPlaybackInfo(item, user, Request).ConfigureAwait(false);
    }

    /// <summary>
@@ -177,6 +177,7 @@ public class MediaInfoController : BaseJellyfinApiController
        var info = await _mediaInfoHelper.GetPlaybackInfo(
                item,
                user,
+                Request,
                mediaSourceId,
                liveStreamId)
            .ConfigureAwait(false);
@@ -4,6 +4,7 @@ using System.Linq;
 using Jellyfin.Api.Extensions;
 using Jellyfin.Api.Helpers;
 using Jellyfin.Api.ModelBinders;
+using Jellyfin.Data;
 using Jellyfin.Database.Implementations.Entities;
 using Jellyfin.Extensions;
 using MediaBrowser.Controller.Dto;
@@ -103,6 +104,7 @@ public class PersonsController : BaseJellyfinApiController
            personTypes,
            excludePersonTypes)
        {
+            AccessFilter = BuildAccessFilter(user),
            NameContains = searchTerm,
            NameStartsWith = nameStartsWith,
            NameLessThan = nameLessThan,
@@ -123,6 +125,20 @@ public class PersonsController : BaseJellyfinApiController
                .ToArray());
    }

+    // People are not owned by a library, so nothing in the Peoples table says which of them a user is
+    // allowed to see; that only follows from the items they are credited on.
+    private InternalItemsQuery? BuildAccessFilter(User? user)
+    {
+        if (user is null || !user.HasContentRestrictions())
+        {
+            return null;
+        }
+
+        var accessFilter = new InternalItemsQuery(user) { IncludeOwnedItems = true };
+        _libraryManager.ConfigureUserAccess(accessFilter, user);
+        return accessFilter;
+    }
+
    /// <summary>
    /// Get person by name.
    /// </summary>
@@ -133,6 +133,7 @@ public class UniversalAudioController : BaseJellyfinApiController
        var info = await _mediaInfoHelper.GetPlaybackInfo(
                item,
                user,
+                Request,
                mediaSourceId)
            .ConfigureAwait(false);

@@ -34,12 +34,15 @@ 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;
    private readonly IDtoService _dtoService;
    private readonly IUserViewManager _userViewManager;
    private readonly IFileSystem _fileSystem;
+    private readonly IProviderManager _providerManager;

    /// <summary>
    /// Initializes a new instance of the <see cref="UserLibraryController"/> class.
@@ -50,13 +53,15 @@ public class UserLibraryController : BaseJellyfinApiController
    /// <param name="dtoService">Instance of the <see cref="IDtoService"/> interface.</param>
    /// <param name="userViewManager">Instance of the <see cref="IUserViewManager"/> interface.</param>
    /// <param name="fileSystem">Instance of the <see cref="IFileSystem"/> interface.</param>
+    /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
    public UserLibraryController(
        IUserManager userManager,
        IUserDataManager userDataRepository,
        ILibraryManager libraryManager,
        IDtoService dtoService,
        IUserViewManager userViewManager,
-        IFileSystem fileSystem)
+        IFileSystem fileSystem,
+        IProviderManager providerManager)
    {
        _userManager = userManager;
        _userDataRepository = userDataRepository;
@@ -64,6 +69,7 @@ public class UserLibraryController : BaseJellyfinApiController
        _dtoService = dtoService;
        _userViewManager = userViewManager;
        _fileSystem = fileSystem;
+        _providerManager = providerManager;
    }

    /// <summary>
@@ -94,7 +100,7 @@ public class UserLibraryController : BaseJellyfinApiController
            return NotFound();
        }

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

        var dtoOptions = new DtoOptions();

@@ -639,24 +645,36 @@ public class UserLibraryController : BaseJellyfinApiController
            limit,
            groupItems);

-    private async Task RefreshItemOnDemandIfNeeded(BaseItem item)
+    private async Task RefreshOnDemandIfNeeded(BaseItem item)
    {
-        if (item is Person)
+        if (item is not Person)
        {
-            var hasMetadata = !string.IsNullOrWhiteSpace(item.Overview) && item.HasImage(ImageType.Primary);
-            var performFullRefresh = !hasMetadata && (DateTime.UtcNow - item.DateLastRefreshed).TotalDays >= 3;
+            return;
+        }

-            if (performFullRefresh)
-            {
-                var options = new MetadataRefreshOptions(new DirectoryService(_fileSystem))
-                {
-                    MetadataRefreshMode = MetadataRefreshMode.FullRefresh,
-                    ImageRefreshMode = MetadataRefreshMode.FullRefresh,
-                    ForceSave = true
-                };
+        var hasMetadata = !string.IsNullOrWhiteSpace(item.Overview) && item.HasImage(ImageType.Primary);
+        if (hasMetadata || (DateTime.UtcNow - item.DateLastRefreshed).TotalDays < 3)
+        {
+            return;
+        }

-                await item.RefreshMetadata(options, CancellationToken.None).ConfigureAwait(false);
-            }
+        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);
        }
    }

@@ -14,6 +14,7 @@ using Jellyfin.Database.Implementations.Enums;
 using Jellyfin.Extensions;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
+using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Entities;
@@ -44,6 +45,7 @@ public class MediaInfoHelper
    private readonly ILogger<MediaInfoHelper> _logger;
    private readonly INetworkManager _networkManager;
    private readonly IDeviceManager _deviceManager;
+    private readonly IServerApplicationHost _appHost;

    /// <summary>
    /// Initializes a new instance of the <see cref="MediaInfoHelper"/> class.
@@ -56,6 +58,7 @@ public class MediaInfoHelper
    /// <param name="logger">Instance of the <see cref="ILogger{MediaInfoHelper}"/> interface.</param>
    /// <param name="networkManager">Instance of the <see cref="INetworkManager"/> interface.</param>
    /// <param name="deviceManager">Instance of the <see cref="IDeviceManager"/> interface.</param>
+    /// <param name="appHost">Instance of the <see cref="IServerApplicationHost"/> interface.</param>
    public MediaInfoHelper(
        IUserManager userManager,
        ILibraryManager libraryManager,
@@ -64,7 +67,8 @@ public class MediaInfoHelper
        IServerConfigurationManager serverConfigurationManager,
        ILogger<MediaInfoHelper> logger,
        INetworkManager networkManager,
-        IDeviceManager deviceManager)
+        IDeviceManager deviceManager,
+        IServerApplicationHost appHost)
    {
        _userManager = userManager;
        _libraryManager = libraryManager;
@@ -74,6 +78,7 @@ public class MediaInfoHelper
        _logger = logger;
        _networkManager = networkManager;
        _deviceManager = deviceManager;
+        _appHost = appHost;
    }

    /// <summary>
@@ -81,40 +86,20 @@ public class MediaInfoHelper
    /// </summary>
    /// <param name="item">The item.</param>
    /// <param name="user">The user.</param>
+    /// <param name="request">The current <see cref="HttpRequest"/>.</param>
    /// <param name="mediaSourceId">Media source id.</param>
    /// <param name="liveStreamId">Live stream id.</param>
    /// <returns>A <see cref="Task"/> containing the <see cref="PlaybackInfoResponse"/>.</returns>
    public async Task<PlaybackInfoResponse> GetPlaybackInfo(
        BaseItem item,
        User? user,
+        HttpRequest request,
        string? mediaSourceId = null,
        string? liveStreamId = null)
    {
        var result = new PlaybackInfoResponse();

-        MediaSourceInfo[] mediaSources;
-        if (string.IsNullOrWhiteSpace(liveStreamId))
-        {
-            // TODO (moved from MediaBrowser.Api) handle supportedLiveMediaTypes?
-            var mediaSourcesList = await _mediaSourceManager.GetPlaybackMediaSources(item, user, true, true, CancellationToken.None).ConfigureAwait(false);
-
-            if (string.IsNullOrWhiteSpace(mediaSourceId))
-            {
-                mediaSources = mediaSourcesList.ToArray();
-            }
-            else
-            {
-                mediaSources = mediaSourcesList
-                    .Where(i => string.Equals(i.Id, mediaSourceId, StringComparison.OrdinalIgnoreCase))
-                    .ToArray();
-            }
-        }
-        else
-        {
-            var mediaSource = await _mediaSourceManager.GetLiveStream(liveStreamId, CancellationToken.None).ConfigureAwait(false);
-
-            mediaSources = new[] { mediaSource };
-        }
+        var mediaSources = await ResolvePlaybackMediaSources(item, user, mediaSourceId, liveStreamId).ConfigureAwait(false);

        if (mediaSources.Length == 0)
        {
@@ -136,6 +121,11 @@ public class MediaInfoHelper
                    mediaSourcesClone[i].DefaultAudioIndexSource = mediaSources[i].DefaultAudioIndexSource;
                }

+                foreach (var mediaSource in mediaSourcesClone)
+                {
+                    RewritePublishedLiveStreamPath(mediaSource, request);
+                }
+
                result.MediaSources = mediaSourcesClone;
            }

@@ -145,6 +135,28 @@ public class MediaInfoHelper
        return result;
    }

+    private async Task<MediaSourceInfo[]> ResolvePlaybackMediaSources(BaseItem item, User? user, string? mediaSourceId, string? liveStreamId)
+    {
+        if (!string.IsNullOrWhiteSpace(liveStreamId))
+        {
+            var mediaSource = await _mediaSourceManager.GetLiveStream(liveStreamId, CancellationToken.None).ConfigureAwait(false);
+
+            return new[] { mediaSource };
+        }
+
+        // TODO (moved from MediaBrowser.Api) handle supportedLiveMediaTypes?
+        var mediaSourcesList = await _mediaSourceManager.GetPlaybackMediaSources(item, user, true, true, CancellationToken.None).ConfigureAwait(false);
+
+        if (string.IsNullOrWhiteSpace(mediaSourceId))
+        {
+            return mediaSourcesList.ToArray();
+        }
+
+        return mediaSourcesList
+            .Where(i => string.Equals(i.Id, mediaSourceId, StringComparison.OrdinalIgnoreCase))
+            .ToArray();
+    }
+
    /// <summary>
    /// SetDeviceSpecificData.
    /// </summary>
@@ -415,6 +427,8 @@ public class MediaInfoHelper
    {
        var result = await _mediaSourceManager.OpenLiveStream(request, CancellationToken.None).ConfigureAwait(false);

+        RewritePublishedLiveStreamPath(result.MediaSource, httpContext.Request);
+
        var profile = request.DeviceProfile;
        if (profile is null)
        {
@@ -524,4 +538,90 @@ public class MediaInfoHelper

        return maxBitrate;
    }
+
+    /// <summary>
+    /// Rewrites a Live TV media source's <see cref="MediaSourceInfo.Path"/> to the request-appropriate published
+    /// URL when it points at a Jellyfin-hosted live stream buffer, so response copies never leak server-local
+    /// addresses. Only opened live streams are eligible. The shared instance held by
+    /// <see cref="IMediaSourceManager"/> is never touched by this method.
+    /// </summary>
+    /// <param name="mediaSource">The media source clone to rewrite in place.</param>
+    /// <param name="request">The current <see cref="HttpRequest"/>.</param>
+    private void RewritePublishedLiveStreamPath(MediaSourceInfo mediaSource, HttpRequest request)
+    {
+        // Opened live streams always carry a LiveStreamId; this excludes pre-open and plugin/remote sources.
+        if (string.IsNullOrEmpty(mediaSource.LiveStreamId))
+        {
+            return;
+        }
+
+        var baseUrl = _serverConfigurationManager.GetNetworkConfiguration().BaseUrl;
+        var publishedPath = GetPublishedLiveStreamPath(_appHost.GetSmartApiUrl(request), mediaSource.Path, mediaSource.Protocol, baseUrl);
+
+        if (publishedPath is not null)
+        {
+            mediaSource.Path = publishedPath;
+            return;
+        }
+
+        if (mediaSource.Path is not null && mediaSource.Path.Contains("/LiveTv/LiveStreamFiles/", StringComparison.OrdinalIgnoreCase))
+        {
+            _logger.LogDebug("Not rewriting live stream path for media source {MediaSourceId}: the local path did not resolve under the request's smart API URL/BaseUrl", mediaSource.Id);
+        }
+    }
+
+    /// <summary>
+    /// Resolves a Jellyfin-hosted Live TV buffer path to its request-appropriate published equivalent.
+    /// Returns null when the path isn't a Jellyfin-hosted <c>/LiveTv/LiveStreamFiles/</c> HTTP URL.
+    /// </summary>
+    /// <param name="smartApiUrl">The request-appropriate base URL, as returned by <see cref="IServerApplicationHost.GetSmartApiUrl(HttpRequest)"/>.</param>
+    /// <param name="localPath">The media source's local (LAN-access) path, as built from <see cref="IServerApplicationHost.GetApiUrlForLocalAccess"/>.</param>
+    /// <param name="protocol">The media source's protocol.</param>
+    /// <param name="baseUrl">The server's configured BaseUrl, if any.</param>
+    /// <returns>The published path, or null if the local path should be left unchanged.</returns>
+    internal static string? GetPublishedLiveStreamPath(
+        string smartApiUrl,
+        string? localPath,
+        MediaProtocol protocol,
+        string baseUrl)
+    {
+        if (protocol != MediaProtocol.Http
+            || !Uri.TryCreate(localPath, UriKind.Absolute, out var localUri))
+        {
+            return null;
+        }
+
+        var relativePath = localUri.PathAndQuery;
+        if (!string.IsNullOrEmpty(baseUrl))
+        {
+            var basePrefix = baseUrl + "/";
+            if (!relativePath.StartsWith(basePrefix, StringComparison.OrdinalIgnoreCase))
+            {
+                return null;
+            }
+
+            relativePath = relativePath[baseUrl.Length..];
+        }
+
+        if (!relativePath.StartsWith("/LiveTv/LiveStreamFiles/", StringComparison.OrdinalIgnoreCase))
+        {
+            return null;
+        }
+
+        var prefix = smartApiUrl.TrimEnd('/');
+        if (!string.IsNullOrEmpty(baseUrl))
+        {
+            var includesBaseUrl = Uri.TryCreate(prefix, UriKind.Absolute, out var publishedUri)
+                && Uri.UnescapeDataString(publishedUri.AbsolutePath)
+                    .TrimEnd('/')
+                    .EndsWith(baseUrl, StringComparison.OrdinalIgnoreCase);
+
+            if (!includesBaseUrl)
+            {
+                prefix += baseUrl;
+            }
+        }
+
+        return prefix + relativePath;
+    }
 }
@@ -198,11 +198,6 @@ public static class StreamingHelpers
            state.OutputAudioBitrate = encodingHelper.GetAudioBitrateParam(streamingRequest.AudioBitRate, streamingRequest.AudioCodec, state.AudioStream, state.OutputAudioChannels) ?? 0;
        }

-        if (outputAudioCodec.StartsWith("pcm_", StringComparison.Ordinal))
-        {
-            containerInternal = ".pcm";
-        }
-
        if (state.VideoRequest is not null)
        {
            state.OutputVideoCodec = state.Request.VideoCodec;
@@ -162,6 +162,23 @@ public static class UserEntityExtensions
        return Array.IndexOf(GetPreferenceValues<Guid>(entity, PreferenceKind.GroupedFolders), id) != -1;
    }

+    /// <summary>
+    /// Checks whether any library, parental rating or tag rule keeps content from this user.
+    /// </summary>
+    /// <param name="entity">The user to check.</param>
+    /// <returns><c>True</c> if some content in the library is hidden from this user.</returns>
+    public static bool HasContentRestrictions(this User entity)
+    {
+        ArgumentNullException.ThrowIfNull(entity);
+
+        return !entity.HasPermission(PermissionKind.EnableAllFolders)
+            || entity.GetPreference(PreferenceKind.BlockedMediaFolders).Length > 0
+            || entity.MaxParentalRatingScore.HasValue
+            || entity.GetPreference(PreferenceKind.BlockedTags).Length > 0
+            || entity.GetPreference(PreferenceKind.AllowedTags).Length > 0
+            || entity.GetPreference(PreferenceKind.BlockUnratedItems).Length > 0;
+    }
+
    /// <summary>
    /// Initializes the default permissions for a user. Should only be called on user creation.
    /// </summary>
@@ -39,6 +39,19 @@ public static class ExpressionExtensions
        return predicates.Aggregate((aggregatePredicate, nextPredicate) => aggregatePredicate.Or(nextPredicate));
    }

+    /// <summary>
+    /// Negates a predicate.
+    /// </summary>
+    /// <typeparam name="T">The predicate parameter type.</typeparam>
+    /// <param name="predicate">The predicate expression to negate.</param>
+    /// <returns>A new expression representing the negation of the input predicate.</returns>
+    public static Expression<Func<T, bool>> Not<T>(this Expression<Func<T, bool>> predicate)
+    {
+        ArgumentNullException.ThrowIfNull(predicate);
+
+        return Expression.Lambda<Func<T, bool>>(Expression.Not(predicate.Body), predicate.Parameters);
+    }
+
    /// <summary>
    /// Combines two predicates into a single predicate using a logical AND operation.
    /// </summary>
@@ -134,6 +134,21 @@ public static class BaseItemMapper
        if (dto is Video video)
        {
            video.PrimaryVersionId = entity.PrimaryVersionId;
+
+            // The LinkedChildren table is the source of truth for version links
+            if (entity.LinkedChildEntities is not null)
+            {
+                video.LinkedAlternateVersions = entity.LinkedChildEntities
+                    // LocalAlternateVersion links belong to Video.LocalAlternateVersions, not here
+                    .Where(e => e.ChildType == Database.Implementations.Entities.LinkedChildType.LinkedAlternateVersion)
+                    .OrderBy(e => e.SortOrder)
+                    .Select(e => new LinkedChild
+                    {
+                        ItemId = e.ChildId,
+                        Type = (MediaBrowser.Controller.Entities.LinkedChildType)e.ChildType
+                    })
+                    .ToArray();
+            }
        }

        if (dto is IHasSeries hasSeriesName)
@@ -183,7 +198,7 @@ public static class BaseItemMapper
        if (dto is Folder folder)
        {
            folder.DateLastMediaAdded = entity.DateLastMediaAdded ?? DateTime.SpecifyKind(DateTime.MinValue, DateTimeKind.Utc);
-            if (entity.LinkedChildEntities is not null && entity.LinkedChildEntities.Count > 0)
+            if (entity.LinkedChildEntities is not null)
            {
                folder.LinkedChildren = entity.LinkedChildEntities
                    .OrderBy(e => e.SortOrder)
@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using Jellyfin.Data.Enums;
+using Jellyfin.Database.Implementations;
 using Jellyfin.Database.Implementations.Entities;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Dto;
@@ -109,7 +110,6 @@ public sealed partial class BaseItemRepository
                IsNews = filter.IsNews,
                IsSeries = filter.IsSeries
            })
-            .Where(e => e.MediaStreams != null)
            .SelectMany(e => e.MediaStreams!)
            .Where(e => e.StreamType == (MediaStreamTypeEntity)mediaStreamType)
            .Select(s => string.IsNullOrEmpty(s.Language) ? "und" : s.Language) // und = undetermined
@@ -144,11 +144,6 @@ public sealed partial class BaseItemRepository
    {
        ArgumentNullException.ThrowIfNull(filter);

-        if (!filter.Limit.HasValue)
-        {
-            filter.EnableTotalRecordCount = false;
-        }
-
        using var context = _dbProvider.CreateDbContext();

        var innerQueryFilter = TranslateQuery(context.BaseItems.Where(e => e.Id != EF.Constant(PlaceholderId)), context, new InternalItemsQuery(filter.User)
@@ -168,21 +163,16 @@ public sealed partial class BaseItemRepository
            IsSeries = filter.IsSeries
        });

-        // Keep this as an IQueryable sub-select. Materializing to a list would inline one
-        // bound parameter per CleanValue and hit SQLite's variable cap on libraries with
-        // high-cardinality value types (e.g. tens of thousands of artists).
-        var matchingCleanValues = context.ItemValuesMap
-            .Where(ivm => itemValueTypes.Contains(ivm.ItemValue.Type))
-            .Join(
-                innerQueryFilter,
-                ivm => ivm.ItemId,
-                g => g.Id,
-                (ivm, g) => ivm.ItemValue.CleanValue)
-            .Distinct();
-
        var innerQuery = PrepareItemQuery(context, filter)
            .Where(e => e.Type == returnType)
-            .Where(e => matchingCleanValues.Contains(e.CleanName!));
+            .Where(e => context.ItemValuesMap
+                .Where(ivm => itemValueTypes.Contains(ivm.ItemValue.Type) && ivm.ItemValue.CleanValue == e.CleanName)
+                .Join(
+                    innerQueryFilter,
+                    ivm => ivm.ItemId,
+                    g => g.Id,
+                    (ivm, g) => ivm.ItemId)
+                .Any());

        var outerQueryFilter = new InternalItemsQuery(filter.User)
        {
@@ -205,32 +195,42 @@ public sealed partial class BaseItemRepository
            ExcludeItemIds = filter.ExcludeItemIds
        };

-        // Collapse rows that share a PresentationUniqueKey (e.g. alternate versions) by picking
-        // the lowest Id per group. For MusicArtist, prefer the entity from a library the user
-        // can actually access,since the same artist can have a folder in multiple libraries.
-        // Keep as an IQueryable sub-select so paging is applied AFTER
-        // ApplyOrder runs the caller's actual sort.
+        // Collapse rows that share a PresentationUniqueKey (e.g. alternate versions) into one
+        // representative id per group, then materialize the representative ids once.
        var masterQuery = TranslateQuery(innerQuery, context, outerQueryFilter);
        var isMusicArtist = returnType == _itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicArtist];
-        var representativeIds = isMusicArtist
-            ? masterQuery
+        List<Guid> representativeIds;
+        if (isMusicArtist)
+        {
+            // For MusicArtist, prefer the entity from a library the user can actually access.
+            // Materialize to prevent correlated per-group first-row queries which hurt performance.
+            var topParentIds = filter.TopParentIds;
+            representativeIds = masterQuery
+                .Select(e => new { e.Id, e.PresentationUniqueKey, e.TopParentId })
+                .AsEnumerable()
                .GroupBy(e => e.PresentationUniqueKey)
                .Select(g => g
-                    .OrderBy(e => filter.TopParentIds.Contains(e.TopParentId ?? Guid.Empty) ? 0 : 1)
+                    .OrderBy(e => topParentIds.Contains(e.TopParentId ?? Guid.Empty) ? 0 : 1)
                    .ThenBy(e => e.Id)
                    .First().Id)
-            : masterQuery
+                .ToList();
+        }
+        else
+        {
+            representativeIds = masterQuery
                .GroupBy(e => e.PresentationUniqueKey)
-                .Select(g => g.Min(e => e.Id));
+                .Select(g => g.Min(e => e.Id))
+                .ToList();
+        }

        var result = new QueryResult<(BaseItemDto, ItemCounts?)>();
        if (filter.EnableTotalRecordCount)
        {
-            result.TotalRecordCount = representativeIds.Count();
+            result.TotalRecordCount = representativeIds.Count;
        }

        var query = ApplyNavigations(
-                context.BaseItems.AsNoTracking().AsSingleQuery().Where(e => representativeIds.Contains(e.Id)),
+                context.BaseItems.AsNoTracking().AsSingleQuery().WhereOneOrMany(representativeIds, e => e.Id),
                filter);

        query = ApplyOrder(query, filter, context);
@@ -311,8 +311,8 @@ public sealed partial class BaseItemRepository
        var itemIds = itemCountQuery.Select(e => e.Id);

        // Rewrite query to avoid SelectMany on navigation properties (which requires SQL APPLY, not supported on SQLite)
-        // Instead, start from ItemValueMaps and join with BaseItems
-        return context.ItemValuesMap
+        // Instead, start from ItemValueMaps and join with BaseItems.
+        var rawCounts = context.ItemValuesMap
            .Where(ivm => itemValueTypes.Contains(ivm.ItemValue.Type))
            .Where(ivm => itemIds.Contains(ivm.ItemId))
            .Join(
@@ -322,18 +322,47 @@ public sealed partial class BaseItemRepository
                (ivm, e) => new { CleanName = ivm.ItemValue.CleanValue, e.Type })
            .GroupBy(x => new { x.CleanName, x.Type })
            .Select(g => new { g.Key.CleanName, g.Key.Type, Count = g.Count() })
-            .GroupBy(x => x.CleanName)
-            .ToDictionary(
-                g => g.Key,
-                g => new ItemCounts
+            .AsEnumerable();
+
+        var countsByCleanName = new Dictionary<string, ItemCounts>();
+        foreach (var group in rawCounts.GroupBy(x => x.CleanName))
+        {
+            var counts = new ItemCounts();
+            foreach (var row in group)
+            {
+                if (row.Type == seriesTypeName)
                {
-                    SeriesCount = g.Where(x => x.Type == seriesTypeName).Sum(x => x.Count),
-                    EpisodeCount = g.Where(x => x.Type == episodeTypeName).Sum(x => x.Count),
-                    MovieCount = g.Where(x => x.Type == movieTypeName).Sum(x => x.Count),
-                    AlbumCount = g.Where(x => x.Type == musicAlbumTypeName).Sum(x => x.Count),
-                    ArtistCount = g.Where(x => x.Type == musicArtistTypeName).Sum(x => x.Count),
-                    SongCount = g.Where(x => x.Type == audioTypeName).Sum(x => x.Count),
-                    TrailerCount = g.Where(x => x.Type == trailerTypeName).Sum(x => x.Count),
-                });
+                    counts.SeriesCount += row.Count;
+                }
+                else if (row.Type == episodeTypeName)
+                {
+                    counts.EpisodeCount += row.Count;
+                }
+                else if (row.Type == movieTypeName)
+                {
+                    counts.MovieCount += row.Count;
+                }
+                else if (row.Type == musicAlbumTypeName)
+                {
+                    counts.AlbumCount += row.Count;
+                }
+                else if (row.Type == musicArtistTypeName)
+                {
+                    counts.ArtistCount += row.Count;
+                }
+                else if (row.Type == audioTypeName)
+                {
+                    counts.SongCount += row.Count;
+                }
+                else if (row.Type == trailerTypeName)
+                {
+                    counts.TrailerCount += row.Count;
+                }
+            }
+
+            countsByCleanName[group.Key] = counts;
+        }
+
+        return countsByCleanName;
    }
 }
@@ -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;
@@ -35,11 +36,40 @@ public sealed partial class BaseItemRepository
    {
        dbQuery = TranslateQuery(dbQuery, context, filter);
        dbQuery = ApplyGroupingFilter(context, dbQuery, filter);
+        dbQuery = ApplyAdjacencyFilter(context, dbQuery, filter);
        dbQuery = ApplyQueryPaging(dbQuery, filter);
        dbQuery = ApplyNavigations(dbQuery, filter);
        return dbQuery;
    }

+    /// <summary>
+    /// Trims an ordered query down to the AdjacentTo item and its immediate neighbours.
+    /// </summary>
+    private IQueryable<BaseItemEntity> ApplyAdjacencyFilter(JellyfinDbContext context, IQueryable<BaseItemEntity> dbQuery, InternalItemsQuery filter)
+    {
+        if (filter.AdjacentTo.IsNullOrEmpty())
+        {
+            return dbQuery;
+        }
+
+        // Adjacency is relative to the result set and the order the query asked for, so the ids have
+        // to be read back in that order.
+        var orderedIds = dbQuery.Select(e => e.Id).ToList();
+        var index = orderedIds.IndexOf(filter.AdjacentTo.Value);
+        if (index < 0)
+        {
+            // The item isn't part of this result set, so it has no neighbours in it either.
+            return dbQuery.Take(0);
+        }
+
+        var start = Math.Max(index - 1, 0);
+        var adjacentIds = orderedIds.GetRange(start, Math.Min(index + 2, orderedIds.Count) - start);
+
+        var adjacentQuery = context.BaseItems.AsNoTracking().AsSingleQuery().Where(e => adjacentIds.Contains(e.Id));
+
+        return ApplyOrder(adjacentQuery, filter, context);
+    }
+
    private IQueryable<BaseItemEntity> ApplyQueryPaging(IQueryable<BaseItemEntity> dbQuery, InternalItemsQuery filter)
    {
        if (filter.Limit.HasValue || filter.StartIndex.HasValue)
@@ -244,8 +274,8 @@ public sealed partial class BaseItemRepository
            dbQuery = dbQuery.Include(e => e.Images);
        }

-        // Include LinkedChildEntities for container types and videos that use them
-        // (BoxSet, Playlist, CollectionFolder for manual linking; Video, Movie for alternate versions).
+        // Include LinkedChildEntities for container types and videos that use them (BoxSet, Playlist,
+        // CollectionFolder for manual linking; every video type for alternate versions).
        // When IncludeItemTypes is empty (any type may be returned), always include them to ensure
        // LinkedChildren are loaded before items are saved back, preventing accidental deletion.
        var linkedChildTypes = new[]
@@ -254,7 +284,10 @@ public sealed partial class BaseItemRepository
            BaseItemKind.Playlist,
            BaseItemKind.CollectionFolder,
            BaseItemKind.Video,
-            BaseItemKind.Movie
+            BaseItemKind.Movie,
+            BaseItemKind.Episode,
+            BaseItemKind.MusicVideo,
+            BaseItemKind.Trailer
        };
        if (filter.IncludeItemTypes.Length == 0 || filter.IncludeItemTypes.Any(linkedChildTypes.Contains))
        {
@@ -291,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)
            {
@@ -318,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);
@@ -390,11 +434,23 @@ public sealed partial class BaseItemRepository

        var baseQuery = context.BaseItems
            .AsNoTracking()
-            .Where(b => allDescendantIds.Contains(b.Id) && !b.IsFolder && !b.IsVirtualItem);
+            .Where(b => allDescendantIds.Contains(b.Id))
+            .Where(DescendantQueryHelper.IsCountableLeaf);

        return ApplyAccessFiltering(context, baseQuery, filter);
    }

+    /// <summary>
+    /// Checks whether the user restricts access to items by parental rating or tags.
+    /// </summary>
+    /// <param name="filter">The query filter.</param>
+    /// <returns><c>true</c> if the query carries parental restrictions.</returns>
+    private static bool RequiresParentalRestrictions(InternalItemsQuery filter)
+        => filter.IncludeInheritedTags.Length > 0
+            || filter.ExcludeInheritedTags.Length > 0
+            || filter.MaxParentalRating is not null
+            || filter.BlockUnratedItems.Length > 0;
+
    /// <summary>
    /// Applies user access filtering to a query.
    /// Includes TopParentIds, parental rating, and tag filtering.
@@ -405,13 +461,127 @@ public sealed partial class BaseItemRepository
        IQueryable<BaseItemEntity> baseQuery,
        InternalItemsQuery filter)
    {
-        // Apply TopParentIds filtering (library folder access)
-        if (filter.TopParentIds.Length > 0)
+        baseQuery = ApplyTopParentFiltering(context, baseQuery, filter);
+
+        baseQuery = ApplyParentalRestrictions(context, baseQuery, filter);
+
+        // Exclude alternate versions (have PrimaryVersionId set) and owned non-extra items.
+        // Extras (trailers, etc.) have OwnerId set but also have ExtraType set — keep those.
+        if (!filter.IncludeOwnedItems)
        {
-            var topParentIds = filter.TopParentIds;
-            baseQuery = baseQuery.Where(e => topParentIds.Contains(e.TopParentId!.Value));
+            baseQuery = baseQuery.Where(e => e.PrimaryVersionId == null && (e.OwnerId == null || e.ExtraType != null));
        }

+        return baseQuery;
+    }
+
+    /// <summary>
+    /// Restricts a query to the libraries the user may open, exempting requested by-name items.
+    /// </summary>
+    /// <param name="context">The database context.</param>
+    /// <param name="baseQuery">The query to filter.</param>
+    /// <param name="filter">The query filter.</param>
+    /// <returns>The filtered query.</returns>
+    private IQueryable<BaseItemEntity> ApplyTopParentFiltering(
+        JellyfinDbContext context,
+        IQueryable<BaseItemEntity> baseQuery,
+        InternalItemsQuery filter)
+    {
+        var queryTopParentIds = filter.TopParentIds;
+        if (queryTopParentIds.Length == 0)
+        {
+            return baseQuery;
+        }
+
+        var exemptedItemByNameTypes = GetExemptedItemByNameTypes(filter);
+        if (exemptedItemByNameTypes.Count == 0)
+        {
+            return baseQuery.WhereOneOrMany(queryTopParentIds, e => e.TopParentId!.Value);
+        }
+
+        baseQuery = baseQuery.Where(e => exemptedItemByNameTypes.Contains(e.Type) || queryTopParentIds.Any(w => w == e.TopParentId!.Value));
+        if (filter.UserHasContentRestrictions)
+        {
+            baseQuery = ApplyItemByNameAccessFiltering(baseQuery, context, filter, exemptedItemByNameTypes, queryTopParentIds);
+        }
+
+        return baseQuery;
+    }
+
+    /// <summary>
+    /// Returns the by-name types a query asks for, which carry no TopParentId to filter on.
+    /// </summary>
+    /// <param name="filter">The query filter.</param>
+    /// <returns>The type names exempt from library filtering.</returns>
+    private List<string> GetExemptedItemByNameTypes(InternalItemsQuery filter)
+    {
+        var includedItemByNameTypes = GetItemByNameTypesInQuery(filter);
+        if ((filter.IncludeItemsByName ?? false) && includedItemByNameTypes.Count > 0)
+        {
+            return includedItemByNameTypes;
+        }
+
+        return _itemByNameKinds.Where(filter.IncludeItemTypes.Contains).Select(e => _itemTypeLookup.BaseItemKindNames[e]!).ToList();
+    }
+
+    /// <summary>
+    /// Keeps a by-name row only when at least one item behind its name is reachable for the user.
+    /// </summary>
+    /// <param name="baseQuery">The query to filter.</param>
+    /// <param name="context">The database context.</param>
+    /// <param name="filter">The query filter.</param>
+    /// <param name="itemByNameTypes">The exempted by-name type names.</param>
+    /// <param name="topParentIds">The libraries the user may open.</param>
+    /// <returns>The filtered query.</returns>
+    private IQueryable<BaseItemEntity> ApplyItemByNameAccessFiltering(
+        IQueryable<BaseItemEntity> baseQuery,
+        JellyfinDbContext context,
+        InternalItemsQuery filter,
+        IReadOnlyList<string> itemByNameTypes,
+        Guid[] topParentIds)
+    {
+        // IncludeOwnedItems: a credit on an alternate version of a reachable movie still counts.
+        var accessibleItems = ApplyAccessFiltering(
+            context,
+            context.BaseItems.AsNoTracking(),
+            new InternalItemsQuery(filter.User) { TopParentIds = topParentIds, IncludeOwnedItems = true });
+
+        var personType = _itemTypeLookup.BaseItemKindNames[BaseItemKind.Person];
+        if (itemByNameTypes.Contains(personType))
+        {
+            baseQuery = baseQuery.Where(e => e.Type != personType
+                || context.Peoples.Any(p => p.Name == e.Name
+                    && context.PeopleBaseItemMap.Any(m => m.PeopleId == p.Id && accessibleItems.Any(i => i.Id == m.ItemId))));
+        }
+
+        foreach (var (kind, valueTypes) in _itemByNameValueTypes)
+        {
+            var typeName = _itemTypeLookup.BaseItemKindNames[kind];
+            if (!itemByNameTypes.Contains(typeName))
+            {
+                continue;
+            }
+
+            baseQuery = baseQuery.Where(e => e.Type != typeName
+                || context.ItemValues.Any(v => valueTypes.Contains(v.Type) && v.CleanValue == e.CleanName
+                    && context.ItemValuesMap.Any(m => m.ItemValueId == v.ItemValueId && accessibleItems.Any(i => i.Id == m.ItemId))));
+        }
+
+        return baseQuery;
+    }
+
+    /// <summary>
+    /// Applies the user's parental rating and tag restrictions to a query.
+    /// </summary>
+    /// <param name="context">The database context.</param>
+    /// <param name="baseQuery">The query to filter.</param>
+    /// <param name="filter">The query filter.</param>
+    /// <returns>The filtered query.</returns>
+    private IQueryable<BaseItemEntity> ApplyParentalRestrictions(
+        JellyfinDbContext context,
+        IQueryable<BaseItemEntity> baseQuery,
+        InternalItemsQuery filter)
+    {
        // Apply parental rating filtering
        if (filter.MaxParentalRating is not null)
        {
@@ -462,13 +632,6 @@ public sealed partial class BaseItemRepository
                || e.Type == personTypeName);
        }

-        // Exclude alternate versions (have PrimaryVersionId set) and owned non-extra items.
-        // Extras (trailers, etc.) have OwnerId set but also have ExtraType set — keep those.
-        if (!filter.IncludeOwnedItems)
-        {
-            baseQuery = baseQuery.Where(e => e.PrimaryVersionId == null && (e.OwnerId == null || e.ExtraType != null));
-        }
-
        return baseQuery;
    }

@@ -503,62 +666,34 @@ public sealed partial class BaseItemRepository
    }

    /// <inheritdoc />
-    public IQueryable<Guid> GetFullyPlayedFolderIdsQuery(JellyfinDbContext context, IQueryable<Guid> folderIds, User user)
+    public IQueryable<BaseItemEntity> GetAccessFilteredLeafItemsQuery(JellyfinDbContext context, User user, bool includeOwnedItems = false)
    {
        ArgumentNullException.ThrowIfNull(context);
-        ArgumentNullException.ThrowIfNull(folderIds);
        ArgumentNullException.ThrowIfNull(user);

-        var filter = new InternalItemsQuery(user);
-        var userId = user.Id;
-
        var leafItems = context.BaseItems
            .AsNoTracking()
-            .Where(b => !b.IsFolder && !b.IsVirtualItem);
-        leafItems = ApplyAccessFiltering(context, leafItems, filter);
+            .Where(DescendantQueryHelper.IsCountableLeaf);

-        var playedLeafItems = leafItems
-            .Select(b => new { b.Id, Played = b.UserData!.Any(ud => ud.UserId == userId && ud.Played) });
+        return ApplyAccessFiltering(context, leafItems, new InternalItemsQuery(user) { IncludeOwnedItems = includeOwnedItems });
+    }

-        var ancestorLeaves = context.AncestorIds
-            .Where(a => folderIds.Contains(a.ParentItemId))
-            .Join(
-                playedLeafItems,
-                a => a.ItemId,
-                b => b.Id,
-                (a, b) => new { FolderId = a.ParentItemId, b.Id, b.Played });
+    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);

-        var linkedLeaves = context.LinkedChildren
-            .Where(lc => folderIds.Contains(lc.ParentId))
-            .Join(
-                playedLeafItems,
-                lc => lc.ChildId,
-                b => b.Id,
-                (lc, b) => new { FolderId = lc.ParentId, b.Id, b.Played });
+    /// <inheritdoc />
+    public Expression<Func<BaseItemEntity, bool>> BuildHasDescendantFilter(JellyfinDbContext context, IQueryable<BaseItemEntity> descendants)
+    {
+        ArgumentNullException.ThrowIfNull(context);
+        ArgumentNullException.ThrowIfNull(descendants);

-        var linkedFolderLeaves = context.LinkedChildren
-            .Where(lc => folderIds.Contains(lc.ParentId))
-            .Join(
-                context.BaseItems.Where(b => b.IsFolder),
-                lc => lc.ChildId,
-                b => b.Id,
-                (lc, b) => new { lc.ParentId, FolderChildId = b.Id })
-            .Join(
-                context.AncestorIds,
-                x => x.FolderChildId,
-                a => a.ParentItemId,
-                (x, a) => new { x.ParentId, DescendantId = a.ItemId })
-            .Join(
-                playedLeafItems,
-                x => x.DescendantId,
-                b => b.Id,
-                (x, b) => new { FolderId = x.ParentId, b.Id, b.Played });
-
-        return ancestorLeaves
-            .Union(linkedLeaves)
-            .Union(linkedFolderLeaves)
-            .GroupBy(x => x.FolderId)
-            .Where(g => g.Select(x => x.Id).Distinct().Count() == g.Where(x => x.Played).Select(x => x.Id).Distinct().Count())
-            .Select(g => g.Key);
+        // Descendants are reachable through the ancestor chain and - for BoxSets and Playlists - as
+        // linked children, which can themselves be folders contributing their own descendants.
+        // Every step is a correlated index seek, so only the rows the outer query keeps are visited
+        // and a folder is left as soon as its first matching descendant is found.
+        return e => context.AncestorIds.Any(a => a.ParentItemId == e.Id && descendants.Any(d => d.Id == a.ItemId))
+            || context.LinkedChildren.Any(lc => lc.ParentId == e.Id
+                && (descendants.Any(d => d.Id == lc.ChildId)
+                    || context.AncestorIds.Any(a => a.ParentItemId == lc.ChildId && descendants.Any(d => d.Id == a.ItemId))));
    }
 }
@@ -49,6 +49,7 @@ public sealed partial class BaseItemRepository

        dbQuery = TranslateQuery(dbQuery, context, filter);
        dbQuery = ApplyGroupingFilter(context, dbQuery, filter);
+        dbQuery = ApplyAdjacencyFilter(context, dbQuery, filter);

        if (filter.EnableTotalRecordCount)
        {
@@ -75,6 +76,7 @@ public sealed partial class BaseItemRepository
        dbQuery = TranslateQuery(dbQuery, context, filter);

        dbQuery = ApplyGroupingFilter(context, dbQuery, filter);
+        dbQuery = ApplyAdjacencyFilter(context, dbQuery, filter);
        dbQuery = ApplyQueryPaging(dbQuery, filter);

        var hasRandomSort = filter.OrderBy.Any(e => e.OrderBy == ItemSortBy.Random);
@@ -108,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 [];
        }
@@ -119,45 +121,61 @@ 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)
        {
-            // Group by PresentationUniqueKey, pick the newest item per group.
-            var topGroupItems = baseQuery
-                .Where(e => e.PresentationUniqueKey != null)
-                .GroupBy(e => e.PresentationUniqueKey)
-                .Select(g => new
-                {
-                    MaxDate = g.Max(e => e.DateCreated),
-                    FirstId = g.OrderByDescending(e => e.DateCreated).ThenByDescending(e => e.Id).Select(e => e.Id).First()
-                })
-                .OrderByDescending(g => g.MaxDate);
-
-            var firstIdsQuery = filter.Limit.HasValue
-                ? topGroupItems.Take(filter.Limit.Value).Select(g => g.FirstId)
-                : topGroupItems.Select(g => g.FirstId);
-
-            return LoadLatestByIds(context, firstIdsQuery, filter);
+            return GetLatestMovieItems(context, baseQuery, filter, limit);
        }

-        // Albums whose Id is the parent of any track matching the user's filter.
-        var albumIdsWithMatchingTrack = context.AncestorIds
-            .Join(baseQuery, ai => ai.ItemId, t => t.Id, (ai, _) => ai.ParentItemId);
+        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();
+        }

        var musicAlbumTypeName = _itemTypeLookup.BaseItemKindNames[BaseItemKind.MusicAlbum]!;
-        var topAlbumsQuery = context.BaseItems.AsNoTracking()
-            .Where(album => album.Type == musicAlbumTypeName)
-            .Where(album => albumIdsWithMatchingTrack.Contains(album.Id))
+        IQueryable<BaseItemEntity> topAlbumsQuery;
+
+        // When the query is scoped to whole libraries, read the newest albums directly by their own TopParentId.
+        if (filter.TopParentIds.Length > 0)
+        {
+            topAlbumsQuery = context.BaseItems.AsNoTracking()
+                .Where(album => album.Type == musicAlbumTypeName
+                    && !album.IsVirtualItem
+                    && album.TopParentId.HasValue)
+                .WhereOneOrMany(filter.TopParentIds, album => album.TopParentId!.Value);
+        }
+        else
+        {
+            // Fallback (e.g. AncestorIds-scoped callers): albums that are the parent of a matching track.
+            var albumIdsWithMatchingTrack = context.AncestorIds
+                .Join(baseQuery, ai => ai.ItemId, t => t.Id, (ai, _) => ai.ParentItemId);
+            topAlbumsQuery = context.BaseItems.AsNoTracking()
+                .Where(album => album.Type == musicAlbumTypeName)
+                .Where(album => albumIdsWithMatchingTrack.Contains(album.Id));
+        }
+
+        // The album is what gets returned, and neither branch above reads it through the
+        // user's filters, so its own parental restrictions have to be applied here: a
+        // matching track does not make an album the user may not see visible.
+        var orderedAlbums = ApplyParentalRestrictions(context, topAlbumsQuery, filter)
            .OrderByDescending(album => album.DateCreated)
            .ThenByDescending(album => album.Id);

-        var albumIdsQuery = filter.Limit.HasValue
-            ? topAlbumsQuery.Take(filter.Limit.Value).Select(a => a.Id)
-            : topAlbumsQuery.Select(a => a.Id);
+        var albumIdsQuery = limit.HasValue
+            ? orderedAlbums.Take(limit.Value).Select(a => a.Id)
+            : orderedAlbums.Select(a => a.Id);

        return LoadLatestByIds(context, albumIdsQuery, filter);
    }
@@ -181,6 +199,62 @@ public sealed partial class BaseItemRepository
            .ToArray()!;
    }

+    private IReadOnlyList<BaseItemDto> LoadLatestByIds(
+        JellyfinDbContext context,
+        List<Guid> ids,
+        InternalItemsQuery filter)
+    {
+        if (ids.Count == 0)
+        {
+            return [];
+        }
+
+        var itemsQuery = ApplyNavigations(
+            context.BaseItems.AsNoTracking().WhereOneOrMany(ids, e => e.Id),
+            filter);
+
+        return itemsQuery
+            .OrderByDescending(e => e.DateCreated)
+            .ThenByDescending(e => e.Id)
+            .AsEnumerable()
+            .Select(w => DeserializeBaseItem(w, filter.SkipDeserialization))
+            .Where(dto => dto != null)
+            .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>
@@ -381,6 +455,40 @@ public sealed partial class BaseItemRepository
            seriesResults.Add((seasonId, seriesId, maxDate, mostRecentEpisodeId));
        }

+        // Step 5b: A container is what gets returned, so it has to pass the user's access
+        // filters on its own - a matching episode does not make a Season or Series the user
+        // may not see visible. Containers that don't pass are replaced by their episode.
+        if (RequiresParentalRestrictions(filter) && entitiesToFetch.Count > 0)
+        {
+            var allowedContainerIds = ApplyParentalRestrictions(
+                    context,
+                    context.BaseItems.AsNoTracking().Where(e => entitiesToFetch.Contains(e.Id)),
+                    filter)
+                .Select(e => e.Id)
+                .ToHashSet();
+
+            for (var i = 0; i < seriesResults.Count; i++)
+            {
+                var (seasonId, seriesId, maxDate, mostRecentEpisodeId) = seriesResults[i];
+                if (seasonId.HasValue && !allowedContainerIds.Contains(seasonId.Value))
+                {
+                    seasonId = null;
+                }
+
+                if (seriesId.HasValue && !allowedContainerIds.Contains(seriesId.Value))
+                {
+                    seriesId = null;
+                }
+
+                if (seasonId is null && seriesId is null)
+                {
+                    entitiesToFetch.Add(mostRecentEpisodeId);
+                }
+
+                seriesResults[i] = (seasonId, seriesId, maxDate, mostRecentEpisodeId);
+            }
+        }
+
        // Step 6: Fetch the Season/Series entities we decided to return
        var entities = entitiesToFetch.Count > 0
            ? ApplyNavigations(
--- a/Show More
+++ b/Show More